kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

housekeeping: prevent log warning for missing getComponent in production

Browse Source 
This is a force-pushed squash of two PR merges (#5919, #5940) that were
formerly present on master as individual commits.

Co-Authored-By: kyle shockey <kyleshockey@gmail.com>
This commit is contained in:
Timothy Lai
2020-04-04 18:46:09 -04:00
committed by Kyle Shockey
parent 12e86dafb0
commit 0426eb2344
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/json-schema-components.jsx
View File

@@ -50,8 +50,15 @@ export class JsonSchemaForm extends Component {
schema = schema.toJS() schema = schema.toJS()
let { type, format="" } = schema let { type, format="" } = schema
// In the json schema rendering code, we optimistically query our system for a number of components.
// If the component doesn't exist, we optionally suppress these warnings.
let getComponentSilently = (name) => getComponent(name, false, { failSilently: true })
let Comp = (format ?
getComponentSilently(`JsonSchema_${type}_${format}`) :
getComponentSilently(`JsonSchema_${type}`)) ||
getComponentSilently("JsonSchema_string")
let Comp = (format ? getComponent(`JsonSchema_${type}_${format}`) : getComponent(`JsonSchema_${type}`)) || getComponent("JsonSchema_string")
return <Comp { ...this.props } errors={errors} fn={fn} getComponent={getComponent} value={value} onChange={onChange} schema={schema} disabled={disabled}/> return <Comp { ...this.props } errors={errors} fn={fn} getComponent={getComponent} value={value} onChange={onChange} schema={schema} disabled={disabled}/>
} }

9
src/core/plugins/view/root-injects.jsx
View File

@@ -101,15 +101,20 @@ const wrapRender = (component) => {
} }
export const getComponent = (getSystem, getStore, getComponents, componentName, container) => { export const getComponent = (getSystem, getStore, getComponents, componentName, container, config = {}) => {
if(typeof componentName !== "string") if(typeof componentName !== "string")
throw new TypeError("Need a string, to fetch a component. Was given a " + typeof componentName) throw new TypeError("Need a string, to fetch a component. Was given a " + typeof componentName)
// getComponent has a config object as a third, optional parameter
// using the config object requires the presence of the second parameter, container
// e.g. getComponent("JsonSchema_string_whatever", false, { failSilently: true })
let component = getComponents(componentName) let component = getComponents(componentName)
if(!component) { if(!component) {
getSystem().log.warn("Could not find component", componentName) if (!config.failSilently) {
getSystem().log.warn("Could not find component:", componentName)
}
return null return null
} }