Merged in task/main-cris/DSC-2336 (pull request DSpace#3157)

Task/main cris/DSC-2336

Approved-by: Giuseppe Digilio

Author: FrancescoMolinaro

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts

@@ -288,6 +288,25 @@ describe('VocabularyTreeviewService test suite', () => {
       expect(serviceAsAny.dataChange.value).toEqual(treeNodeListWithChildren);
     });
 
+    it('should not add more children if already present and is loadAll is true and onlyFirstTime is true', () => {
+      pageInfo = Object.assign(new PageInfo(), {
+        elementsPerPage: 1,
+        totalElements: 2,
+        totalPages: 2,
+        currentPage: 2,
+      });
+      spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
+        a: buildPaginatedList(pageInfo, []),
+      }));
+
+      serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
+      serviceAsAny.nodeMap = nodeMapWithChildren;
+      scheduler.schedule(() => service.loadMore(item, [], true, true));
+      scheduler.flush();
+
+      expect(serviceAsAny.getChildrenNodesByParent).not.toHaveBeenCalled();
+    });
+
     it('should add loadMore node properly', () => {
       pageInfo = Object.assign(new PageInfo(), {
         elementsPerPage: 1,

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts

@@ -167,6 +167,10 @@ export class VocabularyTreeviewService {
     }
     const parent: TreeviewNode = this.nodeMap.get(item.otherInformation.id)!;
     const children = this.nodeMap.get(item.otherInformation.id)!.children || [];
+    // If there are children and is invoked with loadAll true we skip the call as it means the node has loaded already all the children
+    if (children.length && loadAll && onlyFirstTime) {
+      return;
+    }
     this.getChildrenNodesByParent(item.otherInformation.id, parent.pageInfo, (loadAll && selectedItems.length > 0)).subscribe((list: PaginatedList<VocabularyEntryDetail>) => {
       if (onlyFirstTime && parent.children!.length > 0 && !loadAll) {
         return;