From 804b4c3abe0372359e0f678e9b9c20dce652ac9b Mon Sep 17 00:00:00 2001
From: Shu Muto <shu-mutou@rf.jp.nec.com>
Date: Wed, 27 Dec 2017 10:59:12 +0900
Subject: [PATCH] Add noValue filter for cluster template parameters

This patch shows '-' or 'None' for empty parameters on
Cluster Template details view and in drawer on table view.

Change-Id: I48f9051c0217560cbe4210370c5b3c0bebf5a2d1
---
 .../details/drawer.controller.js              | 10 ++++++
 .../cluster-templates/details/drawer.html     |  1 +
 .../details/overview.controller.js            |  9 ++++++
 .../cluster-templates/details/overview.html   | 31 +++++++++----------
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.controller.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.controller.js
index 970a11f2..a753557c 100644
--- a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.controller.js
@@ -31,6 +31,16 @@
   ];
 
   function controller() {
+    var ctrl = this;
+    ctrl.objLen = objLen;
+
+    function objLen(obj) {
+      var length = 0;
+      if (typeof obj === 'object') {
+        length = Object.keys(obj).length;
+      }
+      return length;
+    }
   }
 
 })();
diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.html b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.html
index aa75ac28..f4846cc3 100644
--- a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.html
+++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.html
@@ -22,6 +22,7 @@
     </dl>
     <dl class="col-md-4">
       <dt translate>Labels</dt>
+      <dd ng-if="drawerCtrl.objLen(item.labels) === 0" translate>None</dd>
       <dd ng-repeat="(key, value) in item.labels">{$ key + '=' + value $}</dd>
     </dl>
   </div>
diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.controller.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.controller.js
index 15d68d7d..e4d4afba 100644
--- a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.controller.js
+++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.controller.js
@@ -30,6 +30,7 @@
     var ctrl = this;
     ctrl.cluster_template = {};
     ctrl.image_uuid = "";
+    ctrl.objLen = objLen;
 
     $scope.context.loadPromise.then(onGetClusterTemplate);
 
@@ -45,5 +46,13 @@
         }
       });
     }
+
+    function objLen(obj) {
+      var length = 0;
+      if (typeof obj === 'object') {
+        length = Object.keys(obj).length;
+      }
+      return length;
+    }
   }
 })();
diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html
index 7fdd6525..69ec7c72 100644
--- a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html
+++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html
@@ -28,15 +28,15 @@
         <dd ng-if="ctrl.cluster_template.keypair_id!==null"><a href="project/key_pairs/{$ ctrl.cluster_template.keypair_id $}/" target="_self">{$ ctrl.cluster_template.keypair_id $}</a></dd>
         <dd ng-if="ctrl.cluster_template.keypair_id===null">-</dd>
         <dt translate>Flavor ID</dt>
-        <dd>{$ ctrl.cluster_template.flavor_id $}</dd>
+        <dd>{$ ctrl.cluster_template.flavor_id | noValue $}</dd>
         <dt translate>Master Flavor ID</dt>
-        <dd>{$ ctrl.cluster_template.master_flavor_id $}</dd>
+        <dd>{$ ctrl.cluster_template.master_flavor_id | noValue $}</dd>
         <dt translate>Volume Driver</dt>
-        <dd>{$ ctrl.cluster_template.volume_driver $}</dd>
+        <dd>{$ ctrl.cluster_template.volume_driver | noValue $}</dd>
         <dt translate>Docker Storage Driver</dt>
-        <dd>{$ ctrl.cluster_template.docker_storage_driver $}</dd>
+        <dd>{$ ctrl.cluster_template.docker_storage_driver | noValue $}</dd>
         <dt translate>Docker Volume Size</dt>
-        <dd>{$ ctrl.cluster_template.docker_volume_size | gb $}</dd>
+        <dd>{$ ctrl.cluster_template.docker_volume_size | gb | noValue $}</dd>
       </dl>
     </div>
   </div>
@@ -48,19 +48,19 @@
         <dt translate>Network Driver</dt>
         <dd>{$ ctrl.cluster_template.network_driver $}</dd>
         <dt translate>HTTP Proxy</dt>
-        <dd>{$ ctrl.cluster_template.http_proxy $}</dd>
+        <dd>{$ ctrl.cluster_template.http_proxy | noValue $}</dd>
         <dt translate>HTTPS Proxy</dt>
-        <dd>{$ ctrl.cluster_template.https_proxy $}</dd>
+        <dd>{$ ctrl.cluster_template.https_proxy | noValue $}</dd>
         <dt translate>No Proxy</dt>
-        <dd>{$ ctrl.cluster_template.no_proxy $}</dd>
+        <dd>{$ ctrl.cluster_template.no_proxy | noValue $}</dd>
         <dt translate>External Network ID</dt>
         <dd>{$ ctrl.cluster_template.external_network_id $}</dd>
         <dt translate>Fixed Network</dt>
-        <dd>{$ ctrl.cluster_template.fixed_network $}</dd>
+        <dd>{$ ctrl.cluster_template.fixed_network | noValue $}</dd>
         <dt translate>Fixed Subnet</dt>
-        <dd>{$ ctrl.cluster_template.fixed_subnet $}</dd>
+        <dd>{$ ctrl.cluster_template.fixed_subnet | noValue $}</dd>
         <dt translate>DNS</dt>
-        <dd>{$ ctrl.cluster_template.dns_nameserver $}</dd>
+        <dd>{$ ctrl.cluster_template.dns_nameserver | noValue $}</dd>
         <dt translate>Master LB Enabled</dt>
         <dd>{$ ctrl.cluster_template.master_lb_enabled | yesno $}</dd>
         <dt translate>Floating IP Enabled</dt>
@@ -71,10 +71,9 @@
       <h3 translate>Labels</h3>
       <hr>
       <dl class="dl-horizontal">
-        <div ng-repeat="(key, value) in ctrl.cluster_template.labels">
-          <dt>{$ key $}</dt>
-          <dd>{$ value $}</dd>
-        </div>
+        <dd ng-if="ctrl.objLen(ctrl.cluster_template.labels) === 0" translate>None</dd>
+        <dt ng-repeat-start="(key, value) in ctrl.cluster_template.labels">{$ key $}</dt>
+        <dd ng-repeat-end>{$ value $}</dd>
       </dl>
     </div>
   </div>
@@ -86,7 +85,7 @@
         <dt translate>Created</dt>
         <dd>{$ ctrl.cluster_template.created_at | date:'short' $}</dd>
         <dt translate>Updated</dt>
-        <dd>{$ ctrl.cluster_template.updated_at | date:'short' $}</dd>
+        <dd>{$ ctrl.cluster_template.updated_at | date:'short' | noValue $}</dd>
         <dt translate>ID</dt>
         <dd>{$ ctrl.cluster_template.id $}</dd>
       </dl>