Skip to content

Commit 1695f65

Browse files
authored
Merge branch 'master' into ft/authmodelclosebtn
2 parents a7818d5 + dc29e06 commit 1695f65

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
!dist/swagger-ui.js.map
77
!dist/swagger-ui.css
88
!dist/swagger-ui.css.map
9+
!dist/oauth2-redirect.html

src/core/components/model.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React, { PureComponent } from "react"
2+
import ImPropTypes from "react-immutable-proptypes"
23
import PropTypes from "prop-types"
34

45
export default class Model extends PureComponent {
56
static propTypes = {
6-
schema: PropTypes.object.isRequired,
7+
schema: ImPropTypes.orderedMap.isRequired,
78
getComponent: PropTypes.func.isRequired,
89
specSelectors: PropTypes.object.isRequired,
910
name: PropTypes.string,

src/core/components/object-model.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,13 @@ export default class ObjectModel extends Component {
142142
: <tr>
143143
<td>{ "not ->" }</td>
144144
<td>
145-
{not.map((schema, k) => {
146-
return <div key={k}><Model { ...otherProps } required={ false }
147-
getComponent={ getComponent }
148-
schema={ schema }
149-
depth={ depth + 1 } /></div>
150-
})}
145+
<div>
146+
<Model { ...otherProps }
147+
required={ false }
148+
getComponent={ getComponent }
149+
schema={ not }
150+
depth={ depth + 1 } />
151+
</div>
151152
</td>
152153
</tr>
153154
}

0 commit comments

Comments
 (0)