Tags
diff --git a/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts
index c6cfce1ee..8178838ab 100644
--- a/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts
@@ -9,6 +9,7 @@ export interface HoldingDetailDialogParams {
deviceType: string;
hasImpersonationId: boolean;
hasPermissionToReportDataGlitch: boolean;
+ hasPermissionToUpdateOrder: boolean;
locale: string;
symbol: string;
}
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
index dedcdd4a9..323796bef 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
@@ -53,8 +53,8 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
public isToday = isToday;
public mode: 'create' | 'update';
public platforms: { id: string; name: string }[];
- public separatorKeysCodes: number[] = [ENTER, COMMA];
- public tags: Tag[] = [];
+ public separatorKeysCodes: number[] = [COMMA, ENTER];
+ public tagsAvailable: Tag[] = [];
public total = 0;
public typesTranslationMap = new Map
();
public Validators = Validators;
@@ -81,7 +81,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
this.currencies = currencies;
this.defaultDateFormat = getDateFormatString(this.locale);
this.platforms = platforms;
- this.tags = tags.map(({ id, name }) => {
+ this.tagsAvailable = tags.map(({ id, name }) => {
return {
id,
name: translate(name)
@@ -287,7 +287,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
].valueChanges.pipe(
startWith(this.activityForm.get('tags').value),
map((aTags: Tag[] | null) => {
- return aTags ? this.filterTags(aTags) : this.tags.slice();
+ return aTags ? this.filterTags(aTags) : this.tagsAvailable.slice();
})
);
@@ -441,10 +441,11 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
public onAddTag(event: MatAutocompleteSelectedEvent) {
this.activityForm.get('tags').setValue([
...(this.activityForm.get('tags').value ?? []),
- this.tags.find(({ id }) => {
+ this.tagsAvailable.find(({ id }) => {
return id === event.option.value;
})
]);
+
this.tagInput.nativeElement.value = '';
}
@@ -518,12 +519,12 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
}
private filterTags(aTags: Tag[]) {
- const tagIds = aTags.map((tag) => {
- return tag.id;
+ const tagIds = aTags.map(({ id }) => {
+ return id;
});
- return this.tags.filter((tag) => {
- return !tagIds.includes(tag.id);
+ return this.tagsAvailable.filter(({ id }) => {
+ return !tagIds.includes(id);
});
}
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
index 56cb66fcd..7795688c0 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
@@ -378,11 +378,11 @@