Implement community feedback p2

Author: YanaDePauw

src/app/app.menus.ts

@@ -31,6 +31,7 @@ import { ProcessesMenuProvider } from './shared/menu/providers/processes.menu';
 import { RegistriesMenuProvider } from './shared/menu/providers/registries.menu';
 import { StatisticsMenuProvider } from './shared/menu/providers/statistics.menu';
 import { SystemWideAlertMenuProvider } from './shared/menu/providers/system-wide-alert.menu';
+import { WithdrawnReinstateItemMenuProvider } from './shared/menu/providers/withdrawn-reinstate-item.menu';
 import { WorkflowMenuProvider } from './shared/menu/providers/workflow.menu';
 
 /**
@@ -75,32 +76,25 @@ export const MENUS = buildMenuStructure({
   [MenuID.DSO_EDIT]: [
     DsoOptionMenuProvider.withSubs([
       SubscribeMenuProvider.onRoute(
-        MenuRoute.SIMPLE_COMMUNITY_PAGE,
-        MenuRoute.SIMPLE_COMMUNITY_BROWSE_PAGE,
-        MenuRoute.SIMPLE_COMMUNITY_SUBCOLCOM_PAGE,
-        MenuRoute.SIMPLE_COLLECTION_PAGE,
-        MenuRoute.SIMPLE_COLLECTION_BROWSE_PAGE,
+        MenuRoute.COMMUNITY_PAGE,
+        MenuRoute.COLLECTION_PAGE,
       ),
       DSpaceObjectEditMenuProvider.onRoute(
-        MenuRoute.SIMPLE_COMMUNITY_PAGE,
-        MenuRoute.SIMPLE_COMMUNITY_BROWSE_PAGE,
-        MenuRoute.SIMPLE_COMMUNITY_SUBCOLCOM_PAGE,
-        MenuRoute.SIMPLE_COLLECTION_PAGE,
-        MenuRoute.SIMPLE_COLLECTION_BROWSE_PAGE,
-        MenuRoute.SIMPLE_ITEM_PAGE,
-        MenuRoute.FULL_ITEM_PAGE,
+        MenuRoute.COMMUNITY_PAGE,
+        MenuRoute.COLLECTION_PAGE,
+        MenuRoute.ITEM_PAGE,
+      ),
+      WithdrawnReinstateItemMenuProvider.onRoute(
+        MenuRoute.ITEM_PAGE,
       ),
       VersioningMenuProvider.onRoute(
-        MenuRoute.SIMPLE_ITEM_PAGE,
-        MenuRoute.FULL_ITEM_PAGE,
+        MenuRoute.ITEM_PAGE,
       ),
       OrcidMenuProvider.onRoute(
-        MenuRoute.SIMPLE_ITEM_PAGE,
-        MenuRoute.FULL_ITEM_PAGE,
+        MenuRoute.ITEM_PAGE,
       ),
       ClaimMenuProvider.onRoute(
-        MenuRoute.SIMPLE_ITEM_PAGE,
-        MenuRoute.FULL_ITEM_PAGE,
+        MenuRoute.ITEM_PAGE,
       ),
     ]),
   ],

src/app/collection-page/collection-page-routes.ts

@@ -81,7 +81,7 @@ export const ROUTES: Route[] = [
         path: '',
         component: ThemedCollectionPageComponent,
         data: {
-          menuRoute: MenuRoute.SIMPLE_COLLECTION_PAGE,
+          menuRoute: MenuRoute.COLLECTION_PAGE,
         },
         children: [
           {
@@ -99,7 +99,7 @@ export const ROUTES: Route[] = [
             },
             data: {
               breadcrumbKey: 'browse.metadata',
-              menuRoute: MenuRoute.SIMPLE_COLLECTION_BROWSE_PAGE,
+              menuRoute: MenuRoute.COLLECTION_PAGE,
             },
           },
         ],

src/app/community-page/community-page-routes.ts

@@ -68,7 +68,7 @@ export const ROUTES: Route[] = [
         path: '',
         component: ThemedCommunityPageComponent,
         data: {
-          menuRoute: MenuRoute.SIMPLE_COMMUNITY_PAGE,
+          menuRoute: MenuRoute.COMMUNITY_PAGE,
         },
         children: [
           {
@@ -85,7 +85,7 @@ export const ROUTES: Route[] = [
             },
             data: {
               breadcrumbKey: 'community.subcoms-cols',
-              menuRoute: MenuRoute.SIMPLE_COMMUNITY_SUBCOLCOM_PAGE,
+              menuRoute: MenuRoute.COMMUNITY_PAGE,
             },
           },
           {
@@ -98,7 +98,7 @@ export const ROUTES: Route[] = [
             },
             data: {
               breadcrumbKey: 'browse.metadata',
-              menuRoute: MenuRoute.SIMPLE_COMMUNITY_BROWSE_PAGE,
+              menuRoute: MenuRoute.COMMUNITY_PAGE,
             },
           },
         ],

src/app/init.service.ts

@@ -217,7 +217,6 @@ export abstract class InitService {
     this.headTagService.listenForRouteChange();
     this.breadcrumbsService.listenForRouteChanges();
     this.themeService.listenForRouteChanges();
-    this.menuProviderService.listenForRouteChanges();
   }
 
   /**

src/app/item-page/item-page-routes.ts

@@ -33,15 +33,15 @@ export const ROUTES: Route[] = [
         component: ThemedItemPageComponent,
         pathMatch: 'full',
         data: {
-          menuRoute: MenuRoute.SIMPLE_ITEM_PAGE,
+          menuRoute: MenuRoute.ITEM_PAGE,
         },
 
       },
       {
         path: 'full',
         component: ThemedFullItemPageComponent,
         data: {
-          menuRoute: MenuRoute.FULL_ITEM_PAGE,
+          menuRoute: MenuRoute.ITEM_PAGE,
         },
 
       },

src/app/shared/menu/menu-provider.model.ts

@@ -111,6 +111,11 @@ export abstract class AbstractMenuProvider implements MenuProvider {
    */
   alwaysRenderExpandable? = false;
 
+  /**
+   * When true, this provider will only add its sections on Browser Side Rendering.
+   */
+  renderBrowserOnly? = false;
+
   /**
    * Static method to be called from the app.menus.ts file to define paths on which this provider should the active
    * @param paths - The paths on which the sections of this provider should be active