[DSC-854] implemented nested menu for menu response

Author: nikunj59

src/app/core/layout/models/section.model.ts

@@ -29,6 +29,8 @@ export class Section extends CacheableObject {
   @autoserialize
   componentRows: SectionComponent[][];
 
+  nestedSections: Section[];
+
   /**
    * The {@link HALLink}s for this section
    */

src/app/menu.resolver.spec.ts

@@ -25,10 +25,41 @@ const MENU_STATE = {
   id: 'some menu'
 };
 const EXPLORE_SECTIONS_DEFINITIONS = [
+  { id: 'definition1' },
+  {
+    id: 'definition2',
+    nestedSections: [
+      { id: 'nested_definition1' },
+      { id: 'nested_definition2' }
+    ]
+  },
+  { id: 'definition3' },
+];
+
+const ALL_FLAT_MENUS = [
   { id: 'definition1' },
   { id: 'definition2' },
   { id: 'definition3' },
 ];
+const ALL_NESTED_MENUS = [
+  {
+    id: 'definition1',
+    nestedSections: [
+      { id: 'nested_definition1' },
+    ]
+  },{
+    id: 'definition2',
+    nestedSections: [
+      { id: 'nested_definition2' },
+    ]
+  },{
+    id: 'definition3',
+    nestedSections: [
+      { id: 'nested_definition3' },
+    ]
+  }
+];
+const NO_MENUS = [];
 
 describe('MenuResolver', () => {
   let resolver: MenuResolver;
@@ -130,11 +161,80 @@ describe('MenuResolver', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
           id: 'explore_definition2', visible: true,
         }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
+          id: 'explore_nested_definition2',
+          parentID: 'explore_definition2',
+          active: false,
+          visible: true
+        }));
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
           id: 'explore_definition3', visible: true,
         }));
       });
     });
+
+    describe('handle menus', () => {
+      it('should show all flat menus', () => {
+        sectionsService.findVisibleSections.and.returnValue(
+          createSuccessfulRemoteDataObject$(createPaginatedList(ALL_FLAT_MENUS))
+        );
+        resolver.createPublicMenu$().subscribe();
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
+          id: 'explore_definition1', visible: true,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
+          id: 'explore_definition2', visible: true,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
+          id: 'explore_definition3', visible: true,
+        }));
+      });
+
+      it('should show all nested menus', () => {
+        sectionsService.findVisibleSections.and.returnValue(
+          createSuccessfulRemoteDataObject$(createPaginatedList(ALL_NESTED_MENUS))
+        );
+        resolver.createPublicMenu$().subscribe();
+        expect(menuService.addSection).toHaveBeenCalledWith(
+          MenuID.PUBLIC,
+          jasmine.objectContaining({
+            id: 'explore_nested_definition1',
+            parentID: 'explore_definition1',
+            active: false,
+            visible: true
+          })
+        );
+        expect(menuService.addSection).toHaveBeenCalledWith(
+          MenuID.PUBLIC,
+          jasmine.objectContaining({
+            id: 'explore_nested_definition2',
+            parentID: 'explore_definition2',
+            active: false,
+            visible: true
+          })
+        );
+        expect(menuService.addSection).toHaveBeenCalledWith(
+          MenuID.PUBLIC,
+          jasmine.objectContaining({
+            id: 'explore_nested_definition3',
+            parentID: 'explore_definition3',
+            active: false,
+            visible: true
+          })
+        );
+      });
+
+      it('should show no menus', () => {
+        sectionsService.findVisibleSections.and.returnValue(
+          createSuccessfulRemoteDataObject$(createPaginatedList(NO_MENUS))
+        );
+        resolver.createPublicMenu$().subscribe();
+        expect(menuService.addSection).toHaveBeenCalledWith(
+          MenuID.PUBLIC,
+          jasmine.objectContaining({})
+        );
+      });
+    });
   });
 
   describe('createAdminMenu$', () => {

src/app/menu.resolver.ts

@@ -123,17 +123,44 @@ export class MenuResolver implements Resolve<boolean> {
     ).subscribe( (sectionDefListRD: RemoteData<PaginatedList<Section>>) => {
       if (sectionDefListRD.hasSucceeded) {
         sectionDefListRD.payload.page.forEach((section) => {
-          menuList.push({
+          let parentMenu: any = {
             id: `explore_${section.id}`,
             active: false,
             visible: true,
-            model: {
-              type: MenuItemType.LINK,
-              text: `menu.section.explore_${section.id}`,
-              link: `/explore/${section.id}`
-            } as LinkMenuItemModel
-          });
-
+          };
+          if (section.nestedSections) {
+            section.nestedSections.forEach((nested) => {
+              menuList.push({
+                id: `explore_${nested.id}`,
+                parentID: `explore_${section.id}`,
+                active: false,
+                visible: true,
+                model: {
+                  type: MenuItemType.LINK,
+                  text: `menu.section.explore_${nested.id}`,
+                  link: `/explore/${nested.id}`
+                } as LinkMenuItemModel
+              });
+            });
+            parentMenu = {
+              ...parentMenu,
+              index: 1,
+              model: {
+                type: MenuItemType.TEXT,
+                text: `menu.section.explore_${section.id}`
+              } as TextMenuItemModel,
+            };
+          } else {
+            parentMenu = {
+              ...parentMenu,
+              model: {
+                type: MenuItemType.LINK,
+                text: `menu.section.explore_${section.id}`,
+                link: `/explore/${section.id}`
+              } as LinkMenuItemModel
+            };
+          }
+          menuList.push(parentMenu);
         });
       }
       menuList.forEach((menuSection) => this.menuService.addSection(MenuID.PUBLIC, Object.assign(menuSection, {

src/assets/i18n/en.json5

@@ -2078,7 +2078,9 @@
 
   "explore.infrastructure.breadcrumbs": "Infrastructure",
 
-  "explore.fundings.breadcrumbs": "Projects",
+  "explore.fundings.breadcrumbs": "Fundings",
+
+  "explore.projects.breadcrumbs": "Projects",
 
   "explore.fundings_and_projects.breadcrumbs": "Projects",
 
@@ -3476,9 +3478,11 @@
 
   "menu.section.explore_orgunits": "Organizations",
 
-  "menu.section.explore_fundings": "Projects",
+  "menu.section.explore_fundings": "Fundings",
+
+  "menu.section.explore_projects": "Projects",
 
-  "menu.section.explore_fundings_and_projects": "Projects",
+  "menu.section.explore_fundings_and_projects": "Fundings & Projects",
 
   "menu.section.communities_and_collections": "Communities & Collections",