Merge pull request #1 from im-shubham-vish/fix-1602

Fix for DSpace#1602 Insufficient collection information when submitting an article.
im-shubham-vish · Dec 10, 2024 · 355baf7 · 355baf7
2 parents dcea3ba + c62c0af
commit 355baf7
Show file tree

Hide file tree

Showing 13 changed files with 508 additions and 41 deletions.
diff --git a/...h-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts b/...h-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
@@ -1,3 +1,12 @@
+import {
+  catchError,
+  Observable,
+  of,
+  switchMap,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Community } from 'src/app/core/shared/community.model';
+
 import { Collection } from '../../../../../core/shared/collection.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -37,6 +46,52 @@ const parent = Object.assign(new Collection(), {
   },
 });
 
-describe('JournalIssueSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7'),
-);
+function getExpectedHierarchicalTitle(parentObj: Collection, obj: ItemSearchResult): Observable<string> {
+  let titles: string[] = [];
+  if (obj.indexableObject.metadata['dc.title']) {
+    titles = [obj.indexableObject.metadata['dc.title'][0].value];
+  }
+  let currentParent: Collection = parentObj;
+
+  const fetchParentTitles = (currParent: Collection | Community): Observable<string[]> => {
+    if (!currParent) {
+      return of([]);
+    }
+
+    if (currParent.parentCommunity) {
+      return currParent.parentCommunity.pipe(
+        switchMap((remoteData: RemoteData<Community>) => {
+          if (remoteData.hasSucceeded && remoteData.payload) {
+            const parentTitle = remoteData.payload.name;
+            titles.unshift(parentTitle);
+            return fetchParentTitles(remoteData.payload);
+          }
+          return of([]);
+        }),
+        catchError(() => of([])),
+      );
+    } else {
+      return of([]);
+    }
+  };
+
+  return fetchParentTitles(currentParent).pipe(
+    switchMap(() => titles.join(' > ')),
+  );
+}
+
+const expectedHierarchicalTitle = getExpectedHierarchicalTitle(parent, object);
+if (expectedHierarchicalTitle) {
+  expectedHierarchicalTitle.subscribe((hierarchicalTitle: string) => {
+    describe('JournalIssueSidebarSearchListElementComponent', () => {
+      createSidebarSearchListElementTests(
+        JournalIssueSidebarSearchListElementComponent,
+        object,
+        parent,
+        hierarchicalTitle,
+        'title',
+        '1234, 5678',
+      );
+    });
+  });
+}
diff --git a/...list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts b/...list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
@@ -1,3 +1,12 @@
+import {
+  catchError,
+  Observable,
+  of,
+  switchMap,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Community } from 'src/app/core/shared/community.model';
+
 import { Collection } from '../../../../../core/shared/collection.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -40,6 +49,45 @@ const parent = Object.assign(new Collection(), {
   },
 });
 
-describe('JournalVolumeSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)'),
-);
+function getExpectedHierarchicalTitle(parentObj: Collection, obj: ItemSearchResult): Observable<string> {
+  let titles: string[] = [];
+  if (obj.indexableObject.metadata['dc.title']) {
+    titles = [obj.indexableObject.metadata['dc.title'][0].value];
+  }
+  let currentParent: Collection = parentObj;
+
+  const fetchParentTitles = (currParent: Collection | Community): Observable<string[]> => {
+    if (!currParent) {
+      return of([]);
+    }
+
+    if (currParent.parentCommunity) {
+      return currParent.parentCommunity.pipe(
+        switchMap((remoteData: RemoteData<Community>) => {
+          if (remoteData.hasSucceeded && remoteData.payload) {
+            const parentTitle = remoteData.payload.name;
+            titles.unshift(parentTitle);
+            return fetchParentTitles(remoteData.payload);
+          }
+          return of([]);
+        }),
+        catchError(() => of([])),
+      );
+    } else {
+      return of([]);
+    }
+  };
+
+  return fetchParentTitles(currentParent).pipe(
+    switchMap(() => titles.join(' > ')),
+  );
+}
+
+const expectedHierarchicalTitle = getExpectedHierarchicalTitle(parent, object);
+if (expectedHierarchicalTitle) {
+  expectedHierarchicalTitle.subscribe((hierarchicalTitle: string) => {
+    describe('JournalVolumeSidebarSearchListElementComponent', () => {
+      createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, hierarchicalTitle, 'title', 'journal title (1) (2)');
+    });
+  });
+}
diff --git a/...idebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts b/...idebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
@@ -1,3 +1,13 @@
+import {
+  catchError,
+  map,
+  Observable,
+  of,
+  switchMap,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Community } from 'src/app/core/shared/community.model';
+
 import { Collection } from '../../../../../core/shared/collection.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -35,6 +45,48 @@ const parent = Object.assign(new Collection(), {
   },
 });
 
