From a84224324b975d2708c6fa45ebc06107540d9849 Mon Sep 17 00:00:00 2001
From: Thai Tran <tqtran@us.ibm.com>
Date: Tue, 1 Mar 2016 14:06:17 -0800
Subject: [PATCH] New queues does not display message count

When a new queue is created, it does not display the message count
correctly. This patch fixes this error and minor changes to table columns.

Change-Id: I097229dbdd1c2aeacf684087dab9cfd1f07ae45e
---
 zaqar_ui/api/rest/zaqar.py                    |  3 +++
 .../project/queues/actions/create.service.js  |  6 ++---
 .../steps/queue-details/queue-details.html    |  2 +-
 .../project/queues/table/table.controller.js  |  6 ++---
 .../dashboard/project/queues/table/table.html | 22 +++++--------------
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/zaqar_ui/api/rest/zaqar.py b/zaqar_ui/api/rest/zaqar.py
index 09443d1..e0590e3 100644
--- a/zaqar_ui/api/rest/zaqar.py
+++ b/zaqar_ui/api/rest/zaqar.py
@@ -72,5 +72,8 @@ class Queues(generic.View):
         new_queue = zaqar.queue_create(request, **request.DATA)
         location = '/api/zaqar/queues/%s' % new_queue.name
         response = {'name': new_queue.name,
+                    'claimed': 0,
+                    'free': 0,
+                    'total': 0,
                     'metadata': new_queue._metadata}
         return rest_utils.CreatedResponse(location, response)
diff --git a/zaqar_ui/static/dashboard/project/queues/actions/create.service.js b/zaqar_ui/static/dashboard/project/queues/actions/create.service.js
index bb6cf2e..7b41be7 100644
--- a/zaqar_ui/static/dashboard/project/queues/actions/create.service.js
+++ b/zaqar_ui/static/dashboard/project/queues/actions/create.service.js
@@ -62,7 +62,7 @@
     // will know when a new queue has been created
     function initScope($scope) {
       scope = $scope;
-      var queueWatcher = $scope.$on(events.DETAILS_CHANGED, onQueueChange);
+      var queueWatcher = $scope.$on(events.DETAILS_CHANGED, onDetailChange);
       var metadataWatcher = $scope.$on(events.METADATA_CHANGED, onMetadataChange);
       $scope.$on('$destroy', function destroy() {
         queueWatcher();
@@ -70,8 +70,8 @@
       });
     }
 
-    function onQueueChange(e, queue) {
-      model.queue_name = queue.name;
+    function onDetailChange(e, queue) {
+      angular.extend(model, queue);
       e.stopPropagation();
     }
 
diff --git a/zaqar_ui/static/dashboard/project/queues/steps/queue-details/queue-details.html b/zaqar_ui/static/dashboard/project/queues/steps/queue-details/queue-details.html
index c861449..373ed5b 100644
--- a/zaqar_ui/static/dashboard/project/queues/steps/queue-details/queue-details.html
+++ b/zaqar_ui/static/dashboard/project/queues/steps/queue-details/queue-details.html
@@ -17,7 +17,7 @@
             <input required
               id="queueDetailsForm-name" name="name"
               type="text" class="form-control"
-              ng-model="detailsCtrl.queue.name"
+              ng-model="detailsCtrl.queue.queue_name"
               ng-maxlength="255"
               placeholder="{$ 'Enter a queue name'|translate $}">
             <p class="help-block alert alert-danger"
diff --git a/zaqar_ui/static/dashboard/project/queues/table/table.controller.js b/zaqar_ui/static/dashboard/project/queues/table/table.controller.js
index b309d2e..e653f35 100644
--- a/zaqar_ui/static/dashboard/project/queues/table/table.controller.js
+++ b/zaqar_ui/static/dashboard/project/queues/table/table.controller.js
@@ -62,13 +62,13 @@
 
     function init() {
       registry.initActions(type, $scope);
-      zaqar.getQueues().success(getQueuesSuccess);
+      zaqar.getQueues().then(showQueues);
     }
 
-    function getQueuesSuccess(response) {
+    function showQueues(response) {
       // hz-table expects all items to have the id field
       // so we need to manually add name as id here
-      ctrl.queuesSrc = response;
+      ctrl.queuesSrc = response.data;
       ctrl.queuesSrc.map(function addIdentifier(queue, index){
         queue.id = queue.name;
       });
diff --git a/zaqar_ui/static/dashboard/project/queues/table/table.html b/zaqar_ui/static/dashboard/project/queues/table/table.html
index 4016e35..26f4b1c 100644
--- a/zaqar_ui/static/dashboard/project/queues/table/table.html
+++ b/zaqar_ui/static/dashboard/project/queues/table/table.html
@@ -33,9 +33,9 @@
       </th>
       <th class="expander"></th>
       <th class="rsp-p1" st-sort="name" st-sort-default translate>Name</th>
-      <th class="rsp-p2" st-sort="metadata" translate>Claimed Messages</th>
+      <th class="rsp-p1" st-sort="metadata" translate>Claimed Messages</th>
       <th class="rsp-p2" st-sort="metadata" translate>Free Messages</th>
-      <th class="rsp-p2" st-sort="metadata" translate>Total Messages</th>
+      <th class="rsp-p1" st-sort="metadata" translate>Total Messages</th>
       <th class="action-col" translate>Actions</th>
     </tr>
   </thead>
@@ -63,9 +63,9 @@
       </td>
 
       <td class="rsp-p1">{$ q.name $}</td>
-      <td class="rsp-p2">{$ q.claimed $}</td>
+      <td class="rsp-p1">{$ q.claimed $}</td>
       <td class="rsp-p2">{$ q.free $}</td>
-      <td class="rsp-p2">{$ q.total $}</td>
+      <td class="rsp-p1">{$ q.total $}</td>
       <td class="action-col">
         <!--
           Table-row-action-column:
@@ -96,18 +96,8 @@
           -->
           <span class="rsp-alt-p2">
             <dl class="col-sm-2">
-              <dt translate>Flavor</dt>
-              <dd>{$ q.metadata.flavor $}</dd>
-            </dl>
-
-            <dl class="col-sm-2">
-              <dt translate>Max Message Size</dt>
-              <dd>{$ q.metadata.max_message_size $}</dd>
-            </dl>
-
-            <dl class="col-sm-2">
-              <dt translate>Time To Live</dt>
-              <dd>{$ q.metadata.ttl $}</dd>
+              <dt translate>Free Messages</dt>
+              <dd>{$ q.free $}</dd>
             </dl>
           </span>