Skip to content

Commit 8efa9cc

Browse files
author
Carolina Wright
committed
Bump parser to 1.1.19. Show error detaiols.
1 parent caefc42 commit 8efa9cc

File tree

7 files changed

+4668
-2392
lines changed

7 files changed

+4668
-2392
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"jszip": "~2.0.0",
2323
"marked": "~0.3.1",
2424
"raml-client-generator": "~0.0.7",
25-
"raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.14/raml-1-parser.zip",
25+
"raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.19/raml-1-parser.zip",
2626
"resolve-url": "~0.2.1",
2727
"slug": "~0.8.0",
2828
"velocity": "~1.1.0",

‎dist/scripts/api-console-vendor.js‎

Lines changed: 4420 additions & 2236 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/api-console.js‎

Lines changed: 119 additions & 73 deletions
Large diffs are not rendered by default.

‎src/app/directives/raml-console.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
controller: 'RamlConsoleController',
1111
scope: {
1212
raml: '=',
13+
errors: '=',
1314
options: '='
1415
}
1516
};

‎src/app/directives/raml-console.tpl.html‎

Lines changed: 122 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,35 @@
11
<div>
2-
<div class="raml-console-meta-button-group">
3-
<theme-switcher ng-if="!disableThemeSwitcher"></theme-switcher>
4-
<raml-client-generator ng-if="!disableRamlClientGenerator"></raml-client-generator>
2+
<div ng-if="errors">
3+
<h1 class="raml-console-title">RAML Console</h1>
4+
<header class="raml-console-initializer-row raml-console-initializer-subheader">
5+
<h4 class="raml-console-initializer-subhead">Error while parsing</h4>
6+
</header>
7+
8+
<div class="raml-console-initializer-row">
9+
<div class="raml-console-parser-error">
10+
<span>Api contains errors.</span>
11+
<a ng-hide="showErrorDetail == true" ng-click="showErrorDetail = false">(Show less)</a>
12+
<a ng-hide="!showErrorDetail" ng-click="showErrorDetail = true">(Show more)</a>
13+
</div>
14+
<div class="raml-console-error-pre" ng-repeat="err in errors" ng-show="showErrorDetail">
15+
[{{err.isWarning && 'warning' || 'error'}}] {{err.message}}
16+
</div>
17+
</div>
518
</div>
619

7-
<h1 ng-if="!disableTitle" class="raml-console-title">{{raml.title}}</h1>
20+
<div ng-if="!errors">
21+
<div class="raml-console-meta-button-group">
22+
<theme-switcher ng-if="!disableThemeSwitcher"></theme-switcher>
23+
<raml-client-generator ng-if="!disableRamlClientGenerator"></raml-client-generator>
24+
</div>
25+
26+
<h1 ng-if="!disableTitle" class="raml-console-title">{{raml.title}}</h1>
827

928

