Skip to content

Commit 3f5a25d

Browse files
author
Javier Isoldi
committed
Properties directive changed to support security schema properties. #308.
1 parent 9cd9ca0 commit 3f5a25d

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

dist/scripts/api-console.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -743,15 +743,16 @@
743743
isNestedProperty: '=',
744744
hideTypeLinks: '=',
745745
hidePropertyDetails: '=',
746-
showExamples: '='
746+
showExamples: '=',
747+
showSecuritySchemaProperties: '='
747748
},
748749
controller: function ($scope, $rootScope) {
749750
if (!Array.isArray($scope.list)) {
750751
$scope.listArray = Object.keys($scope.list).map(function (key) {
751752
return $scope.list[key];
752753
});
753754

754-
$scope.listArray = RAML.Inspector.Properties.normalizeNamedParameters($scope.list);
755+
$scope.listArray = RAML.Inspector.Properties.normalizeNamedParameters($scope.listArray);
755756
} else {
756757
$scope.listArray = $scope.list;
757758
}
@@ -6517,12 +6518,12 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
65176518
"\n" +
65186519
" <section class=\"raml-console-resource-section raml-console-scheme-headers\" ng-if=\"documentationSchemeSelected.describedBy.headers\">\n" +
65196520
" <h4 class=\"raml-console-resource-heading-a\">Headers</h4>\n" +
6520-
" <properties list=\"documentationSchemeSelected.describedBy.headers\" show-examples=\"true\"></properties>\n" +
6521+
" <properties list=\"documentationSchemeSelected.describedBy.headers\" show-security-schema-properties=\"true\" show-examples=\"true\"></properties>\n" +
65216522
" </section>\n" +
65226523
"\n" +
65236524
" <section class=\"raml-console-resource-section raml-console-scheme-query-parameters\" ng-if=\"documentationSchemeSelected.describedBy.queryParameters\">\n" +
65246525
" <h4 class=\"raml-console-resource-heading-a\">Query Parameters</h4>\n" +
6525-
" <properties list=\"documentationSchemeSelected.describedBy.queryParameters\" show-examples=\"true\"></properties>\n" +
6526+
" <properties list=\"documentationSchemeSelected.describedBy.queryParameters\" show-security-schema-properties=\"true\" show-examples=\"true\"></properties>\n" +
65266527
" </section>\n" +
65276528
"\n" +
65286529
" <section class=\"raml-console-resource-section raml-console-scheme-responses\" ng-if=\"documentationSchemeSelected.describedBy.responses\">\n" +
@@ -6722,7 +6723,9 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
67226723

67236724
$templateCache.put('directives/properties.tpl.html',
67246725
"<div>\n" +
6725-
" <div class=\"raml-console-resource-param\" ng-repeat=\"property in listArray\" ng-if=\"!property[0].isFromSecurityScheme && !isPattern(property[0].displayName)\" ng-init=\"vm.isCollapsed = !!collapsible\">\n" +
6726+
" <div class=\"raml-console-resource-param\" ng-repeat=\"property in listArray\"\n" +
6727+
" ng-if=\"(showSecuritySchemaProperties || !property[0].isFromSecurityScheme) && !isPattern(property[0].displayName)\"\n" +
6728+
" ng-init=\"vm.isCollapsed = !!collapsible\">\n" +
67266729
" <div ng-init=\"type = getType(property[0])\">\n" +
67276730
" <h4 class=\"raml-console-resource-param-heading\" style=\"position: relative\">\n" +
67286731
" <span ng-if=\"isCollapsible(type)\" ng-click=\"vm.isCollapsed = !vm.isCollapsed\" style=\"cursor: pointer\">{{ vm.isCollapsed ? '▶' : '▼' }}</span>&nbsp;{{type.displayName}}\n" +

src/app/directives/documentation.tpl.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ <h3 class="raml-console-resource-heading-a">Security Schemes</h3>
4040

4141
<section class="raml-console-resource-section raml-console-scheme-headers" ng-if="documentationSchemeSelected.describedBy.headers">
4242
<h4 class="raml-console-resource-heading-a">Headers</h4>
43-
<properties list="documentationSchemeSelected.describedBy.headers" show-examples="true"></properties>
43+
<properties list="documentationSchemeSelected.describedBy.headers" show-security-schema-properties="true" show-examples="true"></properties>
4444
</section>
4545

4646
<section class="raml-console-resource-section raml-console-scheme-query-parameters" ng-if="documentationSchemeSelected.describedBy.queryParameters">
4747
<h4 class="raml-console-resource-heading-a">Query Parameters</h4>
48-
<properties list="documentationSchemeSelected.describedBy.queryParameters" show-examples="true"></properties>
48+
<properties list="documentationSchemeSelected.describedBy.queryParameters" show-security-schema-properties="true" show-examples="true"></properties>
4949
</section>
5050

5151
<section class="raml-console-resource-section raml-console-scheme-responses" ng-if="documentationSchemeSelected.describedBy.responses">

src/app/directives/properties.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
isNestedProperty: '=',
1515
hideTypeLinks: '=',
1616
hidePropertyDetails: '=',
17-
showExamples: '='
17+
showExamples: '=',
18+
showSecuritySchemaProperties: '='
1819
},
1920
controller: function ($scope, $rootScope) {
2021
if (!Array.isArray($scope.list)) {
2122
$scope.listArray = Object.keys($scope.list).map(function (key) {
2223
return $scope.list[key];
2324
});
2425

25-
$scope.listArray = RAML.Inspector.Properties.normalizeNamedParameters($scope.list);
26+
$scope.listArray = RAML.Inspector.Properties.normalizeNamedParameters($scope.listArray);
2627
} else {
2728
$scope.listArray = $scope.list;
2829
}

src/app/directives/properties.tpl.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<div>
2-
<div class="raml-console-resource-param" ng-repeat="property in listArray" ng-if="!property[0].isFromSecurityScheme && !isPattern(property[0].displayName)" ng-init="vm.isCollapsed = !!collapsible">
2+
<div class="raml-console-resource-param" ng-repeat="property in listArray"
3+
ng-if="(showSecuritySchemaProperties || !property[0].isFromSecurityScheme) && !isPattern(property[0].displayName)"
4+
ng-init="vm.isCollapsed = !!collapsible">
35
<div ng-init="type = getType(property[0])">
46
<h4 class="raml-console-resource-param-heading" style="position: relative">
57
<span ng-if="isCollapsible(type)" ng-click="vm.isCollapsed = !vm.isCollapsed" style="cursor: pointer">{{ vm.isCollapsed ? '▶' : '▼' }}</span>&nbsp;{{type.displayName}}

0 commit comments

Comments
 (0)