Fix for #1602 Insufficient collection information when submitting an article

im-shubham-vish · im-shubham-vish · commit da2f6e74a0e3 · 2025-06-18T17:14:14.000+05:30
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
@@ -31,12 +31,19 @@ const parent = Object.assign(new Collection(), {
   metadata: {
     'dc.title': [
       {
-        value: 'parent title',
+        value: 'community title > collection title',
       },
     ],
   },
 });
 
 describe('JournalIssueSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7'),
+  createSidebarSearchListElementTests(
+    JournalIssueSidebarSearchListElementComponent,
+    object,
+    parent,
+    'community title > collection title',
+    'title',
+    '5 - 7',
+  )
 );
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
@@ -34,12 +34,18 @@ const parent = Object.assign(new Collection(), {
   metadata: {
     'dc.title': [
       {
-        value: 'parent title',
+        value: 'community title > collection title',
       },
     ],
   },
 });
 
 describe('JournalVolumeSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)'),
+  createSidebarSearchListElementTests(
+    JournalVolumeSidebarSearchListElementComponent,
+    object, parent,
+    'community title > collection title',
+    'title',
+    'journal title (1) (2)')
 );
+
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
@@ -29,12 +29,20 @@ const parent = Object.assign(new Collection(), {
   metadata: {
     'dc.title': [
       {
-        value: 'parent title',
+        value: 'parent community-title > parent collection-title',
       },
     ],
   },
 });
 
 describe('JournalSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678'),
+  createSidebarSearchListElementTests(
+    JournalSidebarSearchListElementComponent,
+    object,
+    parent,
+    'parent community-title > parent collection-title',
+    'title',
+    '1234, 5678'
+  )
 );
+
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
@@ -31,12 +31,12 @@ const parent = Object.assign(new Collection(), {
   metadata: {
     'dc.title': [
       {
-        value: 'parent title',
+        value: 'community title > collection title',
       },
     ],
   },
 });
 
 describe('OrgUnitSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
+  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'community title > collection title', 'title', 'description')
 );
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
@@ -36,13 +36,13 @@ const parent = Object.assign(new Collection(), {
   metadata: {
     'dc.title': [
       {
-        value: 'parent title',
+        value: 'community title > collection title',
       },
     ],
   },
 });
 
 describe('PersonSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [
-  ]),
+  createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'community title > collection title', 'family name, given name', 'job title', [])
 );
+
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
@@ -21,12 +21,13 @@ const parent = Object.assign(new Collection(), {
   metadata: {
     'dc.title': [
       {
-        value: 'parent title',
+        value: 'community title > collection title',
       },
     ],
   },
 });
 
 describe('ProjectSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined),
+  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'community title > collection title', 'title', undefined)
 );
+
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
@@ -3,6 +3,7 @@ import { Community } from '../../../../core/shared/community.model';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec';
 import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component';
