From 4292c01d8fbaf38a86afcad299da4ed784cafa42 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 5 Jan 2024 13:22:17 +0100
Subject: [PATCH] clean up

---
 .../admin-notify-search-result.component.ts   |  9 ++--
 .../listable-object.decorator.ts              |  2 +-
 ...bjects-collection-tabulatable.component.ts |  4 --
 .../tabulatable-objects.decorator.ts          | 51 ++-----------------
 ...ulatable-result-list-elements.component.ts |  9 +---
 5 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
index f0c9e3f7d8..0f4fbb28d3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -31,11 +31,8 @@ export class AdminNotifySearchResultComponent  extends TabulatableResultListElem
       QUEUE_STATUS_UNMAPPED_ACTION: 'Unmapped action',
     };
 
-    constructor(private modalService: NgbModal,
-                protected truncatableService: TruncatableService,
-                public dsoNameService: DSONameService,
-                @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
-      super(truncatableService, dsoNameService, appConfig);
+    constructor(private modalService: NgbModal) {
+      super();
     }
 
   /**
@@ -50,7 +47,7 @@ export class AdminNotifySearchResultComponent  extends TabulatableResultListElem
     });
   }
 
-  /**
+    /**
    * Open modal for details visualization
    * @param message the message to be displayed
    */
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
index f56e983dff..4f1a04a985 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
@@ -133,7 +133,7 @@ export function getListableObjectComponent(types: (string | GenericConstructor<L
  * @param defaults        the default values to use for each level, in case no value is found for the key at that index
  * @returns matchAndLevel a {@link MatchRelevancy} object containing the match and its level of relevancy
  */
-function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
+export function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
   let currentMap = typeMap;
   let level = -1;
   let relevancy = 0;
diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
index c6b6b1bb5b..3118ec255e 100644
--- a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
+++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
@@ -73,10 +73,6 @@ export class AbstractTabulatableElementComponent<T extends PaginatedList<Listabl
    */
   contexts = Context;
 
-  constructor(
-    public dsoNameService: DSONameService,
-  ) {
-  }
 
 }
 
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
index bfe57149da..c3c23e67fc 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
@@ -6,7 +6,7 @@ import { ListableObject } from '../listable-object.model';
 import {
   DEFAULT_CONTEXT,
   DEFAULT_THEME,
-  DEFAULT_VIEW_MODE,
+  DEFAULT_VIEW_MODE, getMatch,
   MatchRelevancy, resolveTheme
 } from '../listable-object/listable-object.decorator';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
@@ -15,7 +15,7 @@ import { PaginatedList } from '../../../../core/data/paginated-list.model';
 const map = new Map();
 
 /**
- * Decorator used for rendering a listable object
+ * Decorator used for rendering tabulatable objects
  * @param objectType The object type or entity type the component represents
  * @param viewMode The view mode the component represents
  * @param context The optional context the component represents
@@ -40,12 +40,12 @@ export function tabulatableObjectsComponent(objectsType: string | GenericConstru
 }
 
 /**
- * Getter to retrieve the matching listable object component
+ * Getter to retrieve the matching tabulatable objects component
  *
  * Looping over the provided types, it'll attempt to find the best match depending on the {@link MatchRelevancy} returned by getMatch()
  * The most relevant match between types is kept and eventually returned
  *
- * @param types The types of which one should match the listable component
+ * @param types The types of which one should match the tabulatable component
  * @param viewMode The view mode that should match the components
  * @param context The context that should match the components
  * @param theme The theme that should match the components
@@ -63,46 +63,3 @@ export function getTabulatableObjectsComponent(types: (string | GenericConstruct
   }
   return hasValue(currentBestMatch) ? currentBestMatch.match : null;
 }
-
-/**
- * Find an object within a nested map, matching the provided keys as best as possible, falling back on defaults wherever
- * needed.
- *
- * Starting off with a Map, it loops over the provided keys, going deeper into the map until it finds a value
- * If at some point, no value is found, it'll attempt to use the default value for that index instead
- * If the default value exists, the index is stored in the "level"
- * If no default value exists, 1 is added to "relevancy"
- * See {@link MatchRelevancy} what these represent
- *
- * @param typeMap         a multi-dimensional map
- * @param keys            the keys of the multi-dimensional map to loop over. Each key represents a level within the map
- * @param defaults        the default values to use for each level, in case no value is found for the key at that index
- * @returns matchAndLevel a {@link MatchRelevancy} object containing the match and its level of relevancy
- */
-function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
-  let currentMap = typeMap;
-  let level = -1;
-  let relevancy = 0;
-  for (let i = 0; i < keys.length; i++) {
-    // If we're currently checking the theme, resolve it first to take extended themes into account
-    let currentMatch = defaults[i] === DEFAULT_THEME ? resolveTheme(currentMap, keys[i]) : currentMap.get(keys[i]);
-    if (hasNoValue(currentMatch)) {
-      currentMatch = currentMap.get(defaults[i]);
-      if (level === -1) {
-        level = i;
-      }
-    } else {
-      relevancy++;
-    }
-    if (hasValue(currentMatch)) {
-      if (currentMatch instanceof Map) {
-        currentMap = currentMatch as Map<any, any>;
-      } else {
-        return new MatchRelevancy(currentMatch, level > -1 ? level : i + 1, relevancy);
-      }
-    } else {
-      return null;
-    }
-  }
-  return null;
-}
diff --git a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
index 956f750b9e..b1be6443b8 100644
--- a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
@@ -12,11 +12,4 @@ import { SearchResult } from '../../../search/models/search-result.model';
   selector: 'ds-search-result-list-element',
   template: ``
 })
-export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends SearchResult<any>> extends AbstractTabulatableElementComponent<T> {
-  public constructor(protected truncatableService: TruncatableService,
-                     public dsoNameService: DSONameService,
-                     @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
-    super(dsoNameService);
-  }
-
-}
+export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends SearchResult<any>> extends AbstractTabulatableElementComponent<T> {}