Yangman - bugfixing

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

diff --git a/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json b/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json
index 3f0f110bdda4d9499bea7c07c5d1247dca315e97..a1ae96b43adcb472cba93d4d6215ed8c6e81e0c5 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json
+++ b/modules/yangman-resources/src/main/resources/yangman/assets/data/locale-en_US.json
@@ -98,6 +98,8 @@
   "YANGMAN_LIST_PREV_ITEM": "show previous item",
   "YANGMAN_FILL_FORM_WITH_RECEIVED": "Fill form with received data after execution",
   "YANGMAN_LIST_NEXT_ITEM": "show next item",
+  "YANGMAN_SHOW_SENT_DATA": "show sent data",
+  "YANGMAN_SHOW_RECEIVED_DATA": "show received data",
   "YANGMAN_HISTORY_SETTINGS": "History requests settings",
   "YANGMAN_HISTORY_SETTINGS_GENERAL": "General settings",
   "YANGMAN_HISTORY_SETTINGS_COUNT": "History requests buffer size",

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 5907735196b6340eca089dd6fbab9cfd7499564c..7b0d995e6df2fd00f22352589031d6eab2d31c77 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
@@ -138,7 +138,7 @@ define([
         function changeDataType(){
             $scope.switchSection('rightPanelSection', requestHeader.selectedShownDataType);
 
-            if (!$scope.node || requestHeader.urlChanged) {
+            if ($scope.node || requestHeader.urlChanged) {
                 requestHeader.setRequestUrl();
                 requestHeader.urlChanged = false;
             }
@@ -595,6 +595,7 @@ define([
          */
         function executePluginFunctionality(customPlugin){
             requestHeader.selectedPlugin = customPlugin;
+            $scope.setSelectedPlugin(true);
             customPlugin.runCallback({ scope: $scope, controller: requestHeader });
         }
 
@@ -604,6 +605,7 @@ define([
         function unsetPluginFunctionality(){
             if ( requestHeader.selectedPlugin ) {
                 $scope.unsetPlugin(requestHeader);
+                $scope.setSelectedPlugin(false);
             }
 
             requestHeader.selectedPlugin = null;

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 fc34420aa3e368c03066bb7076eb70cac80a47b5..2118e8fe06cb3fe217ab648098fe22ed34791789 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
@@ -192,11 +192,12 @@ define([
         /**
          * Fill request form in right panel with request data
          * @param reqObj
+         * @param preventFillingWithReceived
          */
-        function showForm(reqObj) {
+        function showForm(reqObj, preventFillingWithReceived) {
             var data = reqObj.sentData;
 
-            if ($scope.historySettings.data.fillWithReceived) {
+            if ($scope.historySettings.data.fillWithReceived && !preventFillingWithReceived) {
                 data = reqObj.receivedData;
             }
 
@@ -251,7 +252,7 @@ define([
          */
         function executeRequest(reqObj) {
             if ($scope.rightPanelSection === constants.DISPLAY_TYPE_FORM) {
-                showForm(reqObj);
+                showForm(reqObj, true);
             }
             else {
                 showData(reqObj);
@@ -601,11 +602,13 @@ define([
          * @param requestObj
          */
         function selectRequest(event, requestObj){
+            console.debug('selected', requestObj);
+
             $scope.rootBroadcast(constants.YANGMAN_DESELECT_REQUESTS, { broadcastingCtrl: vm });
             vm.mainList.toggleReqSelection(!event.ctrlKey, requestObj);
             if (!event.ctrlKey){
                 if ($scope.rightPanelSection === constants.DISPLAY_TYPE_FORM) {
-                    vm.showForm(requestObj, true);
+                    vm.showForm(requestObj);
                 }
                 else {
                     vm.showData(requestObj, true);

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 71639808e26094b6e1da01ee10cc49afb143f7ff..d0ab09cf249edd6ac55444c35e587374c11de444 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
@@ -37,6 +37,7 @@ define([
 
         $scope.selectedModule = null;
         $scope.selectedDatastore = null;
+        $scope.selectedPlugin = false;
         $scope.apis = [];
         $scope.node = null;
         $scope.rightPanelSection = constants.DISPLAY_TYPE_REQ_DATA;
@@ -83,10 +84,16 @@ define([
         $scope.switchSection = switchSection;
         $scope.setParametersList = setParametersList;
         $scope.unsetPlugin = unsetPlugin;
+        $scope.setSelectedPlugin = setSelectedPlugin;
+
 
         init();
 
 
+        function setSelectedPlugin(selected) {
+            $scope.selectedPlugin = selected;
+        }
+
         /**
          * Start showing progressbar in request header view
          */
@@ -299,11 +306,32 @@ define([
          * @param clearPathArray
          */
         function setApi(api, subApi, setUrl, clearPathArray){
+            var oldSubApiPathArray = $scope.selectedSubApi ? angular.copy($scope.selectedSubApi.pathArray) : [];
             $scope.selectedApi = api;
             $scope.selectedSubApi = subApi;
 
             if ( clearPathArray ){
                 PathUtilsService.clearPath($scope.selectedSubApi.pathArray);
+
+                // todo: move to pathUtils service
+                $scope.selectedSubApi.pathArray.forEach(function (subApiPathElem) {
+                    oldSubApiPathArray.forEach(function (oldSubApiPathElem){
+                        if (oldSubApiPathElem.module === subApiPathElem.module && oldSubApiPathElem.name === subApiPathElem.name) {
+                            oldSubApiPathElem.identifiers.forEach(function (oldPathElemIdentifier, oldPathElemIdentifierKey){
+                                subApiPathElem.identifiers.forEach(function (pathElemIdentifier) {
+                                    if (oldPathElemIdentifier.label === pathElemIdentifier.label) {
+                                        pathElemIdentifier.value = oldPathElemIdentifier.value;
+                                        oldSubApiPathElem.identifiers.splice(oldPathElemIdentifierKey, 1);
+
+                                    }
+                                });
+                            });
+                        }
+                    });
+                });
+
+
+
             }
 
             $scope.$broadcast(constants.SET_SEL_OPERATIONS, subApi ? $scope.selectedSubApi.operations : [], setUrl);

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 5be603d013403015c53251342deaf7b8181ef6b4..8d6206b3f732353acc69a2389dd492d15a8d61af 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
@@ -129,6 +129,9 @@ define([], function () {
                             return {};
                         },
                         DEFAULT: function () {
+                            if (node) {
+                                node.clear();
+                            }
                             return rData;
                         },
                     };

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/index.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/index.tpl.html
index 8fea0ff6bc3ce40db50869c12846f8e02f588b6a..69baf049d289953b4f14e4f6fd9527f608f321e0 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/index.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/index.tpl.html
@@ -8,7 +8,7 @@
                  id="toggle-module-detail"
                  ng-click="main.toggleLeftPanel(); main.initModuleDetailHeight();"
                  ng-class="{'arrow-switcher__left' : main.leftPanelTab === 0}"
-                 ng-show="selectedDatastore"> play_arrow </md-icon>
+                 ng-show="selectedDatastore || selectedPlugin"> play_arrow </md-icon>
                  <!--ng-show="!main.selectedMainTab && selectedDatastore"> play_arrow </md-icon>-->
         <!-- content -->
         <md-tabs md-border-bottom md-selected="main.leftPanelTab" class="yangmanModule__left-panel__detail-list-tabs-container">

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
index ec6d1895920c2ffbc727c86d1cf26b5cfbf5af2f..ee8c283bf9f838418039be893be326b0d8220454 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
@@ -137,10 +137,19 @@
             </md-radio-button>
         </md-radio-group>
 
-        <md-checkbox class="mb0" flex layout-align="center end" ng-model="requestHeader.fillFormWithReceivedData" ng-disabled="requestHeader.selectedShownDataType==='req-data'">
+        <md-checkbox class="mb0" flex layout-align="center end" ng-model="requestHeader.fillFormWithReceivedData" ng-hide="requestHeader.selectedShownDataType==='req-data'">
             {{ 'YANGMAN_FILL_FORM_WITH_RECEIVED' | translate }}
         </md-checkbox>
 
+        <section layout="row" flex layout-align="center end" ng-show="requestHeader.selectedShownDataType==='req-data'">
+            <md-checkbox class="mb0" flex layout-align="center end" ng-model="main.jsonView.sent" >
+                {{ 'YANGMAN_SHOW_SENT_DATA' | translate }}
+            </md-checkbox>
+            <md-checkbox class="mb0" flex layout-align="center end" ng-model="main.jsonView.received">
+                {{ 'YANGMAN_SHOW_RECEIVED_DATA' | translate }}
+            </md-checkbox>
+        </section>
+
         <!-- Request info box -->
         <md-content flex="40"
                     layout="row"