Merge pull request #2396 from alexandrevryghem/w2p-104312_pass-query-…

…to-external-search-tabs_contribute-maintenance-7.6 [Port dspace-7_x] Search query is not set by default when opening an external sources tab
DSpace · Sep 7, 2023 · b46390c · b46390c
2 parents d14e258 + 5062e46
commit b46390c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/...der/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/...der/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -42,6 +42,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
                             [collection]="collection"
                             [relationship]="relationshipOptions"
                             [context]="context"
+                            [query]="query"
                             [externalSource]="source"
                             (importedObject)="imported($event)"
                             class="d-block pt-3">

diff --git a/...lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/...lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -75,6 +75,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    * The context to displaying lists for
    */
   @Input() context: Context;
+
+  /**
+   * The search query
+   */
+  @Input() query: string;
+
   @Input() repeatable: boolean;
   /**
    * Emit an event when an object has been imported (or selected from similar local entries)
@@ -149,8 +155,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
 
     this.resetRoute();
     this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
-      switchMap((searchOptions: PaginatedSearchOptions) =>
-        this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined)))
+      switchMap((searchOptions: PaginatedSearchOptions) => {
+        if (searchOptions.query === '') {
+          searchOptions.query = this.query;
+        }
+        return this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined));
+      })
     );
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
     this.importConfig = {

diff --git a/...modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts b/...modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
@@ -15,7 +15,7 @@ import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-loo
 })
 export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> {
   protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = ['label', 'listId',
-    'item', 'collection', 'relationship', 'context', 'repeatable', 'importedObject', 'externalSource'];
+    'item', 'collection', 'relationship', 'context', 'query', 'repeatable', 'importedObject', 'externalSource'];
 
   @Input() label: string;
 
@@ -29,6 +29,8 @@ export class ThemedDynamicLookupRelationExternalSourceTabComponent extends Theme
 
   @Input() context: Context;
 
+  @Input() query: string;
+
   @Input() repeatable: boolean;
 
   @Output() importedObject: EventEmitter<ListableObject> = new EventEmitter();