Discovery endpoints refactor

src/app/admin/admin-search-page/admin-search-page.component.html

@@ -1 +1 @@
-<ds-configuration-search-page configuration="administrativeView" [context]="context"></ds-configuration-search-page>
+<ds-search configuration="administrativeView" [context]="context"></ds-search>

src/app/admin/admin-search-page/admin-search-page.component.spec.ts

@@ -6,9 +6,9 @@ import {
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { AdminSearchPageComponent } from './admin-search-page.component';
+import { ThemedSearchComponent } from '../../shared/search/themed-search.component';
 
 describe('AdminSearchPageComponent', () => {
   let component: AdminSearchPageComponent;
@@ -23,7 +23,9 @@ describe('AdminSearchPageComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(AdminSearchPageComponent, {
       remove: {
-        imports: [ThemedConfigurationSearchPageComponent],
+        imports: [
+          ThemedSearchComponent,
+        ],
       },
     })
       .compileComponents();

src/app/admin/admin-search-page/admin-search-page.component.ts

@@ -1,15 +1,15 @@
 import { Component } from '@angular/core';
 
 import { Context } from '../../core/shared/context.model';
-import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
+import { ThemedSearchComponent } from '../../shared/search/themed-search.component';
 
 @Component({
   selector: 'ds-base-admin-search-page',
   templateUrl: './admin-search-page.component.html',
   styleUrls: ['./admin-search-page.component.scss'],
   standalone: true,
   imports: [
-    ThemedConfigurationSearchPageComponent,
+    ThemedSearchComponent,
   ],
 })
 

src/app/admin/admin-workflow-page/admin-workflow-page.component.html

@@ -1 +1 @@
-<ds-configuration-search-page configuration="supervision" [context]="context"></ds-configuration-search-page>
+<ds-search configuration="supervision" [context]="context"></ds-search>

src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts

@@ -5,8 +5,8 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 
-import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
+import { ThemedSearchComponent } from '../../shared/search/themed-search.component';
 
 describe('AdminSearchPageComponent', () => {
   let component: AdminWorkflowPageComponent;
@@ -20,7 +20,7 @@ describe('AdminSearchPageComponent', () => {
       .overrideComponent(AdminWorkflowPageComponent, {
         remove: {
           imports: [
-            ThemedConfigurationSearchPageComponent,
+            ThemedSearchComponent,
           ],
         },
       })

src/app/admin/admin-workflow-page/admin-workflow-page.component.ts

@@ -1,15 +1,15 @@
 import { Component } from '@angular/core';
 
 import { Context } from '../../core/shared/context.model';
-import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
+import { ThemedSearchComponent } from '../../shared/search/themed-search.component';
 
 @Component({
   selector: 'ds-base-admin-workflow-page',
   templateUrl: './admin-workflow-page.component.html',
   styleUrls: ['./admin-workflow-page.component.scss'],
   standalone: true,
   imports: [
-    ThemedConfigurationSearchPageComponent,
+    ThemedSearchComponent,
   ],
 })
 

src/app/core/data-services-map.ts

@@ -68,6 +68,8 @@ import { SUPERVISION_ORDER } from './supervision-order/models/supervision-order.
 import { CLAIMED_TASK } from './tasks/models/claimed-task-object.resource-type';
 import { POOL_TASK } from './tasks/models/pool-task-object.resource-type';
 import { WORKFLOW_ACTION } from './tasks/models/workflow-action-object.resource-type';
+import { SEARCH_FILTER_CONFIG } from '../shared/search/models/types/search-filter-config.resource-type';
+import { SEARCH_SORT_OPTION } from '../shared/search/models/types/search-sort-option.resource-type';
 
 export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([
   [AUTHORIZATION.value, () => import('./data/feature-authorization/authorization-data.service').then(m => m.AuthorizationDataService)],
@@ -136,4 +138,6 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([
   [SUGGESTION_TARGET.value, () => import('./notifications/suggestions/target/suggestion-target-data.service').then(m => m.SuggestionTargetDataService)],
   [DUPLICATE.value, () => import('./submission/submission-duplicate-data.service').then(m => m.SubmissionDuplicateDataService)],
   [CorrectionType.type.value, () => import('./submission/correctiontype-data.service').then(m => m.CorrectionTypeDataService)],
+  [SEARCH_FILTER_CONFIG.value, () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService)],
+  [SEARCH_SORT_OPTION.value, () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService)],
 ]);

src/app/core/provide-core.ts

@@ -84,6 +84,9 @@ import { RatingAdvancedWorkflowInfo } from './tasks/models/rating-advanced-workf
 import { SelectReviewerAdvancedWorkflowInfo } from './tasks/models/select-reviewer-advanced-workflow-info.model';
 import { TaskObject } from './tasks/models/task-object.model';
 import { WorkflowAction } from './tasks/models/workflow-action-object.model';
+import { DiscoveryConfiguration } from '../shared/search/models/discovery-configuration.model';
+import { Facet } from '../shared/search/models/facet.model';
+import { SearchSortOption } from '../shared/search/models/search-sort-option.model';
 
 
 export const provideCore = () => {
@@ -187,4 +190,7 @@ export const models =
     SubmissionCoarNotifyConfig,
     NotifyRequestsStatus,
     SystemWideAlert,
+    DiscoveryConfiguration,
+    Facet,
+    SearchSortOption,
   ];

src/app/home-page/home-page.component.html

@@ -1,14 +1,14 @@
 <ds-home-coar></ds-home-coar>
 <ds-home-news></ds-home-news>
 @if (showDiscoverFilters) {
-  <ds-configuration-search-page
+  <ds-search
     [sideBarWidth]="3"
     [showViewModes]="false"
     [searchEnabled]="false"
     [inPlaceSearch]="false"
     [showScopeSelector]="false">
     <ng-container searchContentTop *ngTemplateOutlet="homeContent"></ng-container>
-  </ds-configuration-search-page>
+  </ds-search>
 }
 @if (!showDiscoverFilters) {
   <div class="container">

src/app/home-page/home-page.component.scss

@@ -1,6 +0,0 @@
-@include media-breakpoint-down(md) {
-  ds-themed-configuration-search-page + .container {
-    width: 100%;
-    max-width: none;
-  }
-}

src/app/home-page/home-page.component.ts

@@ -18,29 +18,37 @@ import {
 
 import { Site } from '../core/shared/site.model';
 import { SuggestionsPopupComponent } from '../notifications/suggestions/popup/suggestions-popup.component';
-import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component';
 import { ThemedSearchFormComponent } from '../shared/search-form/themed-search-form.component';
 import { HomeCoarComponent } from './home-coar/home-coar.component';
 import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component';
 import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
 import { ThemedTopLevelCommunityListComponent } from './top-level-community-list/themed-top-level-community-list.component';
+import { ThemedSearchComponent } from '../shared/search/themed-search.component';
+import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-configuration.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 
 @Component({
   selector: 'ds-base-home-page',
   styleUrls: ['./home-page.component.scss'],
   templateUrl: './home-page.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
   standalone: true,
   imports: [
     AsyncPipe,
     HomeCoarComponent,
     NgTemplateOutlet,
     RecentItemListComponent,
     SuggestionsPopupComponent,
-    ThemedConfigurationSearchPageComponent,
     ThemedHomeNewsComponent,
     ThemedSearchFormComponent,
     ThemedTopLevelCommunityListComponent,
     TranslateModule,
+    ThemedSearchComponent,
   ],
 })
 export class HomePageComponent implements OnInit {

src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html

@@ -1,7 +1,7 @@
-<ds-configuration-search-page
+<ds-search
   [fixedFilterQuery]="fixedFilter"
   [configuration]="configuration"
   [searchEnabled]="searchEnabled"
   [sideBarWidth]="sideBarWidth"
   [showCsvExport]="true">
-</ds-configuration-search-page>
+</ds-search>

src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts

@@ -9,8 +9,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { Item } from '../../../../core/shared/item.model';
-import { ThemedConfigurationSearchPageComponent } from '../../../../search-page/themed-configuration-search-page.component';
 import { RelatedEntitiesSearchComponent } from './related-entities-search.component';
+import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component';
 
 describe('RelatedEntitiesSearchComponent', () => {
   let comp: RelatedEntitiesSearchComponent;
@@ -30,7 +30,9 @@ describe('RelatedEntitiesSearchComponent', () => {
     })
       .overrideComponent(RelatedEntitiesSearchComponent, {
         remove: {
-          imports: [ThemedConfigurationSearchPageComponent],
+          imports: [
+            ThemedSearchComponent,
+          ],
         },
       })
       .compileComponents();

src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts

@@ -5,16 +5,16 @@ import {
 } from '@angular/core';
 
 import { Item } from '../../../../core/shared/item.model';
-import { ThemedConfigurationSearchPageComponent } from '../../../../search-page/themed-configuration-search-page.component';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { getFilterByRelation } from '../../../../shared/utils/relation-query.utils';
+import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component';
 
 @Component({
   selector: 'ds-related-entities-search',
   templateUrl: './related-entities-search.component.html',
   standalone: true,
   imports: [
-    ThemedConfigurationSearchPageComponent,
+    ThemedSearchComponent,
   ],
 })
 /**