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

101623: Refactor BrowseDefinition model/resource-type to FlatBrowseDefinition

Browse Source
This commit is contained in:
Nona Luypaert
2023-05-10 10:11:06 +02:00
parent 2a84c42531
commit c10e660e0b
14 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/core/shared/operators.ts
View File

@@ -6,7 +6,7 @@ import { PaginatedList } from '../data/paginated-list.model';
import { RemoteData } from '../data/remote-data';
import { MetadataField } from '../metadata/metadata-field.model';
import { MetadataSchema } from '../metadata/metadata-schema.model';
import { BrowseDefinition } from './browse-definition.model';
import { FlatBrowseDefinition } from './flat-browse-definition.model';
import { DSpaceObject } from './dspace-object.model';
import { InjectionToken } from '@angular/core';
import { MonoTypeOperatorFunction, SchedulerLike } from 'rxjs/internal/types';
@@ -171,17 +171,17 @@ export const toDSpaceObjectListRD = <T extends DSpaceObject>() =>
/**
* Get the browse links from a definition by ID given an array of all definitions
* @param {string} definitionID
* @returns {(source: Observable<RemoteData<BrowseDefinition[]>>) => Observable<any>}
* @returns {(source: Observable<RemoteData<FlatBrowseDefinition[]>>) => Observable<any>}
*/
export const getBrowseDefinitionLinks = (definitionID: string) =>
(source: Observable<RemoteData<PaginatedList<BrowseDefinition>>>): Observable<any> =>
(source: Observable<RemoteData<PaginatedList<FlatBrowseDefinition>>>): Observable<any> =>
source.pipe(
getRemoteDataPayload(),
getPaginatedListPayload(),
map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
.find((def: BrowseDefinition) => def.id === definitionID)
map((browseDefinitions: FlatBrowseDefinition[]) => browseDefinitions
.find((def: FlatBrowseDefinition) => def.id === definitionID)
),
map((def: BrowseDefinition) => {
map((def: FlatBrowseDefinition) => {
if (isNotEmpty(def)) {
return def._links;
} else {