From 189f048e9181826a4f6a91ac13417ca98c9cfdb9 Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Wed, 5 Jul 2017 15:18:50 -0700 Subject: [PATCH] Stashed: move anyOf/oneOf/not into core --- src/core/components/model.jsx | 47 +++++++++++++++++++ .../plugins/oas3/wrap-components/model.jsx | 1 + 2 files changed, 48 insertions(+) diff --git a/src/core/components/model.jsx b/src/core/components/model.jsx index ec235752..55c77a74 100644 --- a/src/core/components/model.jsx +++ b/src/core/components/model.jsx @@ -43,6 +43,11 @@ class ObjectModel extends Component { let additionalProperties = schema.get("additionalProperties") let title = schema.get("title") || name let required = schema.get("required") + + let anyOf = specSelectors.isOAS3() ? schema.get("anyOf") : null + let oneOf = specSelectors.isOAS3() ? schema.get("oneOf") : null + let not = specSelectors.isOAS3() ? schema.get("not") : null + const Markdown = getComponent("Markdown") const JumpToPathSection = ({ name }) => let collapsedContent = ( @@ -114,6 +119,48 @@ class ObjectModel extends Component { } + { + !anyOf ? null + : + { "anyOf ->" } + + {anyOf.map(schema => { + return
+ })} + + + } + { + !oneOf ? null + : + { "oneOf ->" } + + {oneOf.map(schema => { + return
+ })} + + + } + { + !not ? null + : + { "not ->" } + + {not.map(schema => { + return
+ })} + + + } }
diff --git a/src/core/plugins/oas3/wrap-components/model.jsx b/src/core/plugins/oas3/wrap-components/model.jsx index ae6cd35a..080c8b1c 100644 --- a/src/core/plugins/oas3/wrap-components/model.jsx +++ b/src/core/plugins/oas3/wrap-components/model.jsx @@ -22,6 +22,7 @@ class ModelComponent extends Component { classes.push("deprecated") message = Deprecated: } + return
{message}