Browse Source

fix(client): resolve type errors

pull/7309/head
KenTandrian 2 days ago
parent
commit
f274ba7789
  1. 4
      apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html
  2. 9
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  3. 6
      apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
  4. 4
      apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts

4
apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html

@ -7,8 +7,8 @@
>
<div class="py-3" mat-dialog-content>
@if (
data.rule.configuration.thresholdMin &&
data.rule.configuration.thresholdMax
data.rule.configuration?.thresholdMin &&
data.rule.configuration?.thresholdMax
) {
<div class="w-100">
<h6 class="d-flex mb-0">

9
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -52,7 +52,7 @@ import { ImportActivitiesDialogParams } from './import-activities-dialog/interfa
})
export class GfActivitiesPageComponent implements OnInit {
public activityTypesFilter: string[] = [];
public dataSource: MatTableDataSource<Activity>;
public dataSource: MatTableDataSource<Activity> | undefined;
public deviceType: string;
public hasImpersonationId: boolean;
public hasPermissionToCreateActivity: boolean;
@ -238,7 +238,7 @@ export class GfActivitiesPageComponent implements OnInit {
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((data) => {
for (const activity of data.activities) {
delete activity.id;
delete (activity as Omit<typeof activity, 'id'> & { id?: string }).id;
}
downloadAsFile({
@ -383,7 +383,7 @@ export class GfActivitiesPageComponent implements OnInit {
});
}
private isCalendarYear(dateRange: DateRange) {
private isCalendarYear(dateRange?: DateRange) {
if (!dateRange) {
return false;
}
@ -410,11 +410,12 @@ export class GfActivitiesPageComponent implements OnInit {
date: new Date(),
id: null,
fee: 0,
SymbolProfile: null,
type: aActivity?.type ?? 'BUY',
unitPrice: null
},
user: this.user
},
} satisfies CreateOrUpdateActivityDialogParams,
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
});

6
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

@ -536,7 +536,11 @@ export class GfCreateOrUpdateActivityDialogComponent {
this.dialogRef.close(activity);
} else {
(activity as UpdateOrderDto).id = this.data.activity?.id;
const activityId = this.data.activity?.id;
if (!activityId) {
throw new Error('Activity ID is required for update');
}
(activity as UpdateOrderDto).id = activityId;
await validateObjectForForm({
classDto: UpdateOrderDto,

4
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts

@ -4,7 +4,9 @@ import { Account } from '@prisma/client';
export interface CreateOrUpdateActivityDialogParams {
accounts: Account[];
activity: Omit<Activity, 'SymbolProfile'> & {
activity: Partial<Omit<Activity, 'SymbolProfile' | 'id' | 'unitPrice'>> & {
id: string | null;
unitPrice: number | null;
SymbolProfile: Activity['SymbolProfile'] | null;
};
user: User;

Loading…
Cancel
Save