fixed New Flow and New Entity buttons

- New Flow and New Entity buttons now work
- cleaned up on New Flow and New Entity modal implementation

Author: gmarintes

quick-start/src/main/resources/static/app/services/dataHubService.js

@@ -123,9 +123,6 @@
         self.status = status;
         self.displayMessage('New entity is created successfully.', 'success', 'notification', false);
       })
-      .error(function (error) {
-        self.displayMessage(error.message, 'error', 'entityModalMessage', true);
-      });
     }
 
     function displayEntity(entityName) {
@@ -168,13 +165,9 @@
       .success(function (selectedEntity) {
         self.status.selectedEntity = selectedEntity;
         self.displayMessage('New flow is created successfully.', 'success', 'notification', false);
-      })
-      .error(function (error) {
-        self.displayMessage(error.message, 'error', 'flowModalMessage', true);
       });
     }
 
-
     function displayMessage(message,messageType,elementId,isModal) {
       if(typeof elementId === 'undefined') {
         elementId = 'messageDiv';

quick-start/src/main/resources/static/app/services/modalService.js

@@ -4,12 +4,16 @@
 
   angular.module('dhib.quickstart.service.modal', ['ui.bootstrap'])
     .service('ModalService', ModalService)
-    .controller('loadDataModalController', LoadDataModalController);
+    .controller('loadDataModalController', LoadDataModalController)
+    .controller('entityModalController', EntityModalController)
+    .controller('flowModalController', FlowModalController);
 
   function ModalService($uibModal) {
     var self = this;
     angular.extend(self, {
       openLoadDataModal: openLoadDataModal
+      ,openEntityModal: openEntityModal
+      ,openFlowModal: openFlowModal
     });
 
     function openLoadDataModal() {
@@ -24,6 +28,43 @@
 
       return modalInstance.result;
     }
+    
+    function openEntityModal() {
+      var modalInstance = $uibModal.open({
+        animation : true,
+        templateUrl : 'top/modal/entityModal.html',
+        controller : 'entityModalController',
+        size : 'md',
+        backdrop : 'static',
+        keyboard : true
+      });
+
+      return modalInstance.result;
+    }
+    
+    function openFlowModal(entityName, flowType, extension) {
+      var modalInstance = $uibModal.open({
+        animation : true,
+        templateUrl : 'top/modal/flowModal.html',
+        controller : 'flowModalController',
+        size : 'sm',
+        backdrop : 'static',
+        keyboard : true,
+        resolve : {
+          'entityName' : function () {
+            return entityName;
+          }
+          ,'flowType' : function () {
+            return flowType;
+          }
+          ,'extension' : function () {
+            return extension;
+          }
+        }
+      });
+      
+      return modalInstance.result;
+    }
   }
 
   function LoadDataModalController($scope, $uibModalInstance) {
@@ -43,5 +84,63 @@
       $uibModalInstance.dismiss();
     };
   }
+  
+  function EntityModalController($scope, $uibModalInstance, DataHub) {
+    $scope.entityForm = {};
+    $scope.errorMessage =null;
+    $scope.hasError = false;
+    
+    $scope.ok = function () {
+      DataHub.saveEntity($scope.entityForm)
+      .success(function () {
+        $scope.hasError = false;
+        
+        $uibModalInstance.close($scope.entityForm);
+      })
+      .error(function (error) {
+        $scope.hasError = true;
+        $scope.errorMessage = error.message;
+      })
+      .finally(function () {
+        $scope.loading = false;
+      });
+    };
+
+    $scope.cancel = function () {
+      $uibModalInstance.dismiss();
+    };
+  }
+  
+  function FlowModalController($scope, $uibModalInstance, DataHub, entityName, flowType, extension) {
+    $scope.flowForm = {
+        'entityName' : entityName
+        ,'flowType' : flowType
+        ,'extension' : extension
+    };
+    $scope.errorMessage =null;
+    $scope.hasError = false;
+    
+    $scope.ok = function () {
+      $scope.loading = true;
+      
+      DataHub.saveFlow($scope.flowForm)
+      .success(function () {
+        $scope.hasError = false;
+        
+        $uibModalInstance.close($scope.flowForm);
+      })
+      .error(function (error) {
+        $scope.hasError = true;
+        $scope.errorMessage = error.message;
+      })
+      .finally(function () {
+        $scope.loading = false;
+      });
+    };
+
+    $scope.cancel = function () {
+      $uibModalInstance.dismiss();
+    };
+  }
 
 })();

quick-start/src/main/resources/static/index.html

@@ -13,7 +13,7 @@
     <script src="lib/angular.js/js/angular.js"></script>
     <script src="lib/angular.js/js/angular-route.js"></script>
     <script src="lib/angular.js/js/angular-animate.js"></script>
-    <script src="lib/angular.js/js/ui-bootstrap-tpls-1.1.2.js"></script>
+    <script src="lib/angular.js/js/ui-bootstrap-tpls-1.2.4.js"></script>
     <script src="lib/angular.js/js/angular-aria.min.js"></script>
     <script src="lib/angular.js/js/angular-material.min.js"></script>