New Optimization Policy

[policy/engine.git] / POLICY-SDK-APP / src / main / webapp / app / policyApp / controller / dictionaryController / MSModelsDictController.js

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
index 2e30523..3165b1b 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -37,7 +37,7 @@ app.controller('editMSModelController' ,  function ($scope, $modalInstance, mess
 
     $scope.uploadFile = function(files) {
        var extn = files[0].name.substr(files[0].name.lastIndexOf('.')+1);
-       if(extn == 'zip' || extn == 'xmi'){
+       if(extn == 'zip' || extn == 'xmi'||  extn == 'yml'){
                valid = true;
                var fd = new FormData();
                fd.append("file", files[0]);
@@ -46,11 +46,18 @@ app.controller('editMSModelController' ,  function ($scope, $modalInstance, mess
                        headers: {'Content-Type': undefined },
                        transformRequest: angular.identity
                }).success(function(data){
+                       if(data.errorMsg != undefined){
+                               Notification.error(data.errorMsg);
+                               valid = false;
+                               return;
+                       }                       
                 if(data.classListDatas  == "EMPTY"){
                        Notification.error("No Micro Services Avaialble.")
                 }else{      
                        $scope.classListDatas=data.classListDatas;
                        $scope.modalDatas = data.modelDatas;
+                       $scope.modelType= data.modelType;
+                       $scope.dataOrderInfo= data.dataOrderInfo;
                        console.log($scope.classListDatas);
                 }
             }).error( );
@@ -64,7 +71,7 @@ app.controller('editMSModelController' ,  function ($scope, $modalInstance, mess
     $scope.saveMSModel = function(microServiceModelsDictionaryData) {
        if(valid){
                 var uuu = "saveDictionary/ms_dictionary/save_model";
-               var postData={microServiceModelsDictionaryData: microServiceModelsDictionaryData, userid: userid, classMap: $scope.modalDatas};
+               var postData={microServiceModelsDictionaryData: microServiceModelsDictionaryData, userid: userid, classMap: $scope.modalDatas,modelType:$scope.modelType, dataOrderInfo:$scope.dataOrderInfo};
                $.ajax({
                    type : 'POST',
                    url : uuu,