10-
<div ng-if="!disableDescription && !!raml.description && raml.description.length > 0" ng-init="actualSize = descriptionLimit" >
11-
<div class="raml-console-root-description" markdown="raml.description | limitTo : actualSize"></div>
12-
<span>
29+
<div ng-if="!disableDescription && !!raml.description && raml.description.length > 0"
30+
ng-init="actualSize = descriptionLimit">
31+
<div class="raml-console-root-description" markdown="raml.description | limitTo : actualSize"></div>
32+
<span>
1333
<a class="raml-console-show-more-less"
1434
ng-hide="raml.description.length <= descriptionLimit || raml.description.length > actualSize || raml.description.length < actualSize"
1535
ng-click="actualSize = descriptionLimit"
@@ -19,85 +39,113 @@ <h1 ng-if="!disableTitle" class="raml-console-title">{{raml.title}}</h1>
1939
ng-click="actualSize = raml.description.length"
2040
>show more</a>
2141
</span>
22-
</div>
23-
24-
<root-documentation></root-documentation>
25-
26-
<root-types types="types" ng-if="types"></root-types>
27-
28-
<ol ng-class="{'raml-console-resources-container-no-title': disableTitle, 'raml-console-resources-container': !disableTitle}" id="raml-console-resources-container" class="raml-console-resource-list raml-console-resource-list-root raml-console-resources-resourcesCollapsed">
29-
<li id="raml_documentation" class="raml-console-resource-list-item raml-console-documentation-header">
30-
<div ng-if="proxy" align="right" class="raml-console-resource-proxy">
31-
<label for="raml-console-api-behind-firewall">API is behind a firewall <a href="http://www.mulesoft.org/documentation/display/current/Accessing+Your+API+Behind+a+Firewall" target="_blank">(?)</a></label>
32-
<input id="raml-console-api-behind-firewall" type="checkbox" ng-model="disableProxy" ng-change="updateProxyConfig(disableProxy)">
33-
</div>
34-
<header class="raml-console-resource raml-console-resource-root raml-console-clearfix">
35-
<span ng-if="hasResourcesWithChilds()" class="raml-console-flag raml-console-resource-heading-flag raml-console-toggle-all" ng-click="collapseAll($event, resourceList, 'resourcesCollapsed')" ng-class="{'raml-console-resources-expanded':!resourcesCollapsed}">
42+
</div>
43+
44+
<root-documentation></root-documentation>
45+
46+
<root-types types="types" ng-if="types"></root-types>
47+
48+
<ol ng-class="{'raml-console-resources-container-no-title': disableTitle, 'raml-console-resources-container': !disableTitle}"
49+
id="raml-console-resources-container"
50+
class="raml-console-resource-list raml-console-resource-list-root raml-console-resources-resourcesCollapsed">
51+
<li id="raml_documentation" class="raml-console-resource-list-item raml-console-documentation-header">
52+
<div ng-if="proxy" align="right" class="raml-console-resource-proxy">
53+
<label for="raml-console-api-behind-firewall">API is behind a firewall <a
54+
href="http://www.mulesoft.org/documentation/display/current/Accessing+Your+API+Behind+a+Firewall"
55+
target="_blank">(?)</a></label>
56+
<input id="raml-console-api-behind-firewall" type="checkbox" ng-model="disableProxy"
57+
ng-change="updateProxyConfig(disableProxy)">
58+
</div>
59+
<header class="raml-console-resource raml-console-resource-root raml-console-clearfix">
60+
<span ng-if="hasResourcesWithChilds()"
61+
class="raml-console-flag raml-console-resource-heading-flag raml-console-toggle-all"
62+
ng-click="collapseAll($event, resourceList, 'resourcesCollapsed')"
63+
ng-class="{'raml-console-resources-expanded':!resourcesCollapsed}">
3664
<span ng-if="!resourcesCollapsed">collapse</span>
3765
<span ng-if="resourcesCollapsed">expand</span> all
3866
</span>
3967

40-
<div class="raml-console-resource-path-container">
41-
<h2 class="raml-console-resource-section-title">
42-
<span class="raml-console-resource-path-active">Resources</span>
43-
</h2>
44-
</div>
45-
<close-button></close-button>
46-
</header>
47-
</li>
48-
49-
<li id="{{generateId(resource.pathSegments)}}" class="raml-console-resource-list-item" ng-repeat="resourceGroup in inspectedRaml.resourceGroups">
50-
<header class="raml-console-resource raml-console-resource-root raml-console-clearfix" ng-class="{ 'raml-console-is-active':showPanel }" ng-init="resource = resourceGroup[0]">
51-
<div class="raml-console-resource-path-container" ng-init="index=$index" ng-class="{'raml-console-resource-with-description': resource.description}">
52-
<button class="raml-console-resource-root-toggle" ng-class="{'raml-console-is-active': resourceList[$index]}" ng-if="resourceGroup.length > 1" ng-click="toggle($event, index, resourceList, 'resourcesCollapsed')"></button>
53-
54-
<h2 class="raml-console-resource-heading raml-console-resource-heading-large">
55-
<a ng-if="resourceGroup.length > 1" class="raml-console-resource-path-active" ng-class="{'raml-console-resource-heading-hover':resourceGroup.length > 1}" ng-repeat='segment in resource.pathSegments' ng-click="toggle($event, index, resourceList, 'resourcesCollapsed')">{{segment.toString()}}</a>
56-
57-
<a ng-if="resourceGroup.length == 1" style="cursor: default;" class="raml-console-resource-path-active" ng-repeat='segment in resource.pathSegments'>{{segment.toString()}}</a>
58-
</h2>
59-
60-
<resource-type></resource-type>
61-
62-
<span ng-if="methodInfo.is" class="raml-console-flag raml-console-resource-heading-flag raml-console-resource-trait"><b>Traits:</b> {{readTraits(methodInfo.is)}}</span>
63-
64-
<span ng-hide="methodInfo.is" ng-if="resource.traits" class="raml-console-flag raml-console-resource-heading-flag"><b>Traits:</b> {{readResourceTraits(resource.traits)}}</span>
65-
66-
<span class="raml-console-resource-level-description raml-console-marked-content" markdown="resource.description"></span>
68+
<div class="raml-console-resource-path-container">
69+
<h2 class="raml-console-resource-section-title">
70+
<span class="raml-console-resource-path-active">Resources</span>
71+
</h2>
72+
</div>
73+
<close-button></close-button>
74+
</header>
75+
</li>
6776

