110889: Added recently added section to community page

alexandrevryghem · Jan 8, 2024 · f649283 · f649283
1 parent 130fefd
commit f649283
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts
@@ -19,6 +19,7 @@ import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-co
 import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
 import { BrowseByGuard } from '../browse-by/browse-by-guard';
 import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
+import { ComcolRecentlyAddedComponent } from '../shared/comcol/sections/comcol-recently-added/comcol-recently-added.component';
 
 @NgModule({
   imports: [
@@ -56,6 +57,11 @@ import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse
               {
                 path: '',
                 pathMatch: 'full',
+                component: ComcolRecentlyAddedComponent,
+              },
+              {
+                path: 'subcoms-cols',
+                pathMatch: 'full',
                 component: SubComColSectionComponent,
               },
               {

diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
@@ -20,7 +20,7 @@ export class SubComColSectionComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.community$ = this.route.data.pipe(
+    this.community$ = this.route.parent.data.pipe(
       map((data: Data) => (data.dso as RemoteData<Community>).payload),
     );
   }

diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -54,17 +54,21 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
           let comColRoute: string;
           if (this.contentType === 'collection') {
             comColRoute = getCollectionPageRoute(this.id);
-            allOptions.push({
-              id: 'recent_submissions',
-              label: 'collection.page.browse.recent.head',
-              routerLink: comColRoute,
-            });
           } else if (this.contentType === 'community') {
             comColRoute = getCommunityPageRoute(this.id);
+          }
+
+          allOptions.push({
+            id: 'recent_submissions',
+            label: 'collection.page.browse.recent.head',
+            routerLink: comColRoute,
+          });
+
+          if (this.contentType === 'community') {
             allOptions.push({
               id: 'comcols',
               label: 'community.all-lists.head',
-              routerLink: comColRoute,
+              routerLink: `${comColRoute}/subcoms-cols`,
             });
           }
 

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
@@ -1298,7 +1298,7 @@
 
   "community.page.news": "News",
 
-  "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Subcommunities & Collections",
 
   "community.sub-collection-list.head": "Collections in this Community",