Merged in DSC-1248 (pull request DSpace#872)

4Science · Oct 11, 2023 · eba5a30 · eba5a30
2 parents 9080551 + c8a7e01
commit eba5a30
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/app/shared/explore/section-component/search-section/search-section.component.html b/src/app/shared/explore/section-component/search-section/search-section.component.html
@@ -27,7 +27,9 @@ <h2 *ngIf="searchSection.displayTitle">{{ 'explore.search-section.' + sectionId
 
     <div class="col-md-12 d-flex justify-content-center" *ngIf="searchSection.searchType === 'basic'">
         <div class="col-md-8">
-            <ds-search-form *ngIf="searchSection.searchType === 'basic'" [inPlaceSearch]="false"
+            <ds-search-form *ngIf="searchSection.searchType === 'basic'"
+                            [inPlaceSearch]="false"
+                            [configuration]="searchSection.discoveryConfigurationName"
                             [searchPlaceholder]="'search.search-form.placeholder' | translate"> ></ds-search-form>
         </div>
     </div>

diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
@@ -42,8 +42,12 @@ export class SearchFormComponent implements OnInit {
   /**
    * The currently selected scope object's UUID
    */
-  @Input()
-  scope = '';
+  @Input() scope = '';
+
+  /**
+   * Discovery configuration to be used in search
+   */
+  @Input() configuration: string;
 
   selectedScope: BehaviorSubject<DSpaceObject> = new BehaviorSubject<DSpaceObject>(undefined);
 
@@ -99,8 +103,13 @@ export class SearchFormComponent implements OnInit {
    */
   onSubmit(data: any) {
     if (isNotEmpty(this.scope)) {
-      data = Object.assign(data, { scope: this.scope });
+      data = { ...data, scope: this.scope };
     }
+
+    if (isNotEmpty(this.configuration)) {
+      data = { ...data, configuration: this.configuration };
+    }
+
     this.updateSearch(data);
     this.submitSearch.emit(data);
   }

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
@@ -5097,6 +5097,8 @@
 
   "search.filters.applied.charts.default.title": "Search Output",
 
+  "search.filters.applied.charts.site.title": "Search Output",
+
   "search.filters.applied.charts.RELATION.Person.researchoutputs.title": "Research Output",
 
   "search.filters.applied.charts.RELATION.Project.fundings.title": "Fundings",
@@ -5356,6 +5358,8 @@
 
   "default.search.results.head": "Search Results",
 
+  "site.search.results.head": "Search Results",
+
   "default-relationships.search.results.head": "Search Results",
 
   "defaultConfiguration.search.results.head": "Search Results",