Merged in task/ux-plus-2023_02_x/UXP-153 (pull request #7)

[UXP-153] improve tree loading of root nodes

Author: FrancescoMolinaro

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

@@ -64,7 +64,8 @@ describe('VocabularyTreeviewService test suite', () => {
     searchTopEntries: jasmine.createSpy('searchTopEntries'),
     getEntryDetailChildren: jasmine.createSpy('getEntryDetailChildren'),
     clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests'),
-    getPublicVocabularyEntryByValue: jasmine.createSpy('getPublicVocabularyEntryByValue')
+    getPublicVocabularyEntryByValue: jasmine.createSpy('getPublicVocabularyEntryByValue'),
+    getPublicVocabularyEntryByID: jasmine.createSpy('getPublicVocabularyEntryByID'),
   });
 
   function init() {
@@ -204,46 +205,52 @@ describe('VocabularyTreeviewService test suite', () => {
     });
 
     it('should set initValueHierarchy', () => {
-      serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('--a', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+      serviceAsAny.vocabularyService.getEntryDetailChildren.and.returnValue(hot('--a', {
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [child, child2]))
       }));
-      serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(
+      serviceAsAny.vocabularyService.findEntryDetailById.and.returnValues(
         hot('-a', {
-          a: createSuccessfulRemoteDataObject(child2)
+          a: createSuccessfulRemoteDataObject(child),
+        }),
+        hot('-b', {
+          b: createSuccessfulRemoteDataObject(item)
         })
       );
       serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValue(
         hot('-b', {
           b: createSuccessfulRemoteDataObject(item)
         })
       );
-      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, [], 'root2'));
+
+      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, [], 'root1'));
       scheduler.flush();
 
       expect(serviceAsAny.vocabularyName).toEqual(vocabularyOptions.name);
-      expect(serviceAsAny.initValueHierarchy).toEqual(['root1', 'root1-child2']);
-      expect(serviceAsAny.dataChange.value).toEqual([itemInitNode, itemNode2, itemNode3]);
+      expect(serviceAsAny.initValueHierarchy).toEqual(['root1', 'root1-child1']);
     });
-
-    it('should show only nodes restricted to init Value Hierarchy', () => {
-      serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('--a', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+    // Disabled as we don't limt the tree anymore to the first value of the hierarchy but we start building the tree directly from that one (root node) for any case
+    xit('should show only nodes restricted to init Value Hierarchy', () => {
+      serviceAsAny.vocabularyService.getEntryDetailChildren.and.returnValue(hot('--a', {
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [child, child2]))
       }));
-      serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(
+      serviceAsAny.vocabularyService.findEntryDetailById.and.returnValues(
         hot('-a', {
-          a: createSuccessfulRemoteDataObject(child2)
+          a: createSuccessfulRemoteDataObject(child),
+        }),
+        hot('-b', {
+          b: createSuccessfulRemoteDataObject(item)
         })
       );
       serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValue(
         hot('-b', {
           b: createSuccessfulRemoteDataObject(item)
         })
       );
-      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, ['root2'], 'root2', true));
+      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, ['root1-child1'], 'root1-child1', true));
       scheduler.flush();
 
       expect(serviceAsAny.vocabularyName).toEqual(vocabularyOptions.name);
-      expect(serviceAsAny.initValueHierarchy).toEqual(['root1', 'root1-child2']);
+      expect(serviceAsAny.initValueHierarchy).toEqual(['root1', 'root1-child1']);
       expect(serviceAsAny.dataChange.value).toEqual([itemInitNode]);
     });
   });

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

@@ -1,7 +1,7 @@
 import { RemoteData } from 'src/app/core/data/remote-data';
 import { Injectable } from '@angular/core';
 
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
 import { map, merge, mergeMap, scan } from 'rxjs/operators';
 import findIndex from 'lodash/findIndex';
 
@@ -114,7 +114,8 @@ export class VocabularyTreeviewService {
         .subscribe((hierarchy: string[]) => {
           if (hasValue(hierarchy) && hierarchy.length > 0) {
             this.initValueHierarchy = hierarchy;
-            this.retrieveTopNodes(pageInfo, [], selectedItems, publicModeOnly ? hierarchy : null);
+            //this.retrieveTopNodes(pageInfo, [], selectedItems, publicModeOnly ? hierarchy : null);
+            this.retrieveNodesTreeByTopParentEntry(hierarchy[0], pageInfo, selectedItems);
           } else {
             this.loading.next(false);
           }
@@ -357,6 +358,47 @@ export class VocabularyTreeviewService {
     });
   }
 
+  /**
+   * Retrieve the top level vocabulary entries based on current entry
+   * @param entry The root node to use to start building the tree
+   * @param pageInfo The {@link PageInfo} object
+   * @param selectedItems The currently selected items
+   */
+  private retrieveNodesTreeByTopParentEntry(entry: string, pageInfo: PageInfo, selectedItems: string[]): void {
+    const nodes = [];
+    const rootNode$ = this.getById(entry);
+    let tempList;
+
+    combineLatest([
+      rootNode$,
+      this.getChildrenNodesByParent(entry, pageInfo)
+    ]).pipe(
+      mergeMap(([rootNode, list]) => {
+        tempList = list;
+
+        const childNodes: TreeviewNode[] = list.page.map((entryDetail: VocabularyEntryDetail) => this._generateNode(entryDetail, selectedItems));
+        return this.getNodeHierarchy(rootNode, selectedItems, childNodes);
+      })
+    ).subscribe(hierarchy => {
+      nodes.push(hierarchy);
+
+      if ((tempList.pageInfo.currentPage + 1) <= tempList.pageInfo.totalPages) {
+        // Need a new load more node
+        const newPageInfo: PageInfo = Object.assign(new PageInfo(), tempList.pageInfo, {
+          currentPage: tempList.pageInfo.currentPage + 1
+        });
+        const loadMoreNode = new TreeviewNode(LOAD_MORE_ROOT_NODE, false, newPageInfo);
+        loadMoreNode.updatePageInfo(newPageInfo);
+        nodes.push(loadMoreNode);
+      }
+      this.loading.next(false);
+      // Notify the change.
+      this.dataChange.next(nodes);
+
+    });
+
+  }
+
   /**
    * Build and return the tree node hierarchy by a given vocabulary entry
    *