+import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
 
 const object = Object.assign(new CollectionSearchResult(), {
   indexableObject: Object.assign(new Collection(), {
@@ -21,6 +22,8 @@ const object = Object.assign(new CollectionSearchResult(), {
     },
   }),
 });
+object.indexableObject.getParentLinkKey = () => 'parentCommunity';
+
 const parent = Object.assign(new Community(), {
   id: 'test-community',
   metadata: {
@@ -33,5 +36,5 @@ const parent = Object.assign(new Community(), {
 });
 
 describe('CollectionSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
+  createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
 );
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
@@ -20,6 +20,8 @@ const object = Object.assign(new CommunitySearchResult(), {
     },
   }),
 });
+object.indexableObject.getParentLinkKey = () => 'parentCommunity';
+
 const parent = Object.assign(new Community(), {
   id: 'test-parent-community',
   metadata: {
@@ -32,5 +34,6 @@ const parent = Object.assign(new Community(), {
 });
 
 describe('CommunitySidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
+  createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
 );
+
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
@@ -36,12 +36,12 @@ const parent = Object.assign(new Collection(), {
   metadata: {
     'dc.title': [
       {
-        value: 'parent title',
+        value: 'communtity title > collection title',
       },
     ],
   },
 });
 
 describe('PublicationSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '(publisher, date) author'),
+  createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'communtity title > collection title', 'title', '(publisher, date) author')
 );
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
@@ -1,6 +1,6 @@
-<ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
+<ds-truncatable-part [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
   <div [ngClass]="isCurrent() ? 'text-light' : 'text-body'"
-  [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
+       [innerHTML]="(hierarchicalTitle$ && hierarchicalTitle$ | async) ? (hierarchicalTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
 </ds-truncatable-part>
 <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
   <div class="fw-bold"
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
@@ -22,7 +22,7 @@ export function createSidebarSearchListElementTests(
   componentClass: any,
   object: SearchResult<DSpaceObject & ChildHALResource>,
   parent: DSpaceObject,
-  expectedParentTitle: string,
+  expectedHierarchicalTitle: string,
   expectedTitle: string,
   expectedDescription: string,
   extraProviders: any[] = [],
@@ -39,6 +39,7 @@ export function createSidebarSearchListElementTests(
           [object.indexableObject.getParentLinkKey()]: createSuccessfulRemoteDataObject$(parent),
         }),
       });
+
       TestBed.configureTestingModule({
         imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), VarDirective],
         providers: [
@@ -59,10 +60,16 @@ export function createSidebarSearchListElementTests(
       fixture.detectChanges();
     });
 
-    it('should contain the correct parent title', (done) => {
-      component.parentTitle$.subscribe((title) => {
-        expect(title).toEqual(expectedParentTitle);
-        done();
+    it('should contain the correct hierarchical title', (done) => {
+      component.hierarchicalTitle$.subscribe({
+        next: (title) => {
+          expect(title).toEqual(expectedHierarchicalTitle);
+          done();
+        },
+        error: (err) => {
+          fail('hierarchicalTitle$ threw an error: ' + err);
+          done();
+        },
       });
     });
 
@@ -75,3 +82,4 @@ export function createSidebarSearchListElementTests(
     });
   };
 }
+
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,19 +1,22 @@
 import {
   AsyncPipe,
   NgClass,
+  NgIf,
 } from '@angular/common';
 import {
   Component,
   OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
+  from,
   Observable,
-  of,
+  of as observableOf,
 } from 'rxjs';
 import {
+  catchError,
   find,
-  map,
+  switchMap,
 } from 'rxjs/operators';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
@@ -36,12 +39,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element/
   selector: 'ds-sidebar-search-list-element',
   templateUrl: './sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [
-    AsyncPipe,
-    NgClass,
-    TranslateModule,
-    TruncatablePartComponent,
-  ],
+  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link SearchResult} in the sidebar search modal
@@ -50,9 +48,9 @@ import { SearchResultListElementComponent } from '../search-result-list-element/
  */
 export class SidebarSearchListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends SearchResultListElementComponent<T, K> implements OnInit {
   /**
-   * Observable for the title of the parent object (displayed above the object's title)
+   * Observable for the hierarchical title i.e community > subcommunity > collection
    */
-  parentTitle$: Observable<string>;
+  hierarchicalTitle$: Observable<string>;
 
   /**
    * A description to display below the title
@@ -72,7 +70,7 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
   ngOnInit(): void {
     super.ngOnInit();
     if (hasValue(this.dso)) {
-      this.parentTitle$ = this.getParentTitle();
+      this.hierarchicalTitle$ = this.getHierarchicalName();
       this.description = this.getDescription();
     }
   }
@@ -86,27 +84,68 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
 
   /**
    * Get the title of the object's parent
-   * Retrieve the parent by using the object's parent link and retrieving its 'dc.title' metadata
+   * keep on Retrieving recursively the parent by using the object's parent link and retrieving its 'dc.title' metadata
+   * and build a heirarchical name by concating the parent's names
    */
-  getParentTitle(): Observable<string> {
+  getHierarchicalName(): Observable<string> {
     return this.getParent().pipe(
-      map((parentRD: RemoteData<DSpaceObject>) => {
-        return hasValue(parentRD) && hasValue(parentRD.payload) ? this.dsoNameService.getName(parentRD.payload) : undefined;
+      switchMap((initialRD: RemoteData<DSpaceObject>) => {
+        if (!hasValue(initialRD) || !initialRD.hasSucceeded || !hasValue(initialRD.payload)) {
+          return observableOf('');
+        }
+
+        return from((async () => {
+          const names: string[] = [];
+          let current: DSpaceObject | null = initialRD.payload;
+
+          const visited = new Set<string>(); // prevent cycles
+
+          while (current && !visited.has(current.id)) {
+            visited.add(current.id);
+            const name = this.dsoNameService.getName(current);
+            if (name) {
+              names.unshift(name);
+            }
+
+            const instance = this.createInstanceFromDSpaceObject(current);
+            const parentRD: RemoteData<DSpaceObject> = await instance.getParent().toPromise().catch(() => null);
+
+            if (hasValue(parentRD) && parentRD.hasSucceeded && hasValue(parentRD.payload)) {
+              current = parentRD.payload;
+            } else {
+              current = null;
+            }
+          }
+
+          return names.join(' > ');
+        })());
       }),
+      catchError(() => observableOf(''))
     );
   }
+  
+  /**
+   * Utility method to create an instance of the current class from a DSpaceObject
+   */
+  private createInstanceFromDSpaceObject(dso: DSpaceObject): this {
+    const instance = Object.create(this);
+    instance.dso = dso;
+    return instance;
+  }
 
   /**
    * Get the parent of the object
    */
   getParent(): Observable<RemoteData<DSpaceObject>> {
     if (typeof (this.dso as any).getParentLinkKey === 'function') {
       const propertyName = (this.dso as any).getParentLinkKey();
-      return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe(
-        find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204),
-      );
+      if(this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName]) {
+        return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe(
+          find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204),
+        );
+      }
     }
-    return of(undefined);
+    return observableOf(undefined);
   }
 
   /**
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss
@@ -9,3 +9,8 @@
 .removeFaded.content::after {
   display: none;
 }
+
+.content {
+  white-space: normal;
+  overflow: visible;
+}
