Merge pull request #368 from mulesoft/develop

Render console if there are only warnings
mulesoft · Nov 24, 2016 · dfa1c1f · dfa1c1f
2 parents c15b4b1 + db55f3b
commit dfa1c1f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 10 deletions.
diff --git a/dist/scripts/api-console.js b/dist/scripts/api-console.js
@@ -1170,10 +1170,18 @@
         } else {
           return ramlParser.loadPath($window.resolveUrl(url), null, $scope.options)
             .then(function (api) {
-              if (api.errors.length <= 0) {
+              var success = true;
+              var issues = api.errors; // errors and warnings
+              if (issues && issues.length > 0) {
+                success = issues.filter(function (issue) {
+                    return !issue.isWarning;
+                  }).length === 0;
+              }
+
+              if (success) {
                 $scope.vm.raml = api.specification;
               } else {
-                $scope.vm.error = { message: 'Api contains errors.', errors : api.errors};
+                $scope.vm.error = { message: 'Api contains errors.', errors : issues};
               }
             })
             .finally(function () {
@@ -1669,11 +1677,19 @@
 
         return promise
           .then(function (api) {
-            if (api.errors.length <= 0) {
+            var success = true;
+            var issues = api.errors; // errors and warnings
+            if (issues && issues.length > 0) {
+              success = issues.filter(function (issue) {
+                  return !issue.isWarning;
+                }).length === 0;
+            }
+
+            if (success) {
               $scope.vm.raml = api.specification;
             } else {
               $scope.vm.error           = { message: 'Api contains errors.'};
-              $scope.vm.codeMirror.lint = lintFromError(api.errors);
+              $scope.vm.codeMirror.lint = lintFromError(issues);
             }
           })
           .finally(function () {
@@ -7104,7 +7120,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "            <span>{{ vm.error.message }}</span>\n" +
     "          </div>\n" +
     "          <div class=\"raml-console-error-pre\" ng-repeat=\"err in vm.error.errors\">\n" +
-    "            {{err.message}}\n" +
+    "            [{{err.isWarning && 'warning' || 'error'}}] {{err.message}}\n" +
     "          </div>\n" +
     "        </div>\n" +
     "      </section>\n" +

diff --git a/src/app/directives/raml-console-loader.js b/src/app/directives/raml-console-loader.js
@@ -45,10 +45,18 @@
         } else {
           return ramlParser.loadPath($window.resolveUrl(url), null, $scope.options)
             .then(function (api) {
-              if (api.errors.length <= 0) {
+              var success = true;
+              var issues = api.errors; // errors and warnings
+              if (issues && issues.length > 0) {
+                success = issues.filter(function (issue) {
+                    return !issue.isWarning;
+                  }).length === 0;
+              }
+
+              if (success) {
                 $scope.vm.raml = api.specification;
               } else {
-                $scope.vm.error = { message: 'Api contains errors.', errors : api.errors};
+                $scope.vm.error = { message: 'Api contains errors.', errors : issues};
               }
             })
             .finally(function () {

diff --git a/src/app/directives/raml-console-loader.tpl.html b/src/app/directives/raml-console-loader.tpl.html
@@ -17,7 +17,7 @@ <h4 class="raml-console-initializer-subhead">Error while parsing</h4>
             <span>{{ vm.error.message }}</span>
           </div>
           <div class="raml-console-error-pre" ng-repeat="err in vm.error.errors">
-            {{err.message}}
+            [{{err.isWarning && 'warning' || 'error'}}] {{err.message}}
           </div>
         </div>
       </section>

diff --git a/src/app/directives/raml-initializer.js b/src/app/directives/raml-initializer.js
@@ -76,11 +76,19 @@
 
         return promise
           .then(function (api) {
-            if (api.errors.length <= 0) {
+            var success = true;
+            var issues = api.errors; // errors and warnings
+            if (issues && issues.length > 0) {
+              success = issues.filter(function (issue) {
+                  return !issue.isWarning;
+                }).length === 0;
+            }
+
+            if (success) {
               $scope.vm.raml = api.specification;
             } else {
               $scope.vm.error           = { message: 'Api contains errors.'};
-              $scope.vm.codeMirror.lint = lintFromError(api.errors);
+              $scope.vm.codeMirror.lint = lintFromError(issues);
             }
           })
           .finally(function () {