-
+
diff --git a/lib/components/JsonSchema/json-schema.js b/lib/components/JsonSchema/json-schema.js
index d40a34f9..8ab92146 100644
--- a/lib/components/JsonSchema/json-schema.js
+++ b/lib/components/JsonSchema/json-schema.js
@@ -89,7 +89,7 @@ export default class JsonSchema extends BaseComponent {
}
let discriminatorFieldIdx = -1;
- let props = Object.keys(schema.properties).map((prop, idx) => {
+ let props = schema.properties && Object.keys(schema.properties).map((prop, idx) => {
let propertySchema = schema.properties[prop];
let propPointer = propertySchema._pointer ||
JsonPointer.join(schema._pointer || this.pointer, ['properties', prop]);
@@ -105,6 +105,15 @@ export default class JsonSchema extends BaseComponent {
}
return propertySchema;
});
+
+ props = props || [];
+
+ if (schema.additionalProperties && schema.additionalProperties !== false) {
+ let propsSchema = this.prepareAdditionalProperties(schema.additionalProperties);
+ propsSchema._additional = true;
+ props.push(propsSchema);
+ }
+
// Move discriminator field to the end of properties list
if (discriminatorFieldIdx > -1) {
let discrProp = props.splice(discriminatorFieldIdx, 1);
@@ -116,6 +125,11 @@ export default class JsonSchema extends BaseComponent {
schema.properties = props;
}
+ prepareAdditionalProperties(schema) {
+ return JsonSchema.injectPropertyData(schema, ' *',
+ JsonPointer.join(schema._pointer || this.pointer, ['additionalProperties']));
+ }
+
static injectPropertyData(propertySchema, propertyName, propPointer) {
propertySchema = Object.assign({}, propertySchema);
@@ -190,7 +204,8 @@ const injectors = {
simpleType: {
check: (propertySchema) => {
if (propertySchema.type === 'object') {
- return !propertySchema.properties || !Object.keys(propertySchema.properties).length;
+ return (!propertySchema.properties || !Object.keys(propertySchema.properties).length)
+ && (typeof propertySchema.additionalProperties !== 'object');
}
return (propertySchema.type !== 'array') && propertySchema.type;
},
diff --git a/lib/components/JsonSchema/json-schema.scss b/lib/components/JsonSchema/json-schema.scss
index a24d883f..ef7d29a8 100644
--- a/lib/components/JsonSchema/json-schema.scss
+++ b/lib/components/JsonSchema/json-schema.scss
@@ -73,6 +73,10 @@ json-schema[nesteven="true"] {
border-bottom: 0;
}
+.param.additional > .param-name {
+ color: rgba($black, 0.4);
+}
+
.params-wrap {
border-collapse: collapse;
width: 100%;
diff --git a/lib/components/Method/method.html b/lib/components/Method/method.html
index 66bb8814..f3453aff 100644
--- a/lib/components/Method/method.html
+++ b/lib/components/Method/method.html
@@ -4,7 +4,7 @@
{{data.methodInfo.summary}}
diff --git a/lib/components/Method/method.spec.js b/lib/components/Method/method.spec.js
index 792b959e..89d5ad1b 100644
--- a/lib/components/Method/method.spec.js
+++ b/lib/components/Method/method.spec.js
@@ -6,7 +6,8 @@ import {BrowserDomAdapter} from 'angular2/platform/browser';
import {
TestComponentBuilder,
- injectAsync,
+ async,
+ inject,
beforeEach,
beforeEachProviders,
it
@@ -25,10 +26,10 @@ describe('Redoc components', () => {
provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
provide(OptionsManager, {useClass: OptionsManager})
]);
- beforeEach(injectAsync([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
+ beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
builder = tcb;
- return schemaMgr.load('/tests/schemas/extended-petstore.yml').then(() => null, (err) => { throw err; });
- }));
+ return schemaMgr.load('/tests/schemas/extended-petstore.yml');
+ })));
beforeEach((done) => {
builder.createAsync(TestApp).then(fixture => {
component = getChildDebugElement(fixture.debugElement, 'method').componentInstance;
diff --git a/lib/components/MethodsList/methods-list.html b/lib/components/MethodsList/methods-list.html
index 86a00c90..e8f134cf 100644
--- a/lib/components/MethodsList/methods-list.html
+++ b/lib/components/MethodsList/methods-list.html
@@ -1,10 +1,10 @@
-
diff --git a/lib/components/MethodsList/methods-list.spec.js b/lib/components/MethodsList/methods-list.spec.js
index ce12b4c8..22cba67b 100644
--- a/lib/components/MethodsList/methods-list.spec.js
+++ b/lib/components/MethodsList/methods-list.spec.js
@@ -7,7 +7,8 @@ import {BrowserDomAdapter} from 'angular2/platform/browser';
import {
TestComponentBuilder,
- injectAsync,
+ inject,
+ async,
beforeEach,
beforeEachProviders,
it
@@ -26,10 +27,10 @@ describe('Redoc components', () => {
provide(OptionsManager, {useClass: OptionsManager}),
provide(BrowserDomAdapter, {useClass: BrowserDomAdapter})
]);
- beforeEach(injectAsync([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
+ beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
builder = tcb;
- return schemaMgr.load('/tests/schemas/methods-list-component.json').then(() => null, (err) => { throw err; });
- }));
+ return schemaMgr.load('/tests/schemas/methods-list-component.json');
+ })));
beforeEach((done) => {
builder.createAsync(TestApp).then(_fixture => {
fixture = _fixture;
diff --git a/lib/components/ParamsList/params-list.html b/lib/components/ParamsList/params-list.html
index bdffe020..fa673090 100644
--- a/lib/components/ParamsList/params-list.html
+++ b/lib/components/ParamsList/params-list.html
@@ -1,12 +1,12 @@
-
+
{{paramType.place}} Parameters
?
-
+
{{param.name}}
@@ -16,7 +16,7 @@
title="{{param._displayTypeHint}}"> {{param._displayType}} {{param._displayFormat}}
Required
- {{enumItem.val | json}}
+ {{enumItem.val | json}}
diff --git a/lib/components/Redoc/redoc.js b/lib/components/Redoc/redoc.js
index e1bceb4b..3858d92e 100644
--- a/lib/components/Redoc/redoc.js
+++ b/lib/components/Redoc/redoc.js
@@ -66,7 +66,7 @@ export default class Redoc extends BaseComponent {
];
if (Redoc.appRef) {
- Redoc.dispose();
+ Redoc.destroy();
}
Redoc.showLoadingAnimation();
return SchemaManager.instance().load(specUrl)
@@ -102,7 +102,7 @@ export default class Redoc extends BaseComponent {
}
}
- static dispose() {
+ static destroy() {
let el = dom.query('redoc');
let elClone;
let parent;
@@ -115,10 +115,10 @@ export default class Redoc extends BaseComponent {
elClone = el.cloneNode(false);
if (Redoc.appRef) {
- Redoc.appRef.dispose();
+ Redoc.appRef.destroy();
Redoc.appRef = null;
- // Redoc dispose removes host element, so need to restore it
+ // Redoc destroy removes host element, so need to restore it
elClone.innerHTML = 'Loading...';
parent && parent.insertBefore(elClone, nextSibling);
}
diff --git a/lib/components/Redoc/redoc.spec.js b/lib/components/Redoc/redoc.spec.js
index fd7b1462..b6bcaac6 100644
--- a/lib/components/Redoc/redoc.spec.js
+++ b/lib/components/Redoc/redoc.spec.js
@@ -6,7 +6,8 @@ import {BrowserDomAdapter} from 'angular2/platform/browser';
import {
TestComponentBuilder,
- injectAsync,
+ inject,
+ async,
beforeEach,
beforeEachProviders,
it
@@ -26,10 +27,10 @@ describe('Redoc components', () => {
provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
provide(OptionsManager, {useValue: optsMgr})
]);
- beforeEach(injectAsync([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
+ beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
builder = tcb;
- return schemaMgr.load('/tests/schemas/extended-petstore.yml').then(() => null, (err) => { throw err; });
- }));
+ return schemaMgr.load('/tests/schemas/extended-petstore.yml');
+ })));
it('should init component', (done) => {
@@ -141,29 +142,29 @@ describe('Redoc components', () => {
});
});
- describe('Redoc dispose', () => {
+ describe('Redoc destroy', () => {
let builder;
let fixture;
let element;
- let disposeSpy;
+ let destroySpy;
let dom = new BrowserDomAdapter();
beforeEachProviders(() => [
provide(SchemaManager, {useValue: new SchemaManager()}),
provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
provide(OptionsManager, {useValue: optsMgr})
]);
- beforeEach(injectAsync([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
+ beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
builder = tcb;
- return schemaMgr.load('/tests/schemas/methods-list-component.json').then(() => null, (err) => { throw err; });
- }));
+ return schemaMgr.load('/tests/schemas/methods-list-component.json');
+ })));
beforeEach((done) => {
builder.createAsync(TestApp).then(_fixture => {
fixture = _fixture;
element = getChildDebugElement(fixture.debugElement, 'methods-list').nativeElement;
- disposeSpy = jasmine.createSpy('spy');
+ destroySpy = jasmine.createSpy('spy');
Redoc.appRef = {
- dispose: disposeSpy
+ destroy: destroySpy
};
fixture.detectChanges();
done();
@@ -175,20 +176,20 @@ describe('Redoc components', () => {
Redoc.appRef = null;
});
- it('should call componentRef.dispose', () => {
- Redoc.dispose();
- expect(disposeSpy).toHaveBeenCalled();
+ it('should call componentRef.destroy', () => {
+ Redoc.destroy();
+ expect(destroySpy).toHaveBeenCalled();
});
it('should create new host element', () => {
element.parentElement.removeChild(element);
- Redoc.dispose();
+ Redoc.destroy();
expect(dom.query('redoc')).not.toBeNull();
dom.query('redoc').should.not.be.equal(element);
});
it('should set to null appRef', () => {
- Redoc.dispose();
+ Redoc.destroy();
expect(Redoc.appRef).toBeNull();
});
});
diff --git a/lib/components/RequestSamples/request-samples.html b/lib/components/RequestSamples/request-samples.html
index 60ede141..78bb0657 100644
--- a/lib/components/RequestSamples/request-samples.html
+++ b/lib/components/RequestSamples/request-samples.html
@@ -4,7 +4,7 @@
-
+
diff --git a/lib/components/ResponsesList/responses-list.html b/lib/components/ResponsesList/responses-list.html
index 9fd2d762..15d643ca 100644
--- a/lib/components/ResponsesList/responses-list.html
+++ b/lib/components/ResponsesList/responses-list.html
@@ -1,11 +1,11 @@
-
|