-describe('JournalSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678'),
-);
+function getExpectedHierarchicalTitle(parentObj: Collection, obj: ItemSearchResult): Observable<string> {
+  let titles: string[] = [];
+  if (obj.indexableObject.metadata['dc.title']) {
+    titles = [obj.indexableObject.metadata['dc.title'][0].value];
+  }
+  let currentParent: Collection = parentObj;
+
+  const fetchParentTitles = (currParent: Collection | Community): Observable<string[]> => {
+    if (!currParent) {
+      return of([]);
+    }
+
+    if (currParent.parentCommunity) {
+      return currParent.parentCommunity.pipe(
+        switchMap((remoteData: RemoteData<Community>) => {
+          if (remoteData.hasSucceeded && remoteData.payload) {
+            const parentTitle = remoteData.payload.name;
+            titles.unshift(parentTitle);
+            if (remoteData.payload) {
+              return fetchParentTitles(remoteData.payload);
+            }
+          }
+          return of([]);
+        }),
+        catchError(() => of([])),
+        map(() => titles),
+      );
+    }
+  };
+
+  if (fetchParentTitles(currentParent)) {
+    return fetchParentTitles(currentParent).pipe(
+      map(() => titles.join(' > ')),
+    );
+  }
+}
+
+const expectedHierarchicalTitle = getExpectedHierarchicalTitle(parent, object);
+if (expectedHierarchicalTitle) {
+  expectedHierarchicalTitle.subscribe((hierarchicalTitle: string) => {
+    describe('JournalSidebarSearchListElementComponent', () => {
+      createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, hierarchicalTitle, 'title', '1234, 5678');
+    });
+  });
+}
diff --git a/...ebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/...ebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
@@ -1,3 +1,12 @@
+import {
+  catchError,
+  Observable,
+  of,
+  switchMap,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Community } from 'src/app/core/shared/community.model';
+
 import { Collection } from '../../../../../core/shared/collection.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -37,6 +46,45 @@ const parent = Object.assign(new Collection(), {
   },
 });
 
-describe('OrgUnitSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
-);
+function getExpectedHierarchicalTitle(parentObj: Collection, obj: ItemSearchResult): Observable<string> {
+  let titles: string[] = [];
+  if (obj.indexableObject.metadata['dc.title']) {
+    titles = [obj.indexableObject.metadata['dc.title'][0].value];
+  }
+  let currentParent: Collection = parentObj;
+
+  const fetchParentTitles = (currParent: Collection | Community): Observable<string[]> => {
+    if (!currParent) {
+      return of([]);
+    }
+
+    if (currParent.parentCommunity) {
+      return currParent.parentCommunity.pipe(
+        switchMap((remoteData: RemoteData<Community>) => {
+          if (remoteData.hasSucceeded && remoteData.payload) {
+            const parentTitle = remoteData.payload.name;
+            titles.unshift(parentTitle);
+            return fetchParentTitles(remoteData.payload);
+          }
+          return of([]);
+        }),
+        catchError(() => of([])),
+      );
+    } else {
+      return of([]);
+    }
+  };
+
+  return fetchParentTitles(currentParent).pipe(
+    switchMap(() => titles.join(' > ')),
+  );
+}
+
+const expectedHierarchicalTitle = getExpectedHierarchicalTitle(parent, object);
+if (expectedHierarchicalTitle) {
+  expectedHierarchicalTitle.subscribe((hierarchicalTitle: string) => {
+    describe('OrgUnitSidebarSearchListElementComponent', () => {
+      createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, hierarchicalTitle, 'title', 'description');
+    });
+  });
+}
diff --git a/.../sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/.../sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
@@ -1,3 +1,12 @@
+import {
+  catchError,
+  Observable,
+  of,
+  switchMap,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Community } from 'src/app/core/shared/community.model';
+
 import { Collection } from '../../../../../core/shared/collection.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -42,7 +51,45 @@ const parent = Object.assign(new Collection(), {
   },
 });
 
