Merge branch 'master' into releases

lib/components/JsonSchema/json-schema.js

@@ -59,8 +59,8 @@ export default class JsonSchema extends BaseComponent {
     this.pointer = schema._pointer || this.pointer;
 
     this.requiredMap = {};
-    if (this.schema.required) {
-      this.schema.required.forEach(prop => this.requiredMap[prop] = true);
+    if (this.componentSchema.required) {
+      this.componentSchema.required.forEach(prop => this.requiredMap[prop] = true);
     }
 
     if (!schema.properties) {
@@ -108,15 +108,18 @@ export default class JsonSchema extends BaseComponent {
       propData.format = itemFormat;
       propData._isArray = true;
       propData.type = 'array ' + propData.items.type;
-    }
-
-    if (propData.type === 'object') {
+    } else if (propData.type === 'object') {
       propData._displayType = propData.title || 'object';
-    }
-
-    if (!propData.type) {
+    } else if (!propData.type) {
       propData._displayType = '< * >';
       propData._displayTypeHint = 'This field may contain data of any type';
+    } else {
+      // here we are sure that property has simple type
+      // delete pointer for simple types to not show it as subschema
+      if (propData._pointer) {
+        propData._pointer = undefined;
+        propData._displayType = propData.title ? `${propData.title} (${propData.type})` : propData.type;
+      }
     }
 
     if (propData.format) propData._displayFormat = `<${propData.format}>`;

lib/components/Method/method.html

@@ -1,7 +1,7 @@
 <div class="method">
   <div class="method-content">
     <h2 class="method-header sharable-header">
-      <a class="share-link" href="#{{data.methodAnchor}}"></a>{{data.methodInfo.summary}}
+      <a class="share-link" href="#{{data.methodAnchor | encodeURIComponent }}"></a>{{data.methodInfo.summary}}
     </h2>
     <h3 class="method-endpoint">
       <span class="http-method" [ngClass]="data.httpMethod">{{data.httpMethod}}</span>

lib/components/Method/method.js

@@ -8,13 +8,15 @@ import ResponsesList from '../ResponsesList/responses-list';
 import ResponsesSamples from '../ResponsesSamples/responses-samples';
 import SchemaSample from '../SchemaSample/schema-sample';
 import RequestSamples from '../RequestSamples/request-samples';
+import {EncodeURIComponentPipe} from '../../utils/pipes';
 
 @RedocComponent({
   selector: 'method',
   templateUrl: './lib/components/Method/method.html',
   styleUrls: ['./lib/components/Method/method.css'],
   directives: [ParamsList, ResponsesList, ResponsesSamples, SchemaSample, RequestSamples],
-  inputs: ['tag']
+  inputs: ['tag'],
+  pipes: [EncodeURIComponentPipe]
 })
 export default class Method extends BaseComponent {
   constructor(schemaMgr) {

lib/components/MethodsList/methods-list.html

@@ -1,7 +1,7 @@
 <div class="methods">
   <div class="tag" *ngFor="#tag of data.tags">
     <div class="tag-info" [attr.tag]="tag.name">
-      <h1 class="sharable-header"> <a class="share-link" href="#tag/{{tag.name}}"></a>{{tag.name}} </h1>
+      <h1 class="sharable-header"> <a class="share-link" href="#tag/{{tag.name | encodeURIComponent}}"></a>{{tag.name}} </h1>
       <p *ngIf="tag.description" innerHtml="{{ tag.description | marked }}"> </p>
     </div>
     <method *ngFor="#method of tag.methods" [pointer]="method.pointer" [attr.pointer]="method.pointer"

lib/components/MethodsList/methods-list.js

@@ -2,12 +2,14 @@
 
 import {RedocComponent, BaseComponent} from '../base';
 import Method from '../Method/method';
+import {EncodeURIComponentPipe} from '../../utils/pipes';
 
 @RedocComponent({
   selector: 'methods-list',
   templateUrl: './lib/components/MethodsList/methods-list.html',
   styleUrls: ['./lib/components/MethodsList/methods-list.css'],
-  directives: [Method]
+  directives: [Method],
+  pipes: [EncodeURIComponentPipe]
 })
 export default class MethodsList extends BaseComponent {
 

lib/components/ParamsList/params-list.js

@@ -26,6 +26,7 @@ export default class ParamsList extends BaseComponent {
 
     paramsList = paramsList.map((paramData) => {
       let propPointer = paramData._pointer;
+      if (paramData.in === 'body') return paramData;
       return JsonSchema.injectPropData(paramData, paramData.name, propPointer);
     });
 
@@ -35,7 +36,7 @@ export default class ParamsList extends BaseComponent {
       let bodyParam = paramsMap.body[0];
       bodyParam.pointer = bodyParam._pointer;
       this.data.bodyParam = bodyParam;
-      delete paramsMap.body;
+      paramsMap.body = undefined;
     }
 
     this.data.noParams = !(Object.keys(paramsMap).length || this.data.bodyParam);

lib/components/SideMenu/side-menu.js

@@ -62,7 +62,7 @@ export default class SideMenu extends BaseComponent {
     let $el;
     hash = hash.substr(1);
     let namespace = hash.split('/')[0];
-    let ptr = hash.substr(namespace.length + 1);
+    let ptr = decodeURIComponent(hash.substr(namespace.length + 1));
     if (namespace === 'operation') {
       $el = this.getMethodElByOperId(ptr);
     } else if (namespace === 'tag') {

lib/utils/pipes.js

@@ -118,3 +118,14 @@ export class PrismPipe {
     return Prism.highlight(value, grammar);
   }
 }
+
+@Pipe({ name: 'encodeURIComponent' })
+export class EncodeURIComponentPipe {
+  transform(value) {
+    if (isBlank(value)) return value;
+    if (!isString(value)) {
+      throw new InvalidPipeArgumentException(EncodeURIComponentPipe, value);
+    }
+    return encodeURIComponent(value);
+  }
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "redoc",
   "description": "Swagger-generated API Reference Documentation",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "repository": {
     "type": "git",
     "url": "git://github.com/Rebilly/ReDoc"