From 33537c20d4cefd8e8c12ab9983e6755ce26db7a6 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Thu, 9 Nov 2023 17:35:56 +0100
Subject: [PATCH] Fix form reset.

---
 .../schema/fields/field-wizard.component.html   |  2 +-
 .../pages/schema/fields/field.component.html    | 17 +++++++++--------
 .../pages/schema/fields/field.component.ts      |  5 +----
 .../fields/forms/field-form.component.html      |  2 +-
 .../clients/client-add-form.component.html      |  2 +-
 .../pages/languages/language.component.html     |  2 +-
 .../pages/roles/role-add-form.component.html    |  2 +-
 .../settings/pages/roles/role.component.html    |  2 +-
 .../pages/workflows/workflow.component.html     |  2 +-
 .../forms/geolocation-editor.component.html     |  2 +-
 10 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.html b/frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.html
index 87b19332e..5371986c8 100644
--- a/frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.html
+++ b/frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.html
@@ -77,7 +77,7 @@
     </ng-container>
 
     <ng-container footer>
-        <button type="reset" class="float-start btn btn-text-secondary" (click)="emitClose()">
+        <button type="button" class="float-start btn btn-text-secondary" (click)="emitClose()">
             {{ 'common.cancel' | sqxTranslate }}
         </button>
 
diff --git a/frontend/src/app/features/schemas/pages/schema/fields/field.component.html b/frontend/src/app/features/schemas/pages/schema/fields/field.component.html
index fb381fd01..a661a66de 100644
--- a/frontend/src/app/features/schemas/pages/schema/fields/field.component.html
+++ b/frontend/src/app/features/schemas/pages/schema/fields/field.component.html
@@ -91,13 +91,14 @@
 
     <div class="table-items-row-details" *ngIf="isEditing">
         <form [formGroup]="editForm.form" (ngSubmit)="save()">
-            <sqx-field-form showButtons="true" (cancel)="toggleEditing()"
-                [languages]="languages"
-                [fieldForm]="editForm.form"
+            <sqx-field-form showButtons="true"
+                (dialogClose)="toggleEditing()"
                 [field]="field"
-                [schema]="schema"
+                [fieldForm]="editForm.form"
                 [isEditable]="isEditable"
                 [isLocalizable]="isLocalizable"
+                [languages]="languages"
+                [schema]="schema"
                 [settings]="settings">
             </sqx-field-form>
         </form> 
@@ -111,11 +112,11 @@
                 [fields]="nested"
                 [fieldsEmpty]="nested.length === 0"
                 [languages]="languages"
+                [parent]="$any(field)"
                 [schema]="schema"
                 [settings]="settings"
                 [sortable]="isEditable === true"
-                (sorted)="sortFields($event)"
-                [parent]="$any(field)">
+                (sorted)="sortFields($event)">
             </sqx-sortable-field-list>
             
             <div class="nested-field nested-field-add" *ngIf="isEditable">
@@ -127,10 +128,10 @@
             </div>
                 
             <sqx-field-wizard *sqxModal="fieldWizard"
+                (dialogClose)="fieldWizard.hide()"
                 [parent]="$any(field)"
                 [schema]="schema"
-                [settings]="settings"
-                (dialogClose)="fieldWizard.hide()">
+                [settings]="settings">
             </sqx-field-wizard>
         </ng-container>
     </div>
