From 1d5e9500b57396e0c003c424c13bc9cab4b7d57e Mon Sep 17 00:00:00 2001
From: Tiago Melo <tmelo@suse.com>
Date: Fri, 24 May 2019 00:31:45 +0000
Subject: [PATCH] mgr/dashboard: Fix NFS clients squash/access_type default
 values

Fixes: https://tracker.ceph.com/issues/40012

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit d038663518dad66c8edbff02ef8a1a9ef37f3fe5)
---
 .../nfs/nfs-form-client/nfs-form-client.component.html    | 4 ++--
 .../ceph/nfs/nfs-form-client/nfs-form-client.component.ts | 4 ++--
 .../src/app/ceph/nfs/nfs-form/nfs-form.component.ts       | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
index fa75da44af4e9..b5a05c75f1c80 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
@@ -60,7 +60,7 @@
                         name="access_type"
                         id="access_type"
                         formControlName="access_type">
-                  <option [value]="form.getValue('access_type')">{{ getNoAccessTypeDescr() }}</option>
+                  <option value="">{{ getNoAccessTypeDescr() }}</option>
                   <option *ngFor="let item of nfsAccessType"
                           [value]="item.value">{{ item.value }}</option>
                 </select>
@@ -81,7 +81,7 @@
                         name="squash"
                         id="squash"
                         formControlName="squash">
-                  <option [value]="form.getValue('squash')">{{ getNoSquashDescr() }}</option>
+                  <option value="">{{ getNoSquashDescr() }}</option>
                   <option *ngFor="let squash of nfsSquash"
                           [value]="squash">{{ squash }}</option>
                 </select>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts
index 986dd5a4f6d23..a549deb0445ce 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts
@@ -52,8 +52,8 @@ export class NfsFormClientComponent {
       addresses: new FormControl('', {
         validators: [Validators.required, Validators.pattern(REGEX_LIST_IP)]
       }),
-      access_type: new FormControl(this.form.getValue('access_type')),
-      squash: new FormControl(this.form.getValue('squash'))
+      access_type: new FormControl(''),
+      squash: new FormControl('')
     });
 
     clients.push(fg);
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
index 124214f313159..e234209638a09 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
@@ -542,6 +542,14 @@ export class NfsFormComponent implements OnInit {
       } else {
         client.addresses = [];
       }
+
+      if (!client.squash) {
+        client.squash = requestModel.squash;
+      }
+
+      if (!client.access_type) {
+        client.access_type = requestModel.access_type;
+      }
     });
 
     if (requestModel.security_label === false || requestModel.fsal.name === 'RGW') {
-- 
2.39.5