Skip to content

[WIP] oneOf/anyOf support #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open

[WIP] oneOf/anyOf support #505

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2072fca
Extend traverseSchema utility to recurse into other types of nested s…
gazpachoking Aug 6, 2015
e7863b6
Start some work on a schemaSelector directive
gazpachoking Aug 6, 2015
c013170
Start some work on a formselect type
gazpachoking Aug 10, 2015
15e67b7
Remove unused directive
gazpachoking Aug 10, 2015
e952803
Actuall make form selection work
gazpachoking Aug 13, 2015
8145236
Add allOf support
gazpachoking Aug 13, 2015
16a48b3
Auto select form based on model
gazpachoking Aug 14, 2015
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add allOf support
  • Loading branch information
@gazpachoking
gazpachoking committed Aug 13, 2015
commit 8145236946a53aede8c6c5c5a6e56b45d11b720e
16 changes: 14 additions & 2 deletions src/services/schema-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ angular.module('schemaForm').provider('schemaForm',
var formselect = function(name, schema, options) {
var types = stripNullType(schema.type);
if (!(schema.oneOf || schema.anyOf || angular.isArray(types))) return;
schemas = [];
var f = stdFormObj(name, schema, options);
f.type = 'formselect';
var schemas = [];
// TODO: What if there are more than one of these keys in the same schema?
if (angular.isArray(types)) {
angular.forEach(types, function(type) {
Expand All @@ -322,10 +322,22 @@ angular.module('schemaForm').provider('schemaForm',
return f;
};

var allof = function(name, schema, options) {
if (schema.allOf) {
var extended = schema;
var allOf = schema.allOf;
delete schema.allOf;
angular.forEach(allOf, function(s) {
extended = extendSchemas(s, extended);
});
return defaultFormDefinition(name, extended, options);
}
};

//First sorted by schema type then a list.
//Order has importance. First handler returning an form snippet will be used.
var defaults = {
any: [formselect],
any: [allof, formselect],
string: [select, text],
object: [fieldset],
number: [number],
Expand Down