Add drop down Source subscriber name on the PMC instantiation form

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / view-models / createInstanceServiceModels.htm

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
index 4d02ae8..4aa37c9 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================\r
   VID\r
   ================================================================================\r
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+  Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.\r
   ================================================================================\r
   Licensed under the Apache License, Version 2.0 (the "License");\r
   you may not use this file except in compliance with the License.\r
@@ -19,6 +19,11 @@
   -->\r
 \r
 <link rel="stylesheet" type="text/css" href="app/vid/styles/serviceModels.css" />\r
+<link rel="stylesheet" type="text/css" href="app/vid/styles/buttons.css" />\r
+\r
+<div popup-window class="popupContents" ngx-show="{{popup.isTablePopUpVisible}}" ng-cloak>\r
+       <div ng-include="'app/vid/scripts/view-models/previousVersion.htm'"/>\r
+</div>\r
 <div popup-window class="popupContents" ngx-show="{{popup.isVisible}}" ng-cloak>\r
        <div ng-include="'app/vid/scripts/view-models/creationDialog.htm'"/>\r
 </div>\r
@@ -28,22 +33,27 @@
                        <img src="app/vid/images/spinner.gif"></img>\r
                        </span>\r
                        <span class="statusLine" ng-class="{true:'progVisible', false:'progHidden'}[isProgressVisible]">\r
-                       <label>Status:</label><span class="status"><span ng-show="error"><font color='red'><b>Error: </b></font></span>{{status}}</span>\r
+                       <label>Status:</label><span class="status">\r
+                               <span ng-show="error"><font color='red'><b>Error: </b></font>{{status}}<br/>\r
+                               <button class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">Create report</button>\r
+                               </span>\r
+                       </span>\r
+\r
                </span>\r
        <br><br>\r
        \r
        \r
-       <table> \r
+       <table class="create-instance-service ">\r
                \r
                <tr>\r
                                <td >\r
-                               <div class="fn-ebz-container">  \r
+                               <div class="fn-ebz-container">\r
                                        <label  class="fn-ebz-text-label" >Subscriber Name :</label>\r
                                </div>\r
                                </td>\r
                                <td style="width:80%" nowrap>\r
                                        <div class="fn-ebz-container">\r
-                                       <textarea style=" height: 15px  width: 100% border: none resize: none  overflow: hidden background-color: #ddd outline: none" ng-model="createSubscriberName">{{createSubscriberName}}</textarea>\r
+                                       <textarea style="height: 33px; width: 100%; border: none; resize: none;  overflow: hidden; background-color: #ddd; outline: none;" ng-model="createSubscriberName" data-tests-id="selectedSubscriberName">{{createSubscriberName}}</textarea>\r
                                                \r
                                        </div>\r
                                </td>\r
@@ -57,7 +67,7 @@
                                </td>\r
                                <td style="width:80%" nowrap>\r
                                        <div class="fn-ebz-container">\r
-                                       <textarea style=" height: 15px  width: 100% border: none resize: none  overflow: hidden background-color: #ddd outline: none" ng-model="serviceTypeName">{{serviceTypeName}}</textarea>\r
+                                       <textarea style="height: 33px; width: 100%; border: none; resize: none;  overflow: hidden; background-color: #ddd; outline: none;" ng-model="serviceTypeName" data-tests-id="selectedServiceTypeName">{{serviceTypeName}}</textarea>\r
                                                \r
                                        </div>\r
                                </td>\r
@@ -68,13 +78,13 @@
        \r
        <div class="fn-ebz-container">\r
                         Filter:\r
-                         <input class="fn-ebz-text" type="text" ng-model="searchString" size="20" style="width: 250px;">\r
+                         <input class="fn-ebz-text" type="text" data-tests-id="browseFilter" ng-model="searchString" size="20" style="width: 250px;">\r
        </div>\r
 \r
        <!-- <h1 class="heading1" style="margin-top:20px;">Browse SDC Service Models</h1> -->\r
        <div style="margin-top:30px" ng-init="getAaiServiceModelsList();">\r
                \r
-               <table att-table table-data="services" view-per-page="viewPerPage" current-page="currentPage" search-category="searchCategory" search-string="searchString" total-page="totalPage">\r
+               <table data-tests-id="services-list" att-table table-data="services" view-per-page="viewPerPage" current-page="currentPage" search-category="searchCategory" search-string="searchString" total-page="totalPage">\r
                    <thead  att-table-row type="header">\r
                                <tr>\r
                                        <th att-table-header key="action">Action</th>\r
@@ -89,14 +99,20 @@
                    </thead>\r
                    <tbody att-table-row type="body" row-repeat="service in services">\r
                       <tr>\r
-                               <td att-table-body ><button type=button ng-click="deployService(service,true)" att-button btn-type="primary" size="small">Deploy</button></td>\r
+                               <td att-table-body ><button type=button ng-click="deployService(service,true)" data-tests-id="deploy-{{service['extra-properties']['extra-property'][1]['property-value']}}" att-button btn-type="primary" size="small">Deploy</button></td>\r
                        <td att-table-body ng-bind="service['extra-properties']['extra-property'][2]['property-value']"></td>\r
                        <td att-table-body ng-bind="service['extra-properties']['extra-property'][0]['property-value']"></td>\r
                        <td att-table-body ng-bind="service['extra-properties']['extra-property'][3]['property-value']"></td>\r
                        <td att-table-body ng-bind="service['extra-properties']['extra-property'][1]['property-value']"></td>\r
                        <td att-table-body ng-bind="service['extra-properties']['extra-property'][4]['property-value']"></td>\r
                        <td att-table-body ng-bind="service['extra-properties']['extra-property'][6]['property-value']"></td>\r
-                       <td att-table-body ><button type=button ng-click="deploService(service)" att-button btn-type="primary" size="small">Previous Versions</button></td>\r
+                       <td att-table-body ng-show="service['extra-properties']['extra-property'][6]['property-value'] > '1.0' ">\r
+                               <div class="clickable-text previous-versions-button"\r
+                                                  ng-click="loadPreviousVersionData(service['extra-properties']['extra-property'][6]['property-value'],service['extra-properties']['extra-property'][4]['property-value'])">\r
+                                       Previous Versions\r
+                               </div>\r
+                       </td>\r
+                       <td att-table-body ng-show="service['extra-properties']['extra-property'][6]['property-value'] <= '1.0' ">&nbsp;</td>\r
                        </tr>\r
                    </tbody>      \r
                </table>\r