Yangman - fix delete operation

- do not remove request content when performing delete operation

Change-Id: Ib7a3bb1ed81d76ae766be0a6c7c439937d6355a3
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 f6e593a0a0ff3b214df3bd23f1894686138c164f..79ea725c381e15b43d2e83096dc52a22303aae55 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
@@ -286,6 +286,12 @@ define([
             });
         }
 
+        /**
+         * Try to set current (depending on url) selectedApi and selectedSubApi to $scope if it exists in api tree data
+         * @param url
+         * @param cbk
+         * @param fill
+         */
         function setApiByUrl(url, cbk, fill){
             $scope.rootBroadcast(constants.YANGMAN_GET_API_TREE_DATA, null, function (treeApis) {
                 var apisIndexes =
@@ -352,18 +358,28 @@ define([
                 requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_FORM && $scope.selectedSubApi ?
                     !PathUtilsService.checkEmptyIdentifiers($scope.selectedSubApi.pathArray) : true;
 
+
             if ( allowExecuteOperation ) {
 
                 showRequestProgress();
-                setRequestUrl(requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_REQ_DATA ? requestHeader.requestUrl : null);
                 $scope.rootBroadcast(constants.YANGMAN_SET_ERROR_MESSAGE, '');
 
-                if ( requestHeader.selectedShownDataType !== constants.DISPLAY_TYPE_FORM ){
+                setRequestUrl(
+                    requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_REQ_DATA ?
+                        requestHeader.requestUrl :
+                        null
+                );
+                if ( requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_REQ_DATA ){
                     setApiByUrl(requestHeader.requestUrl, null, true);
                 }
 
-                var historyReq = RequestService.createHistoryRequest(null, null, requestHeader.requestUrl,
-                    requestHeader.selectedOperation, '', '', '');
+                var historyReq = RequestService.createHistoryRequest(
+                    null,
+                    null,
+                    requestHeader.requestUrl,
+                    requestHeader.selectedOperation,
+                    '', '', ''
+                );
 
                 YangmanService.executeRequestOperation(
                     $scope.selectedApi,
@@ -391,6 +407,7 @@ define([
              * @param response
              */
             function executeReqSuccCbk(reqInfo, response) {
+
                 var preparedReceivedData = YangmanService.prepareReceivedData(
                     $scope.node,
                     requestHeader.selectedOperation,
@@ -412,7 +429,7 @@ define([
                     sendRequestData(reqInfo.requestSrcData || {}, 'SENT');
                 } else {
 
-                    if ($scope.node){
+                    if ($scope.node && requestHeader.selectedOperation !== constants.OPERATION_DELETE){
 
                         YangmanService.fillNodeFromResponse($scope.node, preparedReceivedData);
                         YangmanService.handleNodeIdentifier(
@@ -444,7 +461,6 @@ define([
 
                 (executeCbk || angular.noop)(historyReq);
 
-
             }
 
             /**

diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js
index 907b6e3393a16ec4b27f380a9c073c13f3ebc274..571b1a517eb7b17850301f1fb4c667055ed3eb92 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js
+++ b/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js
@@ -231,6 +231,7 @@ define([
         /**
          * Set global necessary params
          * @param apis
+         * @param augmentations
          */
         function setGlobalParams(apis, augmentations){
             $scope.apis = apis;

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 6ff2979c2585d44027c325581301d9901ab525e4..5be603d013403015c53251342deaf7b8181ef6b4 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
@@ -225,8 +225,19 @@ define([], function () {
          * @param requestUrl
          * @param requestData
          * @param params
-         * @returns {{customRestangular: null, headers: {}, operation: string, reqString: string, reqHeaders: {},
-         *          reqData: {}}}
+         * @returns {
+         *   {
+         *     customRestangular: null,
+         *     headers: {},
+         *     operation: string,
+         *     reqString: string,
+         *     reqHeaders: {},
+         *     reqData: string,
+         *     srcData: string,
+         *     reqFullUrl:
+         *     string
+         *    }
+         *   }
          */
         function prepareAllRequestData(selectedApi, selectedSubApi, operation, node, dataType, requestUrl, requestData,
                                        params) {
@@ -246,7 +257,7 @@ define([], function () {
             setParametrizedData(allPreparedData, params, selSubApiCopy, requestUrl);
 
             // prepare req data
-            if (operation === constants.OPERATION_GET || operation === constants.OPERATION_DELETE){
+            if (operation === constants.OPERATION_GET){
                 allPreparedData.srcData = null;
                 allPreparedData.reqData = null;
             }
@@ -309,9 +320,9 @@ define([], function () {
 
             YangUtilsRestangularService.setFullResponse(true);
 
-            // prepare all necessary data
-            var allPreparedData = prepareAllRequestData(selectedApi, selectedSubApi, operation, node, dataType,
-                requestUrl, requestData, params);
+            var allPreparedData = prepareAllRequestData(
+                selectedApi, selectedSubApi, operation, node, dataType, requestUrl, requestData, params
+            );
 
             // executing operation
             allPreparedData.customRestangular.customOperation(