fix merge conflicts

src/app/admin/admin-routing.module.ts

@@ -6,7 +6,7 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
 import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { LDN_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
+import { LDN_PATH, NOTIFY_DASHBOARD_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
 
 @NgModule({
@@ -64,6 +64,11 @@ import { BatchImportPageComponent } from './admin-import-batch-page/batch-import
         loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule),
         data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'}
       },
+      {
+        path: NOTIFY_DASHBOARD_MODULE_PATH,
+        loadChildren: () => import('./admin-notify-dashboard/admin-notify-dashboard.module')
+            .then((m) => m.AdminNotifyDashboardModule),
+      },
     ]),
   ],
   providers: [

src/app/shared/search/search.component.html

@@ -22,7 +22,7 @@
         </div>
         <div id="search-content" class="col-12">
             <div class="d-block d-md-none search-controls clearfix">
-                <ds-view-mode-switch [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
+                <ds-view-mode-switch *ngIf="showViewModes"  [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
                 <button [attr.aria-label]="'search.sidebar.open' | translate" (click)="openSidebar()"
                         aria-controls="search-sidebar-content"
                         class="btn btn-outline-primary float-right open-sidebar"><i

src/config/app-config.interface.ts

@@ -24,6 +24,9 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import {QualityAssuranceConfig} from './quality-assurance.config';
+import {
+  AdminNotifyMetricsRow
+} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -52,6 +55,7 @@ interface AppConfig extends Config {
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
   qualityAssuranceConfig: QualityAssuranceConfig;
+  notifyMetrics: AdminNotifyMetricsRow[];
 }
 
 /**

src/config/default-app-config.ts

@@ -24,6 +24,9 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import {QualityAssuranceConfig} from './quality-assurance.config';
+import {
+  AdminNotifyMetricsRow
+} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -451,4 +454,69 @@ export class DefaultAppConfig implements AppConfig {
     },
     pageSize: 5,
   };
+
+  notifyMetrics: AdminNotifyMetricsRow[] = [
+    {
+      title: 'admin-notify-dashboard.received-ldn',
+      boxes: [
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.accepted',
+          config: 'NOTIFY.incoming.accepted'
+        },
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.processed',
+          config: 'NOTIFY.incoming.processed'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.failure',
+          config: 'NOTIFY.incoming.failure'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.untrusted',
+          config: 'NOTIFY.incoming.untrusted'
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.involved-items',
+          textColor: '#fff',
+          config: 'NOTIFY.incoming.involvedItems',
+        },
+      ]
+    },
+    {
+      title: 'admin-notify-dashboard.generated-ldn',
+      boxes: [
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.delivered',
+          config: 'NOTIFY.outgoing.delivered'
+        },
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.queued',
+          config: 'NOTIFY.outgoing.queued'
+        },
+        {
+          color: '#FDEEBB',
+          title: 'admin-notify-dashboard.queued-for-retry',
+          config: 'NOTIFY.outgoing.queued_for_retry'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.failure',
+          config: 'NOTIFY.outgoing.failure'
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.involved-items',
+          textColor: '#fff',
+          config: 'NOTIFY.outgoing.involvedItems',
+        },
+      ]
+    }
+  ]
 }