Display Manual Task description in actions popup

Change-Id: I3aa990785b340cdff647154016ae6078aabc3ee7
Issue-ID: VID-403
Signed-off-by: Ittay Stern <ittay.stern@att.com>

6 files changed, 39 insertions, 32 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html
index 9acc2c2e1..4cfc5be7f 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html
@@ -21,13 +21,13 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/modal-create-new.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/alert-change-management/alert-change-management.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/css/manual-task-popup.css" />
-<div class="modal-header">
-    <h3 class="modal-title" id="alert-modal-header">On Hold</h3>
-    <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
-</div>
-<div class="modal-body">
-    <span id="alert-modal-content">{{vm.content}}</span>
-</div>
-<div class="modal-footer">
-    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'"></div>
-</div>
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title" id="alert-modal-header">On Hold</h3>
+        <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
+    </div>
+    <div class="modal-body">
+        <span id="alert-modal-content">{{vm.content}}</span>
+    </div>
+    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'" />
+</div>
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html
index 40fefab98..099a6ad7b 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html
@@ -18,7 +18,12 @@
   ============LICENSE_END=========================================================
   -->
 
-<div class="pull-right">
+<div class="modal-body">
+    <span id="in-progress-modal-description" ng-if="vm.description">{{vm.description}}</span>
+    <span id="in-progress-modal-timeout" ng-if="vm.timeout">({{vm.timeout}})</span>
+</div>
+
+<div class="modal-footer">
     <button ng-repeat="task in vm.manualTasks"
             type="button" id="{{task}}-button" name="{{task}}" class="btn btn-primary"
             ng-show="vm.isTaskAvailable(vm.MANUAL_TASKS[task])"
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html
index 11d73e26e..4a4a3cfec 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html
@@ -21,13 +21,13 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/modal-create-new.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/failed-change-management/failed-change-management.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/css/manual-task-popup.css" />
-<div class="modal-header">
-    <h3 class="modal-title" id="failed-modal-header">{{vm.requestState || 'Failed' }}</h3>
-    <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
-</div>
-<div class="modal-body">
-    <span id="failed-modal-content">{{vm.content}}</span>
-</div>
-<div class="modal-footer">
-    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'"></div>
-</div>
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title" id="failed-modal-header">{{vm.requestState || 'Failed' }}</h3>
+        <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
+    </div>
+    <div class="modal-body">
+        <span id="failed-modal-content">{{vm.content}}</span>
+    </div>
+    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'" />
+</div>
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html
index e0c88660b..d133d4960 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html
@@ -21,13 +21,13 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/modal-create-new.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/css/manual-task-popup.css" />
-<div class="modal-header">
-    <h3 class="modal-title" id="in-progress-modal-header">In Progress</h3>
-    <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
-</div>
-<div class="modal-body">
-    <span id="in-progress-modal-content">{{vm.content}}</span>
-</div>
-<div class="modal-footer">
-    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'"></div>
-</div>
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title" id="in-progress-modal-header">In Progress</h3>
+        <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
+    </div>
+    <div class="modal-body">
+        <span id="in-progress-modal-content">{{vm.content}}</span>
+    </div>
+    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'" />
+</div>
\ No newline at end of file
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements_scaleout.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements_scaleout.json
index a7913b0e6..01d28a41c 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements_scaleout.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements_scaleout.json
@@ -17,7 +17,7 @@
             "requestStatus":{
               "percentProgress":100.0,
               "requestState":"IN_PROGRESS",
-              "statusMessage":"Update Is In Progress",
+              "statusMessage":"Scale-Out Is In Progress",
               "finishTime":"Fri, 08 Sep 2017 19:34:33 GMT"
             },
             "requestType":"scaleOut",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json
index 2b0d1bafb..7fab6c6ff 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json
@@ -20,6 +20,8 @@
           "errorSource": "A&AI",
           "errorCode": "404",
           "errorMessage": "Failed in A&AI 404",
+          "description": "Manually restart VM id vm8776da8-4c8cbe860422, then verify logs still contain task id daf4dd84-b77a-42da-a051-3239b7a9392c",
+          "timeout": "PT3000S",
           "validResponses": [
             "rollback",
             "abort",