diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts index a03333d276..71be6424df 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts @@ -82,26 +82,7 @@ export class AdminNotifyDashboardComponent implements OnInit{ return this.metricsConfig.map(row => { return { ...row, - boxes: row.boxes.map(rowBox => { - // TODO remove aggregate once rest is updated - if (rowBox.isRowAggregateCount) { - const currentRowBoxesWithCount = row.boxes.filter(box => !box.isRowAggregateCount) - .map(notAggregateBox => { - return { - ...notAggregateBox, - count: boxesWithCount.find(boxWithCount => boxWithCount.config === notAggregateBox.config)?.count - }; - }); - return { - ...rowBox, - count: currentRowBoxesWithCount.map(box => box.count).reduce((accumulator, currentValue) => { - return accumulator + currentValue; - },0) - }; - } else { - return boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config); - } - }) + boxes: row.boxes.map(rowBox =>boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config)) }; }); } diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts index 190d14df0a..bbceb10c20 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts @@ -4,7 +4,6 @@ export interface AdminNotifyMetricsBox { title: string; config: string; count?: number; - isRowAggregateCount?: boolean; } export interface AdminNotifyMetricsRow { diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 3b8717ba86..12a99397d5 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -475,8 +475,7 @@ export class DefaultAppConfig implements AppConfig { color: '#43515F', title: 'admin-notify-dashboard.involved-items', textColor: '#fff', - config: '', - isRowAggregateCount: true + config: 'NOTIFY.incoming.involvedItems', }, ] }, @@ -507,8 +506,7 @@ export class DefaultAppConfig implements AppConfig { color: '#43515F', title: 'admin-notify-dashboard.involved-items', textColor: '#fff', - config: '', - isRowAggregateCount: true + config: 'NOTIFY.outgoing.involvedItems', }, ] } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 165b311de8..de07503343 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -347,8 +347,7 @@ export const environment: BuildConfig = { color: '#43515F', title: 'admin-notify-dashboard.involved-items', textColor: '#fff', - config: '', - isRowAggregateCount: true + config: 'NOTIFY.incoming.involvedItems', }, ] }, @@ -379,8 +378,7 @@ export const environment: BuildConfig = { color: '#43515F', title: 'admin-notify-dashboard.involved-items', textColor: '#fff', - config: '', - isRowAggregateCount: true + config: 'NOTIFY.outgoing.involvedItems', }, ] }