From 2d7c117ed1f25eb136e094a511a6b8c541a3f9f6 Mon Sep 17 00:00:00 2001
From: dsbegnoche <derek.begnoche@gmail.com>
Date: Fri, 14 Sep 2018 10:38:58 -0500
Subject: [PATCH 1/3] Save Query box not clearing out

---
 src/Squidex/app/shared/components/search-form.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Squidex/app/shared/components/search-form.component.ts b/src/Squidex/app/shared/components/search-form.component.ts
index 5b76a7de7..ca7d53d49 100644
--- a/src/Squidex/app/shared/components/search-form.component.ts
+++ b/src/Squidex/app/shared/components/search-form.component.ts
@@ -90,6 +90,7 @@ export class SearchFormComponent implements OnChanges, OnInit {
     }
 
     public saveQuery() {
+        this.saveQueryForm.form.reset();
         this.saveQueryDialog.show();
     }
 
@@ -186,4 +187,4 @@ export class SearchFormComponent implements OnChanges, OnInit {
 
         this.contentsFilter.setValue(query);
     }
-}
\ No newline at end of file
+}

From 0687509b4103c73f0f09076c122989f9ab1de2aa Mon Sep 17 00:00:00 2001
From: dsbegnoche <derek.begnoche@gmail.com>
Date: Fri, 14 Sep 2018 10:40:37 -0500
Subject: [PATCH 2/3] Save Query Cancel still saves query

---
 src/Squidex/app/shared/components/search-form.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Squidex/app/shared/components/search-form.component.html b/src/Squidex/app/shared/components/search-form.component.html
index 13a9d7ef7..f3bbc7734 100644
--- a/src/Squidex/app/shared/components/search-form.component.html
+++ b/src/Squidex/app/shared/components/search-form.component.html
@@ -91,9 +91,9 @@
             </ng-container>
         
             <ng-container footer>
-                <button type="reset" class="float-left btn btn-secondary" (click)="saveQueryComplete()" [disabled]="saveQueryForm.submitted | async">Cancel</button>
+                <button type="reset" class="float-left btn btn-secondary" (click)="saveQueryDialog.hide()" [disabled]="saveQueryForm.submitted | async">Cancel</button>
                 <button type="submit" class="float-right btn btn-success">Create</button>
             </ng-container>
         </sqx-modal-dialog>
     </form>
-</ng-container>
\ No newline at end of file
+</ng-container>

From 884a00447f6bd32ef78bab0b1ff468a7db9bbbad Mon Sep 17 00:00:00 2001
From: dsbegnoche <derek.begnoche@gmail.com>
Date: Fri, 14 Sep 2018 11:07:42 -0500
Subject: [PATCH 3/3] Change clear form after PR feedback

---
 src/Squidex/app/shared/components/search-form.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Squidex/app/shared/components/search-form.component.ts b/src/Squidex/app/shared/components/search-form.component.ts
index ca7d53d49..60432aa90 100644
--- a/src/Squidex/app/shared/components/search-form.component.ts
+++ b/src/Squidex/app/shared/components/search-form.component.ts
@@ -90,7 +90,7 @@ export class SearchFormComponent implements OnChanges, OnInit {
     }
 
     public saveQuery() {
-        this.saveQueryForm.form.reset();
+        this.saveQueryForm.submitCompleted({});
         this.saveQueryDialog.show();
     }