Merge "Rework deploy/undeploy UI"

[clamp.git] / src / main / resources / META-INF / resources / designer / scripts / app.js

diff --git a/src/main/resources/META-INF/resources/designer/scripts/app.js b/src/main/resources/META-INF/resources/designer/scripts/app.js
index 59a27bd..1b77bf8 100644 (file)
--- a/src/main/resources/META-INF/resources/designer/scripts/app.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/app.js
@@ -580,9 +580,8 @@ function($scope, $rootScope, $timeout, dialogs) {
                    var svgXml = $("#svgContainer").html();
                    console.log("refreStatus modelName=" + modelName);
                    cldsModelService.getModel(modelName).then(function(pars) {
-
                            console.log("refreStatus: pars=" + pars);
-                           cldsModelService.processRefresh(pars);
+                           cldsModelService.processRefresh();
                    }, function(data) {
 
                    });
@@ -629,40 +628,10 @@ function($scope, $rootScope, $timeout, dialogs) {
                    });
            };
            function cldsToggleDeploy(uiAction) {
-
-                   var modelName = selected_model;
-                   var controlNamePrefix = "ClosedLoop-";
-                   var bpmnText = modelXML;
-                   // serialize model properties
-                   var propText = JSON.stringify(elementMap);
-                   var templateName = selected_template;
-                   var svgXml = $("#svgContainer").html();
                    console.log("cldsPerformAction: " + uiAction + " modelName="
-                   + modelName);
-                   console.log("cldsPerformAction: " + uiAction
-                   + " controlNamePrefix=" + controlNamePrefix);
-                   console.log("cldsPerformAction: " + uiAction + " bpmnText="
-                   + bpmnText);
-                   console.log("cldsPerformAction: " + uiAction + " propText="
-                   + propText);
-                   console.log("cldsPerformAction: " + uiAction
-                   + " modelEventService=" + modelEventService);
-                   console.log("cldsPerformAction: " + uiAction + " typeID=" + typeID);
-                   console.log("cldsPerformAction: " + uiAction + " deploymentId="
-                   + deploymentId);
-                   cldsModelService.toggleDeploy(uiAction, modelName,
-                   controlNamePrefix, bpmnText, propText, svgXml, templateName,
-                   typeID, controlNameUuid, modelEventService, deploymentId).then(
+                       + selected_model);
+                   cldsModelService.toggleDeploy(uiAction, selected_model).then(
                    function(pars) {
-
-                           var cldsObject = pars.body;
-                           typeID = cldsObject.typeId;
-                           controlNameUuid = cldsObject.controlNameUuid;
-                           selected_template = cldsObject.templateName;
-                           modelEventService = cldsObject.event;
-                           actionStateCd = cldsObject.event.actionStateCd;
-                           deploymentId = cldsObject.deploymentId;
-                           cldsModelService.processActionResponse(modelName, cldsObject);
                    }, function(data) {
 
                    });
@@ -678,7 +647,7 @@ function($scope, $rootScope, $timeout, dialogs) {
 
                    var dlg = dialogs.create(
                    'partials/portfolios/PolicyWindow_properties.html',
-                   'ImportSchemaCtrl', {
+                   'operationalPolicyCtrl', {
                        closable : true,
                        draggable : true
                    }, {
@@ -768,18 +737,7 @@ app.run([ '$route', function($route) {
 
        $route.reload();
 } ]);
-function TestCtrl($scope) {
 
-       $scope.msg = "Hello from a controller method.";
-       $scope.returnHello = function() {
-
-               return $scope.msg;
-       }
-}
-function importshema() {
-
-       angular.element(document.getElementById('navbar')).scope().importSchema();
-}
 function F5Window() {
 
        angular.element(document.getElementById('navbar')).scope().F5Window();
@@ -790,7 +748,7 @@ function GOCWindow() {
 }
 function ToscaModelWindow() {
     angular.element(document.getElementById('navbar')).scope().ToscaModelWindow();
-};
+}
 function PolicyWindow(PolicyWin) {
 
        angular.element(document.getElementById('navbar')).scope().PolicyWindow(
@@ -806,23 +764,11 @@ function setdefaultvalue() {
        angular.element(document.getElementById('navbar')).scope()
        .setDefaultValue();
 }
-function upgradeSchemaVersion() {
-
-       angular.element(document.getElementById('navbar')).scope()
-       .upgradeSchemaVersion();
-}
 function saveProject() {
 
        angular.element(document.getElementById('navbar')).scope().saveProject();
 }
-function modifySchema() {
-
-       angular.element(document.getElementById('navbar')).scope().modifySchema();
-}
-function definePID() {
 
-       angular.element(document.getElementById('navbar')).scope().definePID();
-}
 function defineServiceAcronym() {
 
        angular.element(document.getElementById('navbar')).scope()