Yangman - requests settings

[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 e26061164ecf7bd20110bfae6704d63512ab9570..fc34420aa3e368c03066bb7076eb70cac80a47b5 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
@@ -1,8 +1,9 @@
 define([
     'app/yangman/controllers/save-req-dialog.controller',
     'app/yangman/controllers/edit-collection-dialog.controller',
+    'app/yangman/controllers/history-settings.controller',
     'app/yangman/services/handle-file.services',
-], function (SaveReqDialogCtrl, EditCollectionDialogCtrl) {
+], function (SaveReqDialogCtrl, EditCollectionDialogCtrl, HistorySettingsCtrl) {
     'use strict';
 
     angular.module('app.yangman').controller('RequestsListCtrl', RequestsListCtrl);
@@ -28,24 +29,14 @@ define([
                               YangmanService, YangmanDesignService, constants) {
         var vm = this;
 
-        /**
-         * List of all collections containing requests, loads even for history controller to use collection names
-         * in saving requests dialog
-         * @type {*|CollectionList}
-         */
         vm.collectionList = null;
         vm.constants = constants;
 
-        /**
-         *
-         * @type {*|HistoryList}
-         */
         vm.requestList = null;
         vm.mainList = null;
         vm.collectionsSortAsc = true;
         vm.search = '';
 
-        // methods
         vm.clearCollectionList = clearCollectionList;
         vm.clearFilter = clearFilter;
         vm.clearHistoryList = clearHistoryList;
@@ -66,6 +57,7 @@ define([
         vm.showDgDeleteRequests = showDgDeleteRequests;
         vm.showDgEditCollection = showDgEditCollection;
         vm.showDgSaveReq = showDgSaveReq;
+        vm.showHistorySettings = showHistorySettings;
         vm.showForm = showForm;
         vm.toggleCollectionsSort = toggleCollectionsSort;
         vm.selectOnlyThisRequest = selectOnlyThisRequest;
@@ -143,7 +135,6 @@ define([
 
         /**
          * Clear value of input file used to import collection
-         * todo: move to design utils
          */
         function clearFileInputValue(){
             angular.element(document).find('#importCollection').val('');
@@ -151,7 +142,6 @@ define([
 
         /**
          * Importing collection from a file
-         * todo: error handling - msgs for user
          * @param $fileContent
          */
         function readCollectionFromFile($fileContent) {
@@ -206,8 +196,7 @@ define([
         function showForm(reqObj) {
             var data = reqObj.sentData;
 
-            // exception for get meth
-            if ( reqObj.method === constants.OPERATION_GET ) {
+            if ($scope.historySettings.data.fillWithReceived) {
                 data = reqObj.receivedData;
             }
 
@@ -236,14 +225,15 @@ define([
 
                     if ( $scope.node ) {
                         // prepare data for filling form
-                        data = $scope.node.type === constants.NODE_RPC ?
-                                YangmanService.prepareReceivedData(
-                                    $scope.node,
-                                    reqObj.method,
-                                    reqObj.receivedData,
-                                    reqObj.sentData,
-                                    constants.DISPLAY_TYPE_FORM
-                                ) : data;
+                        if ($scope.node.type === constants.NODE_RPC && $scope.historySettings.data.fillWithReceived) {
+                            data = YangmanService.prepareReceivedData(
+                                $scope.node,
+                                reqObj.method,
+                                reqObj.receivedData,
+                                reqObj.sentData,
+                                constants.DISPLAY_TYPE_FORM
+                            );
+                        }
 
                         // try to fill node
                         YangmanService.fillNodeFromResponse($scope.node, data);
@@ -458,6 +448,28 @@ define([
             }).then(saveRequests);
         }
 
+        /**
+         * Show popup window for history requests settings
+         * @param ev
+         */
+        function showHistorySettings(ev){
+
+            $mdDialog.show({
+                controller: HistorySettingsCtrl,
+                controllerAs: 'settingsCtrl',
+                templateUrl: $scope.globalViewPath + 'leftpanel/history-settings.tpl.html',
+                parent: angular.element('#yangmanModule'),
+                targetEvent: ev,
+                clickOutsideToClose: true,
+                locals: {
+                    settingsObj: $scope.historySettings,
+                },
+            }).then(function (changedSettings){
+                $scope.historySettings.setData(changedSettings.data);
+                $scope.rootBroadcast(constants.YANGMAN_RESET_HISTORY_SETTINGS);
+            });
+        }
+
         /**
          * Add each request from requests array to collectionList and save
          * @param requests
@@ -536,8 +548,11 @@ define([
             // collections are loaded for both history and collections tab
             loadCollectionsList();
 
-            vm.requestList = RequestsService.createEmptyHistoryList('yangman_requestsList');
+            vm.requestList = RequestsService.createEmptyHistoryList('yangman_requestsList', $scope.historySettings);
 
+            $scope.$on(constants.YANGMAN_RESET_HISTORY_SETTINGS, function () {
+                vm.requestList.setSettings($scope.historySettings);
+            });
 
             // if request was selected, deselect requests in all other instances of RequestsListCtrl
             $scope.$on(constants.YANGMAN_DESELECT_REQUESTS, function (event, params) {