diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
index d2ad3d403d..f055e617e3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
@@ -16,10 +16,13 @@
{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.entities' | translate) }}
-
0"
+ [searchResults]="(localEntitiesRD$ | async)"
[sortConfig]="this.lookupRelationService.searchConfig?.sort"
[searchConfig]="this.lookupRelationService.searchConfig"
[selectable]="true"
+ [disableHeader]="true"
+ [hidePaginationDetail]="true"
[selectionConfig]="{ repeatable: false, listId: entityListId }"
[linkType]="linkTypes.ExternalLink"
[context]="context"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index 6a65ec9b05..6f17ddc529 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -94,7 +94,7 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
ngOnInit(): void {
this.uri = Metadata.first(this.externalSourceEntry.metadata, 'dc.identifier.uri');
- this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: this.externalSourceEntry.value }));
+ this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: 'sarah' }));
this.localEntitiesRD$ = this.lookupRelationService.getLocalResults(this.relationship, this.searchOptions);
}
@@ -117,7 +117,9 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
* @param event
*/
deselectEntity(event) {
- this.selectedImportType = ImportType.None;
+ if (this.selectedImportType === ImportType.LocalEntity) {
+ this.selectedImportType = ImportType.None;
+ }
}
/**
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 57e1ccd81a..499b8e03c9 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -5,6 +5,7 @@
[hideGear]="hideGear"
[linkType]="linkType"
[context]="context"
+ [hidePaginationDetail]="hidePaginationDetail"
(paginationChange)="onPaginationChange($event)"
(pageChange)="onPageChange($event)"
(pageSizeChange)="onPageSizeChange($event)"
@@ -23,6 +24,7 @@
[hideGear]="hideGear"
[linkType]="linkType"
[context]="context"
+ [hidePaginationDetail]="hidePaginationDetail"
(paginationChange)="onPaginationChange($event)"
(pageChange)="onPageChange($event)"
(pageSizeChange)="onPageSizeChange($event)"
@@ -37,6 +39,7 @@
[hideGear]="hideGear"
[linkType]="linkType"
[context]="context"
+ [hidePaginationDetail]="hidePaginationDetail"
*ngIf="(currentMode$ | async) === viewModeEnum.DetailedListElement">
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index f09ba3953e..58de49ba40 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -63,6 +63,11 @@ export class ObjectCollectionComponent implements OnInit {
*/
@Input() context: Context;
+ /**
+ * Option for hiding the pagination detail
+ */
+ @Input() hidePaginationDetail = false;
+
/**
* the page info of the list
*/
diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts
index fb68316251..45efb4a0b7 100644
--- a/src/app/shared/object-detail/object-detail.component.ts
+++ b/src/app/shared/object-detail/object-detail.component.ts
@@ -89,7 +89,7 @@ export class ObjectDetailComponent {
/**
* Option for hiding the pagination detail
*/
- public hidePaginationDetail = true;
+ @Input() hidePaginationDetail = true;
/**
* An event fired when the page is changed.
diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index 348536bfed..0afd623d86 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -5,6 +5,7 @@
[sortOptions]="sortConfig"
[hideGear]="hideGear"
[hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+ [hidePaginationDetail]="hidePaginationDetail"
(pageChange)="onPageChange($event)"
(pageSizeChange)="onPageSizeChange($event)"
(sortDirectionChange)="onSortDirectionChange($event)"
diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
index 2da4abe13b..c6f8347217 100644
--- a/src/app/shared/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -69,6 +69,11 @@ export class ObjectGridComponent implements OnInit {
*/
@Input() context: Context;
+ /**
+ * Option for hiding the pagination detail
+ */
+ @Input() hidePaginationDetail = false;
+
/**
* Behavior subject to output the current listable objects
*/
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index 887be96785..d0cfb1a9d8 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -5,6 +5,7 @@
[sortOptions]="sortConfig"
[hideGear]="hideGear"
[hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+ [hidePaginationDetail]="hidePaginationDetail"
(pageChange)="onPageChange($event)"
(pageSizeChange)="onPageSizeChange($event)"
(sortDirectionChange)="onSortDirectionChange($event)"
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 1be0f69106..1efd715084 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -74,6 +74,11 @@ export class ObjectListComponent {
*/
@Input() context: Context;
+ /**
+ * Option for hiding the pagination detail
+ */
+ @Input() hidePaginationDetail = false;
+
/**
* The current listable objects
*/
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index c16a153026..649fe686ff 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -1,5 +1,5 @@
-