Introduced mocked SO workflows in VID FE

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / modals / new-change-management / new-change-management.controller.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
index 6029ed2..11f5cd6 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
@@ -94,14 +94,14 @@
 
                                                 _.forEach(newVNFName.vfModules, function (mdl, key) {
                                                     mdl.scale = false; //defaults to not scale unless user changes it
-                                                    if(mdl.properties && mdl.properties.max_vf_module_instances) {
+                                                    if(mdl.properties && mdl.properties.maxCountInstances) {
 
                                                         //how many vf modules of the same customizationId belong to that vnf instance
                                                         mdl.currentCount = _.filter(vm.vfModules, function(item){
                                                             return modulesAaiIds.indexOf(item.id) > -1 && item.properties["model-customization-id"] === mdl.customizationUuid;
                                                         }).length;
 
-                                                        mdl.scalable = mdl.properties.max_vf_module_instances.value - mdl.currentCount > 0;
+                                                        mdl.scalable = mdl.properties.maxCountInstances - mdl.currentCount > 0;
                                                     }else{
                                                         mdl.scalable = false;
                                                     }
@@ -121,13 +121,19 @@
         };
 
         var extractVNFModel = function (csarVNF, sdcService, selectionVNF) {
+            /**
+            @param selectionVNF A vnf *instance* selected in "available VNF" drop-down box
+            @param csarVNF      A VNF *MODEL* that has an invariantUuid same as selectionVNF (might be
+                                a different version; i.e. selectionVNF.modelVersionId <> csarVNF.uuid)
+            @param sdcService   The Service *MODEL* which has the related VNF `csarVNF`.
+             */
             var versionCsarData = {
                 vnfInstanceId: "",
                 vnfName: csarVNF.name,
                 modelInfo: {
                     modelType: "vnf",
                     modelInvariantId: csarVNF.invariantUuid,
-                    modelVersionId: selectionVNF.modelVersionId,
+                    modelVersionId: csarVNF.uuid,
                     modelName: csarVNF.name,
                     modelVersion: csarVNF.version,
                     modelCustomizationName: csarVNF.modelCustomizationName,
@@ -145,12 +151,10 @@
                             instanceId: selectionVNF["service-instance-node"]["0"].properties['service-instance-id'],
                             modelInfo: {
                                 modelType: "service",
-                                modelInvariantId: selectionVNF["service-instance-node"]["0"].properties['model-invariant-id'],
-                                modelVersionId: selectionVNF.modelVersionId,
+                                modelInvariantId: sdcService.invariantUuid,
+                                modelVersionId: sdcService.uuid,
                                 modelName: sdcService.name,
-                                modelVersion: sdcService.version,
-                                modelCustomizationName: selectionVNF["service-instance-node"]["0"].properties['model-customization-name'], //TODO: Missing
-                                modelCustomizationId: selectionVNF["service-instance-node"]["0"].properties['model-customization-id']
+                                modelVersion: sdcService.version
                             }
                         }
                     }
@@ -613,13 +617,32 @@
         };
 
         vm.loadWorkFlows = function () {
-            changeManagementService.getWorkflows(vm.changeManagement.vnfNames)
-                .then(function(response) {
-                    vm.workflows = response.data.workflows;
-                })
-                .catch(function(error) {
-                    $log.error(error);
-                });
+          // Should be corrected when VID-397 will be closed. At the moment there is a need
+          // to merge local and remote workflows not to broke current functionality.
+            return vm.loadLocalWorkFlows()
+            .then(vm.loadRemoteWorkFlows)
+            .then(function () {
+                vm.workflows = vm.localWorkflows.concat(vm.remoteWorkflows.map(item => item.name));
+            });
+        };
+
+        vm.loadLocalWorkFlows = function () {
+          return changeManagementService.getWorkflows(vm.changeManagement.vnfNames)
+          .then(function (response) {
+            vm.localWorkflows = response.data.workflows || [];
+          }).catch(function (error) {
+            $log.error(error);
+          });
+        };
+
+        vm.loadRemoteWorkFlows = function () {
+          let vnfNames = vm.changeManagement.vnfNames.map(vnfName => vnfName.name);
+          return changeManagementService.getSOWorkflows(vnfNames)
+          .then(function (response) {
+            vm.remoteWorkflows = response.data || [];
+          }).catch(function (error) {
+            $log.error(error);
+          });
         };
 
         //Must be $scope because we bind to the onchange of the html (cannot attached to vm variable).