Merge pull request #512 from mulesoft/3.x.x/develop

3.x.x/develop

Author: carowright

bower.json

@@ -22,7 +22,7 @@
     "jszip": "~2.0.0",
     "marked": "~0.3.1",
     "raml-client-generator": "~0.0.7",
-    "raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.26/raml-1-parser.zip",
+    "raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.29/raml-1-parser.zip",
     "resolve-url": "~0.2.1",
     "slug": "~0.8.0",
     "velocity": "~1.1.0",

dist/scripts/api-console-vendor.js

@@ -1411,6 +1411,11 @@
           }
         }
 
+        $scope.getNativeType = function(type) {
+          var paramType = getParamType(type).type;
+          return Array.isArray(paramType) ? paramType[0] : paramType;
+        };
+
         $scope.isEnum = function (definition) {
           var paramType = getParamType(definition);
           return paramType.hasOwnProperty('enum');
@@ -7850,7 +7855,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "    <a class=\"raml-console-sidebar-override\" ng-if=\"canOverride(param)\" ng-click=\"overrideField($event, param)\">Override</a>\n" +
     "    <span class=\"raml-console-side-bar-required-field\" ng-if=\"param.required\">*</span>\n" +
     "    <label ng-if=\"param.isFromSecurityScheme\" class=\"raml-console-sidebar-security-label\">from security scheme</label>\n" +
-    "    <span class=\"raml-console-resource-param-instructional\">{{toString(param.type)}}</span>\n" +
+    "    <span class=\"raml-console-resource-param-instructional\">{{getNativeType(param)}}</span>\n" +
     "  </label>\n" +
     "\n" +
     "  <div ng-if=\"!param.properties && !isArray(param)\">\n" +

dist/scripts/api-console.js

@@ -1,6 +1,6 @@
 {
   "name": "api-console",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "Api-Console for RAML based app",
   "files": [
     "dist",

package.json

@@ -27,6 +27,11 @@
           }
         }
 
+        $scope.getNativeType = function(type) {
+          var paramType = getParamType(type).type;
+          return Array.isArray(paramType) ? paramType[0] : paramType;
+        };
+
         $scope.isEnum = function (definition) {
           var paramType = getParamType(definition);
           return paramType.hasOwnProperty('enum');

src/app/directives/raml-field.js

@@ -4,7 +4,7 @@
     <a class="raml-console-sidebar-override" ng-if="canOverride(param)" ng-click="overrideField($event, param)">Override</a>
     <span class="raml-console-side-bar-required-field" ng-if="param.required">*</span>
     <label ng-if="param.isFromSecurityScheme" class="raml-console-sidebar-security-label">from security scheme</label>
-    <span class="raml-console-resource-param-instructional">{{toString(param.type)}}</span>
+    <span class="raml-console-resource-param-instructional">{{getNativeType(param)}}</span>
   </label>
 
   <div ng-if="!param.properties && !isArray(param)">

src/app/directives/raml-field.tpl.html

@@ -297,7 +297,7 @@ module.exports = function() {
       resourcePo.toggleResourceMethod(2, 0);
 
       //Assert
-      assert.ifDisplayingProperties(2, ['one', 'two'], ['userPicture', 'userName']);
+      assert.ifDisplayingProperties(2, ['one', 'two'], ['file', 'string']);
       assert.ifDisplayingDocumentationBodyProperties(2, ['one', 'two'], ['userPicture', 'userName']);
       assert.ifDisplayingPropertyExample(2, 'two', 'blah');
     });