-describe('PersonSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [
-  ]),
-);
+function getExpectedHierarchicalTitle(parentObj: Collection, obj: ItemSearchResult): Observable<string> {
+  let titles: string[] = [];
+  if (obj.indexableObject.metadata['dc.title']) {
+    titles = [obj.indexableObject.metadata['dc.title'][0].value];
+  }
+  let currentParent: Collection = parentObj;
+
+  const fetchParentTitles = (currParent: Collection | Community): Observable<string[]> => {
+    if (!currParent) {
+      return of([]);
+    }
+
+    if (currParent.parentCommunity) {
+      return currParent.parentCommunity.pipe(
+        switchMap((remoteData: RemoteData<Community>) => {
+          if (remoteData.hasSucceeded && remoteData.payload) {
+            const parentTitle = remoteData.payload.name;
+            titles.unshift(parentTitle);
+            return fetchParentTitles(remoteData.payload);
+          }
+          return of([]);
+        }),
+        catchError(() => of([])),
+      );
+    } else {
+      return of([]);
+    }
+  };
+
+  return fetchParentTitles(currentParent).pipe(
+    switchMap(() => titles.join(' > ')),
+  );
+}
+
+const expectedHierarchicalTitle = getExpectedHierarchicalTitle(parent, object);
+if (expectedHierarchicalTitle) {
+  expectedHierarchicalTitle.subscribe((hierarchicalTitle: string) => {
+    describe('PersonSidebarSearchListElementComponent', () => {
+      createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, hierarchicalTitle, 'family name,given name', 'job title', []);
+    });
+  });
+}
diff --git a/...idebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts b/...idebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
@@ -1,3 +1,12 @@
+import {
+  catchError,
+  Observable,
+  of,
+  switchMap,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Community } from 'src/app/core/shared/community.model';
+
 import { Collection } from '../../../../../core/shared/collection.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -27,6 +36,45 @@ const parent = Object.assign(new Collection(), {
   },
 });
 
-describe('ProjectSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined),
-);
+function getExpectedHierarchicalTitle(parentObj: Collection, obj: ItemSearchResult): Observable<string> {
+  let titles: string[] = [];
+  if (obj.indexableObject.metadata['dc.title']) {
+    titles = [obj.indexableObject.metadata['dc.title'][0].value];
+  }
+  let currentParent: Collection = parentObj;
+
+  const fetchParentTitles = (currParent: Collection | Community): Observable<string[]> => {
+    if (!currParent) {
+      return of([]);
+    }
+
+    if (currParent.parentCommunity) {
+      return currParent.parentCommunity.pipe(
+        switchMap((remoteData: RemoteData<Community>) => {
+          if (remoteData.hasSucceeded && remoteData.payload) {
+            const parentTitle = remoteData.payload.name;
+            titles.unshift(parentTitle);
+            return fetchParentTitles(remoteData.payload);
+          }
+          return of([]);
+        }),
+        catchError(() => of([])),
+      );
+    } else {
+      return of([]);
+    }
+  };
+
+  return fetchParentTitles(currentParent).pipe(
+    switchMap(() => titles.join(' > ')),
+  );
+}
+
+const expectedHierarchicalTitle = getExpectedHierarchicalTitle(parent, object);
+if (expectedHierarchicalTitle) {
+  expectedHierarchicalTitle.subscribe((hierarchicalTitle: string) => {
+    describe('ProjectSidebarSearchListElementComponent', () => {
+      createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, hierarchicalTitle, 'title', undefined);
+    });
+  });
+}