Fix close resources

Author: Javier Centurión

dist/scripts/api-console.js

@@ -98,11 +98,11 @@
       restrict: 'E',
       templateUrl: 'directives/close-button.tpl.html',
       replace: true,
-      controller: function($scope) {
+      controller: function($scope, $rootScope) {
         $scope.close = function () {
           var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
 
-
+          $rootScope.$broadcast('resetData');
           $inactiveElements.removeClass('raml-console-is-active');
           $scope.showPanel = false;
           $scope.traits = null;
@@ -1136,8 +1136,10 @@
           $scope.currentProtocol             = $scope.raml.protocols[0];
           $scope.documentationSchemeSelected = defaultSchema;
           $scope.responseDetails             = null;
-          removeCustomSchemeData($scope.context.headers);
-          removeCustomSchemeData($scope.context.queryParameters);
+          // removeCustomSchemeData($scope.context.headers);
+          // removeCustomSchemeData($scope.context.queryParameters);
+          cleanSchemeMetadata($scope.methodInfo.headers.plain, $scope.context.headers);
+          cleanSchemeMetadata($scope.methodInfo.queryParameters, $scope.context.queryParameters);
         });
 
         $scope.cancelRequest = function () {
@@ -1246,18 +1248,8 @@
           }
         }
 
-        function removeCustomSchemeData(context) {
-          Object.keys(context.plain).map(function (key) {
-            var isFromSecurityScheme = context.plain[key].definitions[0].isFromSecurityScheme;
-
-            if (isFromSecurityScheme) {
-              delete context.plain[key];
-            }
-          });
-        }
-
         function updateContextData (type, scheme, collection, context) {
-          var details         = $scope.securitySchemes[scheme].describedBy || {};
+          var details         = jQuery.extend({}, $scope.securitySchemes[scheme].describedBy || {});
           var securityHeaders = details[type] || {};
 
           if (securityHeaders) {
@@ -1295,8 +1287,6 @@
           $scope.currentSchemeType = type;
           $scope.context.forceRequest = false;
 
-          readCustomSchemeInfo(name);
-
           cleanSchemeMetadata($scope.methodInfo.headers.plain, $scope.context.headers);
           cleanSchemeMetadata($scope.methodInfo.queryParameters, $scope.context.queryParameters);
 

src/app/directives/close-button.js

@@ -6,11 +6,11 @@
       restrict: 'E',
       templateUrl: 'directives/close-button.tpl.html',
       replace: true,
-      controller: function($scope) {
+      controller: function($scope, $rootScope) {
         $scope.close = function () {
           var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
 
-
+          $rootScope.$broadcast('resetData');
           $inactiveElements.removeClass('raml-console-is-active');
           $scope.showPanel = false;
           $scope.traits = null;

src/app/directives/sidebar.js

@@ -199,8 +199,10 @@
           $scope.currentProtocol             = $scope.raml.protocols[0];
           $scope.documentationSchemeSelected = defaultSchema;
           $scope.responseDetails             = null;
-          removeCustomSchemeData($scope.context.headers);
-          removeCustomSchemeData($scope.context.queryParameters);
+          // removeCustomSchemeData($scope.context.headers);
+          // removeCustomSchemeData($scope.context.queryParameters);
+          cleanSchemeMetadata($scope.methodInfo.headers.plain, $scope.context.headers);
+          cleanSchemeMetadata($scope.methodInfo.queryParameters, $scope.context.queryParameters);
         });
 
         $scope.cancelRequest = function () {
@@ -309,18 +311,8 @@
           }
         }
 
-        function removeCustomSchemeData(context) {
-          Object.keys(context.plain).map(function (key) {
-            var isFromSecurityScheme = context.plain[key].definitions[0].isFromSecurityScheme;
-
-            if (isFromSecurityScheme) {
-              delete context.plain[key];
-            }
-          });
-        }
-
         function updateContextData (type, scheme, collection, context) {
-          var details         = $scope.securitySchemes[scheme].describedBy || {};
+          var details         = jQuery.extend({}, $scope.securitySchemes[scheme].describedBy || {});
           var securityHeaders = details[type] || {};
 
           if (securityHeaders) {
@@ -358,8 +350,6 @@
           $scope.currentSchemeType = type;
           $scope.context.forceRequest = false;
 
-          readCustomSchemeInfo(name);
-
           cleanSchemeMetadata($scope.methodInfo.headers.plain, $scope.context.headers);
           cleanSchemeMetadata($scope.methodInfo.queryParameters, $scope.context.queryParameters);