hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 14:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
FrancescoMolinaro
2024-01-05 13:22:17 +01:00
parent 6254efa084
commit 4292c01d8f
5 changed files with 9 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
View File

@@ -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
*/

2
src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
View File

@@ -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;

4
src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
View File

@@ -73,10 +73,6 @@ export class AbstractTabulatableElementComponent<T extends PaginatedList<Listabl
*/
contexts = Context;
constructor(
public dsoNameService: DSONameService,
) {
}
}

51
src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
View File

@@ -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;
}

9
src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
View File

@@ -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> {}