feat: add refresh functionality to various components

- Implemented refresh event emission in multiple list components across partner and superAdmin modules.
- Updated consumers and customers list components to handle refresh actions.
- Enhanced dashboard component to fetch partner info on initialization.
- Introduced new API method in PartnerService to retrieve current partner data.
- Modified PartnerStore to utilize the new API method for fetching partner information.
- Updated UI elements to reflect changes in partner and license management, including new fields for license renewals.
- Added a new POS display component for better presentation of POS terminal information.
- Updated layout service and top bar to reflect new titles and improve user experience.
- Refactored existing components to ensure consistency and maintainability.
This commit is contained in:
2026-04-24 23:01:44 +03:30
parent 5bb5f10dbf
commit a816c05777
73 changed files with 559 additions and 97 deletions
@@ -1,15 +1,10 @@
<app-page-data-list
pageTitle="مدیریت حساب‌های کاربری"
[addNewCtaLabel]="'افزودن حساب کاربری جدید'"
pageTitle="حساب‌های کاربری"
[columns]="columns"
[showAdd]="true"
emptyPlaceholderTitle="حساب کاربری‌ای یافت نشد."
emptyPlaceholderDescription="برای افزودن حساب کاربری جدید، روی دکمهٔ بالا کلیک کنید."
[items]="items()"
[loading]="loading()"
[showDetails]="true"
[showAdd]="true"
(onAdd)="openAddForm()"
(onRefresh)="refresh()"
>
</app-page-data-list>
<partner-consumer-account-form
@@ -10,6 +10,17 @@
<app-input label="عنوان" [control]="form.controls.name" name="name" />
<app-input label="کد اقتصادی" [control]="form.controls.economic_code" name="economic_code" />
<catalog-guild-select label="صنف" [control]="form.controls.guild_id" name="guild_id" />
@if (!editMode) {
<p-divider align="center"> اطلاعات لایسنس </p-divider>
<uikit-datepicker
label="تاریخ شروع لایسنس"
[control]="form.controls.license_starts_at"
name="license_starts_at"
hint="مدت زمان لایسنس‌ها ۱ ساله هستند."
/>
}
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form>
</p-dialog>
@@ -1,11 +1,14 @@
// import { CatalogRolesComponent } from '@/shared/catalog/roles';
import { MustMatch } from '@/core/validators';
import { AbstractFormDialog } from '@/shared/abstractClasses';
import { CatalogGuildSelectComponent } from '@/shared/catalog/guild/components/select.component';
import { InputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFlatpickrJalaliComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog';
import { Divider } from 'primeng/divider';
import { IBusinessActivityRequest, IBusinessActivityResponse } from '../../models';
import { PartnerConsumerBusinessActivitiesService } from '../../services/businessActivities.service';
@@ -18,6 +21,8 @@ import { PartnerConsumerBusinessActivitiesService } from '../../services/busines
InputComponent,
FormFooterActionsComponent,
CatalogGuildSelectComponent,
Divider,
UikitFlatpickrJalaliComponent,
],
})
export class ConsumerBusinessActivitiesFormComponent extends AbstractFormDialog<
@@ -30,11 +35,28 @@ export class ConsumerBusinessActivitiesFormComponent extends AbstractFormDialog<
@Input() businessActivityId!: string;
initForm = () => {
return this.fb.group({
const form = this.fb.group({
name: [this.initialValues?.name || '', [Validators.required]],
economic_code: [this.initialValues?.economic_code || '', [Validators.required]],
guild_id: [this.initialValues?.guild?.id || '', [Validators.required]],
license_starts_at: [''],
});
if (this.editMode) {
// @ts-ignore
form.removeControl('license_starts_at');
} else {
form.addControl(
'license_starts_at',
this.fb.control<string>('', {
nonNullable: true,
validators: [Validators.required],
}),
);
form.addValidators([MustMatch('password', 'confirmPassword')]);
}
return form;
};
form = this.initForm();
@@ -48,10 +70,11 @@ export class ConsumerBusinessActivitiesFormComponent extends AbstractFormDialog<
}
submitForm() {
const formValue = this.form.value as IBusinessActivityRequest;
const formValue = this.form.value as IBusinessActivityRequest & { confirmPassword?: string };
const { confirmPassword, ...rest } = formValue;
if (this.editMode) {
return this.service.update(this.consumerId, this.businessActivityId, formValue);
return this.service.update(this.consumerId, this.businessActivityId, rest);
}
return this.service.create(this.consumerId, formValue);
return this.service.create(this.consumerId, rest);
}
}
@@ -13,6 +13,7 @@
(onAdd)="openAddForm()"
(onEdit)="onEditClick($event)"
(onDetails)="toSinglePage($event)"
(onRefresh)="refresh()"
>
</app-page-data-list>
<partner-consumer-businessActivities-form
@@ -13,6 +13,7 @@
(onAdd)="openAddForm()"
(onEdit)="onEditClick($event)"
(onDetails)="toSinglePage($event)"
(onRefresh)="refresh()"
>
</app-page-data-list>
<partner-consumer-complex-form
@@ -10,7 +10,14 @@
<app-input label="عنوان" [control]="form.controls.name" name="name" />
<app-enum-select [control]="form.controls.pos_type" type="posType" name="pos_type" />
@if (form.controls.pos_type.value === "PSP") {
<app-input label="سریال دستگاه" [control]="form.controls.serial_number" name="serial_number" />
<catalog-device-select [control]="form.controls.device_id" />
<catalog-provider-select [control]="form.controls.provider_id" />
}
@if (!editMode) {
<p-divider align="center"> اطلاعات ورود </p-divider>
<app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" />
<uikit-field label="رمز عبور" [control]="form.controls.password">
<p-password
@@ -18,7 +25,7 @@
name="password"
formControlName="password"
autocomplete="new-password"
styleClass="w-full"
inputStyleClass="w-full"
[toggleMask]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
@@ -31,7 +38,7 @@
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
styleClass="w-full"
inputStyleClass="w-full"
[toggleMask]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
@@ -39,11 +46,6 @@
</uikit-field>
}
@if (form.controls.pos_type.value === "PSP") {
<app-input label="سریال دستگاه" [control]="form.controls.serial_number" name="serial_number" />
<catalog-device-select [control]="form.controls.device_id" />
<catalog-provider-select [control]="form.controls.provider_id" />
}
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form>
</p-dialog>
@@ -10,6 +10,7 @@ import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog';
import { Divider } from 'primeng/divider';
import { Password } from 'primeng/password';
import { IPosRequest, IPosResponse } from '../../models';
import { PartnerPosesService } from '../../services/poses.service';
@@ -27,6 +28,7 @@ import { PartnerPosesService } from '../../services/poses.service';
EnumSelectComponent,
UikitFieldComponent,
Password,
Divider,
],
})
export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IPosResponse> {
@@ -2,17 +2,16 @@
pageTitle="مدیریت پایانه‌های فروش"
[addNewCtaLabel]="'افزودن پایانه‌ی فروش جدید'"
[columns]="columns"
[showAdd]="true"
emptyPlaceholderTitle="پایانه‌ی فروشی یافت نشد."
emptyPlaceholderDescription="برای افزودن پایانه‌ی فروش جدید، روی دکمهٔ بالا کلیک کنید."
[items]="items()"
[loading]="loading()"
[showDetails]="true"
[showAdd]="true"
[showEdit]="true"
(onAdd)="openAddForm()"
(onEdit)="onEditClick($event)"
(onDetails)="toSinglePage($event)"
(onRefresh)="refresh()"
>
</app-page-data-list>
<partner-consumer-pos-form
@@ -24,21 +24,27 @@ export class ConsumerPosesComponent extends AbstractList<IPosResponse> {
@Input() header: IColumn[] = [
{ field: 'id', header: 'شناسه', type: 'id' },
{ field: 'name', header: 'عنوان' },
{ field: 'serial_number', header: 'شماره سریال' },
{ field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } },
{ field: 'pos_type', header: 'نوع دستگاه' },
// { field: 'serial_number', header: 'شماره سریال' },
// { field: 'device', header: 'دستگاه', type: 'nested', nestedOption: { path: 'device.name' } },
{ field: 'pos_type', header: 'نوع پایانه' },
{
field: 'provider',
header: 'ارایه‌دهنده',
field: 'account',
header: 'کاربر',
type: 'nested',
nestedOption: { path: 'provider.name' },
},
{ field: 'status', header: 'وضعیت' },
{
field: 'created_at',
header: 'تاریخ ایجاد',
type: 'date',
nestedOption: { path: 'account.username' },
},
// {
// field: 'provider',
// header: 'ارایه‌دهنده',
// type: 'nested',
// nestedOption: { path: 'provider.name' },
// },
// { field: 'status', header: 'وضعیت' },
// {
// field: 'created_at',
// header: 'تاریخ ایجاد',
// type: 'date',
// },
];
private readonly service = inject(PartnerPosesService);
@@ -14,6 +14,8 @@ export interface IBusinessActivityRequest {
name: string;
economic_code: string;
guild_id: string;
username?: string;
password?: string;
}
interface LicenseInfo {
@@ -10,6 +10,9 @@ export interface IPosRawResponse {
complex: ISummary;
device?: ISummary;
provider?: ISummary;
account: {
username: string;
};
}
export interface IPosResponse extends IPosRawResponse {}
@@ -13,6 +13,7 @@
(onAdd)="openAddForm()"
(onDetails)="toSinglePage($event)"
(onEdit)="onEditClick($event)"
(onRefresh)="refresh()"
/>
<partner-consumer-form
[(visible)]="visibleForm"
@@ -1,7 +1,6 @@
// import { CatalogRoleTagComponent } from '@/shared/catalog/roles';
import { AbstractList } from '@/shared/abstractClasses/abstract-list';
import { PageDataListComponent } from '@/shared/components/pageDataList/page-data-list.component';
import { formatJalali } from '@/utils';
import { Component, inject } from '@angular/core';
import { Router } from '@angular/router';
import { ConsumerUserFormComponent } from '../components/form.component';
@@ -23,17 +22,18 @@ export class ConsumersComponent extends AbstractList<IConsumerResponse> {
{ field: 'id', header: 'شناسه', type: 'id' },
{ field: 'fullname', header: 'نام' },
{ field: 'mobile_number', header: 'شماره موبایل' },
{ field: 'status', header: 'وضعیت' },
{
field: 'license_expires_at',
header: 'تاریخ انقضای لایسنس',
customDataModel(item) {
if (item.license_info) {
return formatJalali(item.license_info.expires_at);
}
return 'بدون لایسنس';
},
},
{ field: 'national_code', header: 'کد ملی' },
// { field: 'status', header: 'وضعیت' },
// {
// field: 'license_expires_at',
// header: 'تاریخ انقضای لایسنس',
// customDataModel(item) {
// if (item.license_info) {
// return formatJalali(item.license_info.expires_at);
// }
// return 'بدون لایسنس';
// },
// },
{
field: 'created_at',
header: 'تاریخ ایجاد',