Merge pull request #95 from kedashoe/x-nullable

support "x-nullable" property
Redocly · Aug 31, 2016 · 3d3bcbe · 3d3bcbe
2 parents 22eff03 + 027cdc1
commit 3d3bcbe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/demo/swagger.yaml b/demo/swagger.yaml
@@ -819,6 +819,7 @@ definitions:
         type: string
         pattern: "^\\+(?:[0-9]-?){6,14}[0-9]$"
         example: +1-202-555-0192
+        x-nullable: true
       userStatus:
         description: User status
         type: integer

diff --git a/lib/components/JsonSchema/_json-schema-common.scss b/lib/components/JsonSchema/_json-schema-common.scss
@@ -63,6 +63,14 @@ $sub-schema-offset: ($bullet-size / 2) + $bullet-margin;
   font-weight: bold;
 }
 
+.param-nullable {
+  vertical-align: middle;
+  line-height: $param-name-height;
+  color: #3195a6;
+  font-size: 12px;
+  font-weight: bold;
+}
+
 .param-type {
   vertical-align: middle;
   line-height: $param-name-height;

diff --git a/lib/components/JsonSchema/json-schema.html b/lib/components/JsonSchema/json-schema.html
@@ -70,6 +70,7 @@
               <span class="param-range" *ngIf="prop._range"> {{prop._range}} </span>
               </span>
               <span *ngIf="prop._required" class="param-required">Required</span>
+              <span *ngIf="prop._nullable" class="param-nullable">Nullable</span>
               <div *ngIf="prop.default">Default: {{prop.default | json}}</div>
               <div *ngIf="prop.enum && !prop.isDiscriminator" class="param-enum">
                 <span *ngFor="let enumItem of prop.enum" class="enum-value {{enumItem.type}}"> {{enumItem.val | json}} </span>

diff --git a/lib/services/schema-helper.service.ts b/lib/services/schema-helper.service.ts
@@ -229,6 +229,7 @@ export class SchemaHelper {
         propertySchema._pointer = null;
       }
       propertySchema._required = !!requiredMap[propName];
+      propertySchema._nullable = !!propertySchema['x-nullable'];
       propertySchema.isDiscriminator = (schema.discriminator === propName);
       return propertySchema;
     });