From: Patrick Nawracay <pnawracay@suse.com>
Date: Fri, 2 Nov 2018 07:21:32 +0000 (+0100)
Subject: mgr/dashboard: Simplification of PoolForm method
X-Git-Tag: v14.1.0~1009^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24892%2Fhead;p=ceph.git

mgr/dashboard: Simplification of PoolForm method

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts
index 1eb9c6ab4961..1412fbea5884 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts
@@ -163,28 +163,27 @@ export class PoolFormComponent implements OnInit {
   }
 
   private initEditFormData(pool: Pool) {
-    const transform = {
-      name: 'pool_name',
-      poolType: 'type',
-      crushRule: (p) =>
-        this.info['crush_rules_' + p.type].find(
-          (rule: CrushRule) => rule.rule_name === p.crush_rule
-        ),
-      size: 'size',
-      erasureProfile: (p) => this.ecProfiles.find((ecp) => ecp.name === p.erasure_code_profile),
-      pgNum: 'pg_num',
-      ecOverwrites: (p) => p.flags_names.includes('ec_overwrites'),
-      mode: 'options.compression_mode',
-      algorithm: 'options.compression_algorithm',
-      minBlobSize: (p) => this.dimlessBinaryPipe.transform(p.options.compression_min_blob_size),
-      maxBlobSize: (p) => this.dimlessBinaryPipe.transform(p.options.compression_max_blob_size),
-      ratio: 'options.compression_required_ratio'
+    const dataMap = {
+      name: pool.pool_name,
+      poolType: pool.type,
+      crushRule: this.info['crush_rules_' + pool.type].find(
+        (rule: CrushRule) => rule.rule_name === pool.crush_rule
+      ),
+      size: pool.size,
+      erasureProfile: this.ecProfiles.find((ecp) => ecp.name === pool.erasure_code_profile),
+      pgNum: pool.pg_num,
+      ecOverwrites: pool.flags_names.includes('ec_overwrites'),
+      mode: pool.options.compression_mode,
+      algorithm: pool.options.compression_algorithm,
+      minBlobSize: this.dimlessBinaryPipe.transform(pool.options.compression_min_blob_size),
+      maxBlobSize: this.dimlessBinaryPipe.transform(pool.options.compression_max_blob_size),
+      ratio: pool.options.compression_required_ratio
     };
-    Object.keys(transform).forEach((key) => {
-      const attrib = transform[key];
-      const value = _.isFunction(attrib) ? attrib(pool) : _.get(pool, attrib);
+
+    Object.keys(dataMap).forEach((controlName: string) => {
+      const value = dataMap[controlName];
       if (!_.isUndefined(value) && value !== '') {
-        this.form.silentSet(key, value);
+        this.form.silentSet(controlName, value);
       }
     });
     this.data.applications.selected = pool.application_metadata;