Make the default tab for browsing communities and collections configu…

…rable

config/config.example.yml

@@ -325,12 +325,20 @@ item:
 
 # Community Page Config
 community:
+  # Default tab to be shown when browsing a Community. Valid values are: comcols, search, or browse_<field>
+  # <field> must be any of the configured "browse by" fields, e.g., dateissued, author, title, or subject
+  # When the default tab is not the 'search' tab, the search tab is moved to the last position
+  defaultBrowseTab: search
   # Search tab config
   searchSection:
     showSidebar: true
 
 # Collection Page Config
 collection:
+  # Default tab to be shown when browsing a Collection. Valid values are: search, or browse_<field>
+  # <field> must be any of the configured "browse by" fields, e.g., dateissued, author, title, or subject
+  # When the default tab is not the 'search' tab, the search tab is moved to the last position
+  defaultBrowseTab: search
   # Search tab config
   searchSection:
     showSidebar: true

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

@@ -85,9 +85,13 @@ export const ROUTES: Route[] = [
         component: ThemedCollectionPageComponent,
         children: [
           {
-            path: '',
+            path: 'search',
             pathMatch: 'full',
             component: ComcolSearchSectionComponent,
+            resolve: {
+              breadcrumb: browseByI18nBreadcrumbResolver,
+            },
+            data: { breadcrumbKey: 'collection.search' },
           },
           {
             path: 'browse/:id',

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

@@ -72,9 +72,13 @@ export const ROUTES: Route[] = [
         component: ThemedCommunityPageComponent,
         children: [
           {
-            path: '',
+            path: 'search',
             pathMatch: 'full',
             component: ComcolSearchSectionComponent,
+            resolve: {
+              breadcrumb: i18nBreadcrumbResolver,
+            },
+            data: { breadcrumbKey: 'community.search' },
           },
           {
             path: 'subcoms-cols',

src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts

@@ -5,6 +5,7 @@ import {
 } from '@angular/common';
 import {
   Component,
+  Inject,
   Input,
   OnDestroy,
   OnInit,
@@ -33,6 +34,7 @@ import {
   take,
 } from 'rxjs/operators';
 
+import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths';
 import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths';
 import { BrowseService } from '../../../core/browse/browse.service';
@@ -82,6 +84,7 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
   subs: Subscription[] = [];
 
   constructor(
+    @Inject(APP_CONFIG) public appConfig: AppConfig,
     public router: Router,
     private browseService: BrowseService,
   ) {
@@ -99,14 +102,14 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
             allOptions.push({
               id: 'search',
               label: 'collection.page.browse.search.head',
-              routerLink: comColRoute,
+              routerLink: `${comColRoute}/search`,
             });
           } else if (this.contentType === 'community') {
             comColRoute = getCommunityPageRoute(this.id);
             allOptions.push({
               id: 'search',
               label: 'collection.page.browse.search.head',
-              routerLink: comColRoute,
+              routerLink: `${comColRoute}/search`,
             });
             allOptions.push({
               id: 'comcols',
@@ -120,6 +123,10 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
             label: `browse.comcol.by.${config.id}`,
             routerLink: `${comColRoute}/browse/${config.id}`,
           })));
+
+          if (this.appConfig[this.contentType].defaultBrowseTab !== 'search') {
+            allOptions.push(allOptions.shift())
+          }
         }
         return allOptions;
       }),
@@ -140,6 +147,15 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
         }
       }
     }));
+
+    this.allOptions$.pipe(
+      take(1),
+    ).subscribe((allOptions: ComColPageNavOption[]) => {
+      if (!allOptions.find(o => o.routerLink === this.router.url?.split('?')[0])) {
+        var option = allOptions.find(o => o.id === this.appConfig[this.contentType].defaultBrowseTab);
+        void this.router.navigate([option.routerLink], { queryParams: option.params });
+      }
+    });
   }
 
   ngOnDestroy(): void {

src/assets/i18n/en.json5

@@ -1324,6 +1324,8 @@
 
   "collection.page.news": "News",
 
+  "collection.search.breadcrumbs": "Search",
+
   "collection.search.results.head": "Search Results",
 
   "collection.select.confirm": "Confirm selected",
@@ -1562,6 +1564,8 @@
 
   "community.all-lists.head": "Subcommunities and Collections",
 
+  "community.search.breadcrumbs": "Search",
+
   "community.search.results.head": "Search Results",
 
   "community.sub-collection-list.head": "Collections in this Community",

src/assets/i18n/es.json5

@@ -1929,6 +1929,9 @@
   // "collection.page.news": "News",
   "collection.page.news": "Noticias",
 
+  // "collection.search.breadcrumbs": "Search",
+  "collection.search.breadcrumbs": "Buscar",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleccionado",
 
@@ -2250,6 +2253,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcomunidades y colecciones",
 
+  // "community.search.breadcrumbs": "Search",
+  "community.search.breadcrumbs": "Buscar",
+
   // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Colecciones de esta comunidad",
 

src/config/collection-page-config.interface.ts

@@ -4,6 +4,7 @@ import { Config } from './config.interface';
  * Collection Page Config
  */
 export interface CollectionPageConfig extends Config {
+  defaultBrowseTab: string;
   searchSection: CollectionSearchSectionConfig;
   edit: {
     undoTimeout: number;

src/config/community-page-config.interface.ts

@@ -4,6 +4,7 @@ import { Config } from './config.interface';
  * Community Page Config
  */
 export interface CommunityPageConfig extends Config {
+  defaultBrowseTab: string;
   searchSection: CommunitySearchSectionConfig;
 }
 

src/config/default-app-config.ts

@@ -337,13 +337,15 @@ export class DefaultAppConfig implements AppConfig {
 
   // Community Page Config
   community: CommunityPageConfig = {
+    defaultBrowseTab: 'search',
     searchSection: {
       showSidebar: true,
     },
   };
 
   // Collection Page Config
   collection: CollectionPageConfig = {
+    defaultBrowseTab: 'search',
     searchSection: {
       showSidebar: true,
     },

src/environments/environment.test.ts

@@ -267,11 +267,13 @@ export const environment: BuildConfig = {
     },
   },
   community: {
+    defaultBrowseTab: 'search',
     searchSection: {
       showSidebar: true,
     },
   },
   collection: {
+    defaultBrowseTab: 'search',
     searchSection: {
       showSidebar: true,
     },