68-
</div>
69-
<method-list></method-list>
70-
<close-button></close-button>
71-
</header>
77+
<li id="{{generateId(resource.pathSegments)}}" class="raml-console-resource-list-item"
78+
ng-repeat="resourceGroup in inspectedRaml.resourceGroups">
79+
<header class="raml-console-resource raml-console-resource-root raml-console-clearfix"
80+
ng-class="{ 'raml-console-is-active':showPanel }" ng-init="resource = resourceGroup[0]">
81+
<div class="raml-console-resource-path-container" ng-init="index=$index"
82+
ng-class="{'raml-console-resource-with-description': resource.description}">
83+
<button class="raml-console-resource-root-toggle"
84+
ng-class="{'raml-console-is-active': resourceList[$index]}" ng-if="resourceGroup.length > 1"
85+
ng-click="toggle($event, index, resourceList, 'resourcesCollapsed')"></button>
7286

73-
<resource-panel></resource-panel>
87+
<h2 class="raml-console-resource-heading raml-console-resource-heading-large">
88+
<a ng-if="resourceGroup.length > 1" class="raml-console-resource-path-active"
89+
ng-class="{'raml-console-resource-heading-hover':resourceGroup.length > 1}"
90+
ng-repeat='segment in resource.pathSegments'
91+
ng-click="toggle($event, index, resourceList, 'resourcesCollapsed')">{{segment.toString()}}</a>
7492

75-
<!-- Child Resources -->
76-
<ol class="raml-console-resource-list" ng-class="{'raml-console-is-collapsed': resourcesCollapsed}">
93+
<a ng-if="resourceGroup.length == 1" style="cursor: default;" class="raml-console-resource-path-active"
94+
ng-repeat='segment in resource.pathSegments'>{{segment.toString()}}</a>
95+
</h2>
7796

78-
<li id="{{generateId(resource.pathSegments)}}" class="raml-console-resource-list-item" ng-repeat="resource in resourceGroup" ng-if="!$first">
79-
<div class="raml-console-resource raml-console-clearfix" ng-class="{ 'raml-console-is-active':showPanel }">
80-
<div class="raml-console-resource-path-container" ng-class="{'raml-console-resource-with-description': resource.description}">
81-
<h3 class="raml-console-resource-heading" style="cursor: default;">
82-
<span ng-repeat-start='segment in resource.pathSegments' ng-if="!$last">{{segment.toString()}}</span><span ng-repeat-end ng-if="$last" class="raml-console-resource-path-active">{{segment.toString()}}</span>
83-
</h3>
97+
<resource-type></resource-type>
8498

85-
<resource-type></resource-type>
86-
<span ng-if="methodInfo.is" class="raml-console-flag raml-console-resource-heading-flag raml-console-resource-trait"><b>Traits:</b> {{readTraits(methodInfo.is)}}</span>
99+
<span ng-if="methodInfo.is"
100+
class="raml-console-flag raml-console-resource-heading-flag raml-console-resource-trait"><b>Traits:</b> {{readTraits(methodInfo.is)}}</span>
87101

88-
<span ng-hide="methodInfo.is" ng-if="resource.traits" class="raml-console-flag raml-console-resource-heading-flag"><b>Traits:</b> {{readResourceTraits(resource.traits)}}</span>
102+
<span ng-hide="methodInfo.is" ng-if="resource.traits"
103+
class="raml-console-flag raml-console-resource-heading-flag"><b>Traits:</b> {{readResourceTraits(resource.traits)}}</span>
89104

90-
<span class="raml-console-resource-level-description raml-console-marked-content" markdown="resource.description"></span>
91-
</div>
105+
<span class="raml-console-resource-level-description raml-console-marked-content"
106+
markdown="resource.description"></span>
92107

