From 5f95d402943fdaed136314f76c20a99866252f3f Mon Sep 17 00:00:00 2001
From: Kenji Ishii <ken-ishii@sx.jp.nec.com>
Date: Wed, 16 Nov 2016 10:56:32 +0900
Subject: [PATCH] Fix the issue that a wrong message is shown in ng-launch
 instance

In some case like an api response is delaying, users may see the message
"There are no Availability Zones" in Details tab.
Because the request to get availability zones is not still finished.
It makes user confuse.
This patch distinguish whether there are no availability zones or just
under requesting it and show users a proper message.

This matter may occur not only above case but also other tabs.
But at the moment, this patch is addressing only Details tab because
this tab is first one to be shown to users.

Change-Id: Iec1c18ced37b0c3a5f25a01975a8e2b0f2c1f335
Closes-Bug: #1642108
---
 .../launch-instance/details/details.html      |  9 ++++++--
 .../launch-instance-model.service.js          | 22 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/details/details.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/details/details.html
index 6740b67f6b..d5a49e6006 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/details/details.html
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/details/details.html
@@ -21,10 +21,15 @@
 
       <div class="form-group">
         <label class="control-label" translate for="availability-zone">Availability Zone</label>
+        <div class="horizon-loading-bar" ng-if="!model.loaded.availabilityZones">
+          <div class="progress progress-striped active">
+            <div class="progress-bar"></div>
+          </div>
+        </div>
         <div class="alert alert-warning"
-             ng-if="model.availabilityZones.length === 0"
+             ng-if="model.loaded.availabilityZones && model.availabilityZones.length === 0"
              translate>There are no Availability Zones.</div>
-        <select ng-if="model.availabilityZones.length !== 0"
+        <select ng-if="model.loaded.availabilityZones && model.availabilityZones.length !== 0"
                 class="form-control"
                 id="availability-zone"
                 ng-options="zone.value as zone.label for zone in model.availabilityZones"
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
index dbe2b00028..ab06f9c907 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
@@ -160,6 +160,14 @@
       metadataTree: null,
       hintsTree: null,
 
+      /**
+       * This is to inform users current situation is under loading or not
+       */
+      loaded: {
+        // Availability Zones on Details tab
+        availabilityZones: false
+      },
+
       /**
        * api methods for UI controllers
        */
@@ -204,6 +212,12 @@
       };
     }
 
+    function initializeLoadStatus() {
+      angular.forEach(model.loaded, function(val, key) {
+        model.loaded[key] = false;
+      });
+    }
+
     /**
      * @ngdoc method
      * @name launchInstanceModel.initialize
@@ -219,6 +233,7 @@
       // Each time opening launch instance wizard, we need to do this, or
       // we can call the whole methods `reset` instead of `initialize`.
       initializeNewInstanceSpec();
+      initializeLoadStatus();
 
       if (model.initializing) {
         promise = initPromise;
@@ -236,7 +251,8 @@
         var launchInstanceDefaults = settings.getSetting('LAUNCH_INSTANCE_DEFAULTS');
 
         promise = $q.all([
-          novaAPI.getAvailabilityZones().then(onGetAvailabilityZones, noop),
+          novaAPI.getAvailabilityZones().then(onGetAvailabilityZones)
+            .finally(onGetAvailabilityZonesComplete),
           novaAPI.getFlavors(true, true).then(onGetFlavors, noop),
           novaAPI.getKeypairs().then(onGetKeypairs, noop),
           novaAPI.getLimits(true).then(onGetNovaLimits, noop),
@@ -349,6 +365,10 @@
 
     }
 
+    function onGetAvailabilityZonesComplete() {
+      model.loaded.availabilityZones = true;
+    }
+
     // Flavors
 
     function onGetFlavors(data) {