diff --git a/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts b/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
index cd8a5930b..6ae8bdde1 100644
--- a/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
+++ b/frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
@@ -55,16 +55,13 @@ export class FieldComponent {
             this.isEditable = this.field.canUpdate;
 
             this.editForm = new EditFieldForm(this.field.properties);
-            this.editForm.load(this.field.properties);
         }
     }
 
     public toggleEditing() {
         this.isEditing = !this.isEditing;
 
-        if (this.isEditing) {
-            this.editForm.load(this.field.properties);
-        }
+        this.editForm.load(this.field.properties);
     }
 
     public deleteField() {
diff --git a/frontend/src/app/features/schemas/pages/schema/fields/forms/field-form.component.html b/frontend/src/app/features/schemas/pages/schema/fields/forms/field-form.component.html
index 04dc9891f..2abafd249 100644
--- a/frontend/src/app/features/schemas/pages/schema/fields/forms/field-form.component.html
+++ b/frontend/src/app/features/schemas/pages/schema/fields/forms/field-form.component.html
@@ -23,7 +23,7 @@
     </ul>
 
     <div class="float-end" *ngIf="showButtons">
-        <button [disabled]="field.isLocked" type="reset" class="btn btn-text-secondary" (click)="dialogClose.emit()">
+        <button [disabled]="field.isLocked" type="button" class="btn btn-text-secondary" (click)="dialogClose.emit()">
             {{ 'common.cancel' | sqxTranslate }}
         </button>
 
diff --git a/frontend/src/app/features/settings/pages/clients/client-add-form.component.html b/frontend/src/app/features/settings/pages/clients/client-add-form.component.html
index 248cfc4d4..f8d98073c 100644
--- a/frontend/src/app/features/settings/pages/clients/client-add-form.component.html
+++ b/frontend/src/app/features/settings/pages/clients/client-add-form.component.html
@@ -14,7 +14,7 @@
                 </button>
             </div>
             <div class="col-auto">
-                <button type="reset" class="btn btn-text-secondary" (click)="cancel()">
+                <button type="button" class="btn btn-text-secondary" (click)="cancel()">
                     {{ 'common.cancel' | sqxTranslate }}
                 </button>
             </div>
diff --git a/frontend/src/app/features/settings/pages/languages/language.component.html b/frontend/src/app/features/settings/pages/languages/language.component.html
index e0fc691d7..850a2da06 100644
--- a/frontend/src/app/features/settings/pages/languages/language.component.html
+++ b/frontend/src/app/features/settings/pages/languages/language.component.html
@@ -27,7 +27,7 @@
         <form [formGroup]="editForm.form" (ngSubmit)="save()">
             <div class="table-items-row-details-tabs clearfix">
                 <div class="float-end">
-                    <button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()">
+                    <button type="button" class="btn btn-text-secondary" (click)="toggleEditing()">
                         {{ 'common.cancel' | sqxTranslate }}
                     </button>
                     
diff --git a/frontend/src/app/features/settings/pages/roles/role-add-form.component.html b/frontend/src/app/features/settings/pages/roles/role-add-form.component.html
index 90ec68db3..54b1dd36f 100644
--- a/frontend/src/app/features/settings/pages/roles/role-add-form.component.html
+++ b/frontend/src/app/features/settings/pages/roles/role-add-form.component.html
@@ -15,7 +15,7 @@
                     </button>
                 </div>
                 <div class="col-auto">
-                    <button type="reset" class="btn btn-text-secondary" (click)="cancel()">
+                    <button type="button" class="btn btn-text-secondary" (click)="cancel()">
                         {{ 'common.cancel' | sqxTranslate }}
                     </button>
                 </div>
diff --git a/frontend/src/app/features/settings/pages/roles/role.component.html b/frontend/src/app/features/settings/pages/roles/role.component.html
index 6eb20d4fe..9eed58ab6 100644
--- a/frontend/src/app/features/settings/pages/roles/role.component.html
+++ b/frontend/src/app/features/settings/pages/roles/role.component.html
@@ -34,7 +34,7 @@
         <form (ngSubmit)="save()">
             <div class="table-items-row-details-tabs clearfix">
                 <div class="float-end">
-                    <button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()">
+                    <button type="button" class="btn btn-text-secondary" (click)="toggleEditing()">
                         {{ 'common.cancel' | sqxTranslate }}
                     </button>
                     
diff --git a/frontend/src/app/features/settings/pages/workflows/workflow.component.html b/frontend/src/app/features/settings/pages/workflows/workflow.component.html
index 80dce3fad..8e8960707 100644
--- a/frontend/src/app/features/settings/pages/workflows/workflow.component.html
+++ b/frontend/src/app/features/settings/pages/workflows/workflow.component.html
@@ -45,7 +45,7 @@
             </ul>
 
             <div class="float-end">
-                <button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()">
+                <button type="button" class="btn btn-text-secondary" (click)="toggleEditing()">
                     {{ 'common.cancel' | sqxTranslate }}
                 </button>
 
diff --git a/frontend/src/app/shared/components/forms/geolocation-editor.component.html b/frontend/src/app/shared/components/forms/geolocation-editor.component.html
index 1b23a8cec..eb38c98cd 100644
--- a/frontend/src/app/shared/components/forms/geolocation-editor.component.html
+++ b/frontend/src/app/shared/components/forms/geolocation-editor.component.html
@@ -29,7 +29,7 @@
             </div>
 
             <div class="form-group col-auto" *ngIf="!snapshot.isCompact">
-                <button [class.hidden]="!hasValue" type="reset" class="btn btn-text clear" [disabled]="snapshot.isDisabled" (click)="clearValue()">
+                <button [class.hidden]="!hasValue" type="button" class="btn btn-text clear" [disabled]="snapshot.isDisabled" (click)="clearValue()">
                     {{ 'common.clear' | sqxTranslate }}
                 </button>
             </div>