93-
<method-list></method-list>
94-
<close-button></close-button>
95108
</div>
109+
<method-list></method-list>
110+
<close-button></close-button>
111+
</header>
112+
113+
<resource-panel></resource-panel>
114+
115+
<!-- Child Resources -->
116+
<ol class="raml-console-resource-list" ng-class="{'raml-console-is-collapsed': resourcesCollapsed}">
117+
118+
<li id="{{generateId(resource.pathSegments)}}" class="raml-console-resource-list-item"
119+
ng-repeat="resource in resourceGroup" ng-if="!$first">
120+
<div class="raml-console-resource raml-console-clearfix" ng-class="{ 'raml-console-is-active':showPanel }">
121+
<div class="raml-console-resource-path-container"
122+
ng-class="{'raml-console-resource-with-description': resource.description}">
123+
<h3 class="raml-console-resource-heading" style="cursor: default;">
124+
<span ng-repeat-start='segment in resource.pathSegments'
125+
ng-if="!$last">{{segment.toString()}}</span><span ng-repeat-end ng-if="$last"
126+
class="raml-console-resource-path-active">{{segment.toString()}}</span>
127+
</h3>
128+
129+
<resource-type></resource-type>
130+
<span ng-if="methodInfo.is"
131+
class="raml-console-flag raml-console-resource-heading-flag raml-console-resource-trait"><b>Traits:</b> {{readTraits(methodInfo.is)}}</span>
132+
133+
<span ng-hide="methodInfo.is" ng-if="resource.traits"
134+
class="raml-console-flag raml-console-resource-heading-flag"><b>Traits:</b> {{readResourceTraits(resource.traits)}}</span>
135+
136+
<span class="raml-console-resource-level-description raml-console-marked-content"
137+
markdown="resource.description"></span>
138+
</div>
139+
140+
<method-list></method-list>
141+
<close-button></close-button>
142+
</div>
96143

97-
<resource-panel></resource-panel>
98-
</li>
99-
</ol>
144+
<resource-panel></resource-panel>
145+
</li>
146+
</ol>
100147

101-
</li>
102-
</ol>
103-
</div>
148+
</li>
149+
</ol>
150+
</div>
151+
</div>

‎src/app/directives/raml-initializer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
if (success) {
8888
$scope.vm.raml = api.specification;
8989
} else {
90-
$scope.vm.error = { message: 'Api contains errors.'};
90+
$scope.vm.error = { message: 'Api contains errors.', errors: issues};
9191
$scope.vm.codeMirror.lint = lintFromError(issues);
9292
}
9393
})

‎src/app/directives/raml-initializer.tpl.html‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="raml-console-initializer-container raml-console-initializer-primary">
2-
<div ng-if="!vm.isLoading && !vm.raml">
2+
<div ng-if="!vm.isLoading && !vm.raml && !vm.error">
33
<h1 class="raml-console-title">RAML Console</h1>
44

55
<div class="raml-console-initializer-content-wrapper">
@@ -10,12 +10,9 @@ <h4 class="raml-console-initializer-subhead">Initialize from the URL of a RAML f
1010

1111
<div class="raml-console-initializer-row">
1212
<form novalidate ng-submit="vm.loadFromUrl(vm.ramlUrl)">
13-
<p class="raml-console-initializer-input-container" ng-class="{'raml-console-initializer-input-container-error': vm.isLoadedFromUrl && vm.error}">
13+
<p class="raml-console-initializer-input-container">
1414
<input id="ramlPath" autofocus class="raml-console-initializer-input raml-console-initializer-raml-field" ng-model="vm.ramlUrl">
1515
</p>
16-
<div class="raml-console-parser-error" ng-if="vm.isLoadedFromUrl && vm.error">
17-
<span>{{ vm.error.message }}</span>
18-
</div>
1916
<div class="raml-console-initializer-action-group" align="right">
2017
<button id="loadRamlFromUrl" class="raml-console-initializer-action raml-console-initializer-action-btn" type="submit">Load from URL</button>
2118
</div>
@@ -29,7 +26,7 @@ <h4 class="raml-console-initializer-subhead">or parse RAML in here</h4>
2926
</header>
3027

3128
<div class="raml-console-initializer-row">
32-
<p class="raml-console-initializer-input-container" ng-class="{'raml-console-initializer-input-container-error': !vm.isLoadedFromUrl && vm.error}">
29+
<p class="raml-console-initializer-input-container">
3330
<textarea id="raml" ui-codemirror="vm.codeMirror" ng-model="vm.ramlString"></textarea>
3431
</p>
3532
<div class="raml-console-initializer-action-group" align="right">
@@ -40,7 +37,7 @@ <h4 class="raml-console-initializer-subhead">or parse RAML in here</h4>
4037
</div>
4138
</div>
4239

43-
<raml-console ng-if="vm.raml" raml="vm.raml"></raml-console>
40+
<raml-console ng-if="vm.raml || vm.error" errors="vm.error.errors" raml="vm.raml"></raml-console>
4441

4542
<raml-console-spinner ng-if="vm.isLoading"></raml-console-spinner>
4643
</div>

0 commit comments

Comments
 (0)