hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 15:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2376 from alexandrevryghem/w2p-104312_pass-query-to-external-search-tabs_contribute-main

Browse Source 
Search query is not set by default when opening an external sources tab
This commit is contained in:
Tim Donohue
2023-09-07 12:49:21 -05:00
committed by GitHub
parent 11341bf7d7 5062e46433
commit 1824507c06
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
View File

@@ -42,6 +42,7 @@
[collection]="collection" [collection]="collection"
[relationship]="relationshipOptions" [relationship]="relationshipOptions"
[context]="context" [context]="context"
[query]="query"
[externalSource]="source" [externalSource]="source"
(importedObject)="imported($event)" (importedObject)="imported($event)"
class="d-block pt-3"> class="d-block pt-3">

14
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
View File

@@ -75,6 +75,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
* The context to displaying lists for * The context to displaying lists for
*/ */
@Input() context: Context; @Input() context: Context;
/**
* The search query
*/
@Input() query: string;
@Input() repeatable: boolean; @Input() repeatable: boolean;
/** /**
* Emit an event when an object has been imported (or selected from similar local entries) * 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.resetRoute();
this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe( this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
switchMap((searchOptions: PaginatedSearchOptions) => switchMap((searchOptions: PaginatedSearchOptions) => {
this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined))) 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.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
this.importConfig = { this.importConfig = {

4
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
View File

@@ -15,7 +15,7 @@ import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-loo
}) })
export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> { export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> {
protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = ['label', 'listId', 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; @Input() label: string;
@@ -29,6 +29,8 @@ export class ThemedDynamicLookupRelationExternalSourceTabComponent extends Theme
@Input() context: Context; @Input() context: Context;
@Input() query: string;
@Input() repeatable: boolean; @Input() repeatable: boolean;
@Output() importedObject: EventEmitter<ListableObject> = new EventEmitter(); @Output() importedObject: EventEmitter<ListableObject> = new EventEmitter();