From 1a30744f5ba661ab7f3beee7587749006d55fb95 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 9 Jul 2019 14:06:09 +0200
Subject: [PATCH] 62849: submission relation search on enter

---
 .../dynamic-lookup-relation-modal.component.html          | 8 ++++----
 .../dynamic-lookup-relation-modal.component.ts            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html
index 84c6e5bd8b..433501504c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html
@@ -6,12 +6,12 @@
     </button>
 </div>
 <div class="modal-body" *ngVar="(resultsRD$ | async) as resultsRD">
-    <div class="input-group mb-3">
-        <input type="text" class="form-control" placeholder="Search query" [(ngModel)]="queryInput">
+    <form class="input-group mb-3" #queryForm="ngForm" (ngSubmit)="search(queryForm.value.query)" >
+        <input type="text" class="form-control" name="query" placeholder="Search query" [ngModel]="searchQuery">
         <div class="input-group-append">
-            <button class="btn btn-outline-secondary" type="button" (click)="search()">Go</button>
+            <button class="btn btn-outline-secondary" type="submit">Go</button>
         </div>
-    </div>
+    </form>
     <ds-loading *ngIf="!resultsRD || resultsRD.isLoading"></ds-loading>
     <div *ngIf="resultsRD?.hasSucceeded && resultsRD.payload.page.length > 0">
         <div *ngIf="repeatable">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts
index e109b4641f..ba289dda20 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts
@@ -30,12 +30,12 @@ export class DsDynamicLookupRelationModalComponent implements OnInit {
   repeatable: boolean;
   selection: DSpaceObject[] = [];
   allSelected = false;
-  queryInput;
   searchQuery;
   initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'submission-relation-list',
     pageSize: 5
   });
+
   constructor(public modal: NgbActiveModal, private searchService: SearchService) {
   }
 
@@ -44,8 +44,8 @@ export class DsDynamicLookupRelationModalComponent implements OnInit {
     this.onPaginationChange(this.initialPagination);
   }
 
-  search() {
-    this.searchQuery = this.queryInput;
+  search(query: string) {
+    this.searchQuery = query;
     this.onPaginationChange(this.initialPagination);
     this.deselectAll();
   }