Browse Source

Add tags support in accounts

pull/7242/head
Thomas Kaul 1 week ago
parent
commit
c47aa65e28
  1. 3
      libs/ui/src/lib/activities-table/activities-table.component.html
  2. 14
      libs/ui/src/lib/activities-table/activities-table.component.ts

3
libs/ui/src/lib/activities-table/activities-table.component.html

@ -166,9 +166,6 @@
@if (element.isDraft) { @if (element.isDraft) {
<span class="badge badge-secondary ml-1" i18n>Draft</span> <span class="badge badge-secondary ml-1" i18n>Draft</span>
} }
@for (tag of getTags(element); track tag.id) {
<span class="badge badge-light ml-1">{{ tag.name }}</span>
}
</div> </div>
@if ( @if (
element.SymbolProfile?.dataSource !== 'MANUAL' && element.SymbolProfile?.dataSource !== 'MANUAL' &&

14
libs/ui/src/lib/activities-table/activities-table.component.ts

@ -68,7 +68,6 @@ import {
tabletLandscapeOutline, tabletLandscapeOutline,
trashOutline trashOutline
} from 'ionicons/icons'; } from 'ionicons/icons';
import { uniqBy } from 'lodash';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { GfActivityTypeComponent } from '../activity-type/activity-type.component'; import { GfActivityTypeComponent } from '../activity-type/activity-type.component';
@ -266,19 +265,6 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
); );
} }
public getTags({ account, tags = [] }: Activity) {
return uniqBy([...tags, ...(account?.tags ?? [])], 'id')
.filter(({ id }) => {
return id !== TAG_ID_EXCLUDE_FROM_ANALYSIS;
})
.map((tag) => {
return {
...tag,
name: translate(tag.name)
};
});
}
public isExcludedFromAnalysis(activity: Activity) { public isExcludedFromAnalysis(activity: Activity) {
return ( return (
(activity.account && isAccountExcluded(activity.account)) || (activity.account && isAccountExcluded(activity.account)) ||

Loading…
Cancel
Save