Yangman - fix history requests date, apply params to api

Change-Id: I4ab5a5cb90cc1efc3193287da3ef7381afd294c3
Signed-off-by: Stanislav Jamrich <sjamrich@cisco.com>

diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js
index 40a05c5eb9e8045d8164d6d1e1c0298aa537fc21..18fdb2cdcd99e3a2769582d0c535dd598840cb97 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js
+++ b/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js
@@ -6,12 +6,12 @@ define([
     angular.module('app.yangman').controller('RequestHeaderCtrl', RequestHeaderCtrl);
 
     RequestHeaderCtrl.$inject = [
-        '$mdDialog', '$mdToast', '$scope', '$rootScope', 'ENV', 'YangmanService', 'ParametersService', 'PathUtilsService',
-        'RequestsService', '$filter', 'DataBackupService',
+        '$mdDialog', '$mdToast', '$scope', '$rootScope', 'ENV', 'YangmanService', 'ParametersService',
+        'PathUtilsService', 'RequestsService', '$filter', 'DataBackupService',
     ];
 
-    function RequestHeaderCtrl($mdDialog, $mdToast, $scope, $rootScope, ENV, YangmanService, ParametersService, PathUtilsService,
-                               RequestService, $filter, DataBackupService) {
+    function RequestHeaderCtrl($mdDialog, $mdToast, $scope, $rootScope, ENV, YangmanService, ParametersService,
+                               PathUtilsService, RequestService, $filter, DataBackupService) {
         var requestHeader = this;
 
         requestHeader.allOperations = ['GET', 'POST', 'PUT', 'DELETE'];
@@ -358,7 +358,10 @@ define([
 
                         $scope.node.expanded = true;
                         $scope.rootBroadcast('YANGMAN_DISABLE_ADDING_LIST_ELEMENT');
-                        sendRequestData(YangmanService.checkRpcReceivedData(preparedReceivedData, $scope.node), 'RECEIVED');
+                        sendRequestData(
+                            YangmanService.checkRpcReceivedData(preparedReceivedData, $scope.node),
+                            'RECEIVED'
+                        );
                     }
                 }
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js b/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js
index 3c694fde295f63dc50aa544ce489d50b8829ffab..88eed08b09798e8ec0fc8739a68e241226bab16f 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js
+++ b/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js
@@ -13,7 +13,8 @@ define([
 
         var service = {};
 
-        service.applyParams = applyParams;
+        service.applyParamsToObj = applyParamsToObj;
+        service.applyParamsToStr = applyParamsToStr;
         service.createEmptyCollectionList = createEmptyCollectionList;
         service.createEmptyHistoryList = createEmptyHistoryList;
         service.createHistoryRequestFromElement = createHistoryRequestFromElement;
@@ -83,18 +84,30 @@ define([
         /**
          * Replace all parameters with its values
          * @param paramsObj
-         * @param requestData
+             * @param str
          * @returns {*}
          */
-        function applyParams(paramsObj, data) {
-            var dataStr = JSON.stringify(data);
-
+        function applyParamsToStr(paramsObj, str) {
             if (paramsObj && paramsObj.hasOwnProperty('list')) {
                 paramsObj.list.forEach(function (param){
-                    dataStr = service.replaceStringInText(dataStr, '<<' + param.name + '>>', param.value);
+                    str = service.replaceStringInText(str, '<<' + param.name + '>>', param.value);
                 });
             }
 
+            return str;
+        }
+
+        /**
+         * Replace all parameters with its values
+         * @param paramsObj
+         * @param requestData
+         * @returns {*}
+         */
+        function applyParamsToObj(paramsObj, data) {
+            var dataStr = JSON.stringify(data);
+
+            dataStr = service.applyParamsToStr(paramsObj, dataStr);
+
             return ParsingJsonService.parseJson(dataStr);
         }
 
@@ -131,6 +144,8 @@ define([
             // var receivedDataProcessed = status === 'success' ? receivedData : null,
             var result = new HistoryRequestModel(PathUtilsService, YangUtilsService, ParsingJsonService);
 
+            timestamp = timestamp || Date.now();
+
             result.setData(sentData, receivedData, status, path, operation, name, collection, timestamp,
                 responseStatus, responseStatusText, responseTime);
 
@@ -143,7 +158,7 @@ define([
          * @returns {*}
          */
         function createHistoryRequestFromElement(elem) {
-                if (!elem.hasOwnProperty('timestamp') || elem.timestamp === ''){
+            if (!elem.hasOwnProperty('timestamp') || elem.timestamp === ''){
                 elem.timestamp = Date.now();
             }
 

diff --git a/modules/yangman-resources/src/main/resources/yangman/services/yangman.services.js b/modules/yangman-resources/src/main/resources/yangman/services/yangman.services.js
index d50adce64bc1d9a956c714ec24241a9ce41cf953..fc9ebc981fd49781c3b04532420f6d00c30aa0f2 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/services/yangman.services.js
+++ b/modules/yangman-resources/src/main/resources/yangman/services/yangman.services.js
@@ -161,7 +161,10 @@ define([], function () {
                 customRestangular: null,
                 headers: {},
                 operation: '',
-                reqString: selectedSubApi ? selectedSubApi.buildApiRequestString() : '',
+                reqString:
+                    selectedSubApi ?
+                        RequestsService.applyParamsToStr(params, selectedSubApi.buildApiRequestString()) :
+                        '',
                 reqHeaders: {},
                 reqData: '',
                 srcData: '',
@@ -175,7 +178,8 @@ define([], function () {
                 allPreparedData.srcData = requestData;
             }
 
-            allPreparedData.reqData = RequestsService.applyParams(params, allPreparedData.srcData);
+            allPreparedData.reqData = RequestsService.applyParamsToObj(params, allPreparedData.srcData);
+
 
             // prepare req data
             if (operation === 'GET' || operation === 'DELETE'){
@@ -192,6 +196,7 @@ define([], function () {
 
             // set correct host into restangular based on shown data type and prepare data
             if ( dataType === 'req-data' ){
+                requestUrl = RequestsService.applyParamsToStr(params, requestUrl);
                 var parser = locationHelper(requestUrl, ['pathname', 'origin']),
                     raParam = '';