67611: Fixed radio button bug + hide pagintion details

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 @@
   <div id="external-source-entry-entities" class="mb-2">
     <h5 class="font-weight-bold">{{ ('submission.sections.describe.relationship-lookup.external-source.import-modal.entities' | translate) }}</h5>
 
-    <ds-search-results [searchResults]="(localEntitiesRD$ | async)"
+    <ds-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 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"

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,8 +117,10 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
    * @param event
    */
   deselectEntity(event) {
+    if (this.selectedImportType === ImportType.LocalEntity) {
       this.selectedImportType = ImportType.None;
     }
+  }
 
   /**
    * Selected a local entity

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">
 </ds-object-detail>
 

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
    */

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.

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)"

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
    */

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)"

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
    */

src/app/shared/pagination/pagination.component.html

@@ -1,5 +1,5 @@
 <div *ngIf="currentPageState == undefined || currentPageState == currentPage">
-  <div  class="pagination-masked clearfix top">
+  <div *ngIf="(!hidePaginationDetail && collectionSize > 0) || !hideGear" class="pagination-masked clearfix top">
     <div class="row">
       <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
           <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>

src/app/shared/search/search-results/search-results.component.html

@@ -8,6 +8,7 @@
             [selectable]="selectable"
             [selectionConfig]="selectionConfig"
             [context]="context"
+            [hidePaginationDetail]="hidePaginationDetail"
             (deselectObject)="deselectObject.emit($event)"
             (selectObject)="selectObject.emit($event)"
             >

src/app/shared/search/search-results/search-results.component.ts

@@ -67,6 +67,11 @@ export class SearchResultsComponent {
 
   @Input() context: Context;
 
+  /**
+   * Option for hiding the pagination detail
+   */
+  @Input() hidePaginationDetail = false;
+
   @Input() selectionConfig: {repeatable: boolean, listId: string};
 
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();