Yangman - cleaned code

[dlux.git] / modules / yangman-resources / src / main / resources / yangman / controllers / requests-list.controller.js

diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js
index 6f36731890b047e82a3849dd77944f91f83416e0..62a35f891961f1126a63fff73e1352e5382911ff 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js
+++ b/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js
@@ -9,7 +9,7 @@ define([
 
     RequestsListCtrl.$inject = [
         '$filter', '$mdDialog', '$scope', 'YMHandleFileService', 'PathUtilsService', 'RequestsService', 'YangmanService',
-        'YangmanDesignService',
+        'YangmanDesignService', 'constants',
     ];
 
     /**
@@ -25,7 +25,7 @@ define([
      * @constructor
      */
     function RequestsListCtrl($filter, $mdDialog, $scope, YMHandleFileService, PathUtilsService, RequestsService,
-                              YangmanService, YangmanDesignService) {
+                              YangmanService, YangmanDesignService, constants) {
         var vm = this;
 
         /**
@@ -34,6 +34,7 @@ define([
          * @type {*|CollectionList}
          */
         vm.collectionList = null;
+        vm.constants = constants;
 
         /**
          *
@@ -71,9 +72,6 @@ define([
         vm.deselectAllRequests = deselectAllRequests;
         vm.filterCollReq = filterCollReq;
 
-
-
-
         /**
          * Save request obje to collection from other controller
          * @param reqObj
@@ -176,6 +174,11 @@ define([
             else {
                 clearFileInputValue();
             }
+            removeButtonBackground();
+
+            function removeButtonBackground() {
+                $('#importCollection').next().css({ 'background': 'transparent' });
+            }
         }
 
         function toggleCollectionsSort() {
@@ -206,7 +209,7 @@ define([
             var data = reqObj.sentData;
 
             // exception for get meth
-            if ( reqObj.method === 'GET' ) {
+            if ( reqObj.method === constants.OPERATION_GET ) {
                 data = reqObj.receivedData;
             }
 
@@ -222,7 +225,7 @@ define([
 
             $scope.rootBroadcast('YANGMAN_FILL_NODE_FROM_REQ', { requestUrl: reqObj.path, requestData: data },
                 function (){
-                    $scope.setRightPanelSection('form');
+                    $scope.setRightPanelSection(constants.DISPLAY_TYPE_FORM);
                     $scope.rootBroadcast('YANGMAN_HEADER_INIT', {
                         path: reqObj.path,
                         method: reqObj.method,
@@ -235,13 +238,13 @@ define([
 
                     if ( $scope.node ) {
                         // prepare data for filling form
-                        data = $scope.node.type === 'rpc' ?
+                        data = $scope.node.type === constants.NODE_RPC ?
                                 YangmanService.prepareReceivedData(
                                     $scope.node,
                                     reqObj.method,
                                     reqObj.receivedData,
                                     reqObj.sentData,
-                                    'form'
+                                    constants.DISPLAY_TYPE_FORM
                                 ) : data;
 
                         // try to fill node
@@ -288,8 +291,8 @@ define([
                 );
             }
 
-            $scope.setRightPanelSection('req-data');
-            $scope.setJsonView(true, reqObj.method !== 'GET');
+            $scope.setRightPanelSection(constants.DISPLAY_TYPE_REQ_DATA);
+            $scope.setJsonView(true, reqObj.method !== constants.OPERATION_GET);
 
             $scope.rootBroadcast('YANGMAN_HEADER_INIT', headerObj);
             $scope.rootBroadcast('YANGMAN_FILL_NODE_FROM_REQ', { requestUrl: reqObj.path });
@@ -540,7 +543,10 @@ define([
                 }
             });
 
-            $scope.$on('YANGMAN_REFRESH_COLLECTIONS', loadCollectionsList);
+            $scope.$on('YANGMAN_REFRESH_COLLECTIONS', function (event, params){
+                loadCollectionsList();
+                (params.cbk || angular.noop)();
+            });
 
             // list type dependend operations
             if (mainList === 'history') {
@@ -559,14 +565,14 @@ define([
                 // saving from request header
                 $scope.$on('YANGMAN_SAVE_REQUEST_TO_COLLECTION', saveRequestFromExt);
                 // saving collections expanded status on refresh
-                $scope.$on('YANGMAN_REFRESH_AND_EXPAND_COLLECTIONS', function(event, params){
-                    $scope.rootBroadcast('YANGMAN_REFRESH_COLLECTIONS');
-                    (params.cbk || angular.noop)();
+                $scope.$on('YANGMAN_REFRESH_AND_EXPAND_COLLECTIONS', function(){
+                    var expandedColNames = vm.collectionList.getExpandedCollectionNames();
+                    $scope.rootBroadcast('YANGMAN_REFRESH_COLLECTIONS', {}, function (){
+                        vm.collectionList.expandCollectionByNames(expandedColNames);
+                    });
                 });
             }
 
-
-
         }
 
 
@@ -625,10 +631,7 @@ define([
          * Refresh and expand collections
          */
         function refreshCollectionsWithExpansion(){
-            var expandedCollNames = vm.collectionList.getExpandedCollectionNames();
-            $scope.rootBroadcast('YANGMAN_REFRESH_AND_EXPAND_COLLECTIONS', null, function (){
-                vm.collectionList.expandCollectionByNames(expandedCollNames);
-            });
+            $scope.rootBroadcast('YANGMAN_REFRESH_AND_EXPAND_COLLECTIONS');
         }
 
     }