Skip to content
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

improvement: address Bootstrap conflict by renaming our column class (via #4574) #5541

Merged
merged 2 commits into from
Aug 21, 2019
Merged

improvement: address Bootstrap conflict by renaming our column class (via #4574) #5541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec3986
improvement: address Bootstrap conflict by removing our .col class (v…
thierrydallacroce Aug 20, 2019
02ce910
use `.parameters-col_description` selector in Cypress tests
shockey Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/core/components/live-response.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ export default class LiveResponse extends React.Component {
<table className="responses-table live-responses-table">
<thead>
<tr className="responses-header">
<td className="col col_header response-col_status">Code</td>
<td className="col col_header response-col_description">Details</td>
<td className="col_header response-col_status">Code</td>
<td className="col_header response-col_description">Details</td>
</tr>
</thead>
<tbody>
<tr className="response">
<td className="col response-col_status">
<td className="response-col_status">
{ status }
{
notDocumented ? <div className="response-undocumented">
Expand All @@ -98,7 +98,7 @@ export default class LiveResponse extends React.Component {
: null
}
</td>
<td className="col response-col_description">
<td className="response-col_description">
{
isError ? <span>
{`${response.get("name")}: ${response.get("message")}`}
Expand Down
4 changes: 2 additions & 2 deletions src/core/components/operation-extensions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export const OperationExt = ({ extensions, getComponent }) => {
<table>
<thead>
<tr>
<td className="col col_header">Field</td>
<td className="col col_header">Value</td>
<td className="col_header">Field</td>
<td className="col_header">Value</td>
</tr>
</thead>
<tbody>
Expand Down
12 changes: 6 additions & 6 deletions src/core/components/parameter-row.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default class ParameterRow extends Component {
onChangeWrapper = (value, isXml = false) => {
let { onChange, rawParam } = this.props
let valueForUpstream

// Coerce empty strings and empty Immutable objects to null
if(value === "" || (value && value.size === 0)) {
valueForUpstream = null
Expand Down Expand Up @@ -126,7 +126,7 @@ export default class ParameterRow extends Component {

getParamKey() {
const { param } = this.props

if(!param) return null

return `${param.get("name")}-${param.get("in")}`
Expand Down Expand Up @@ -214,7 +214,7 @@ export default class ParameterRow extends Component {

return (
<tr data-param-name={param.get("name")} data-param-in={param.get("in")}>
<td className="col parameters-col_name">
<td className="parameters-col_name">
<div className={required ? "parameter__name required" : "parameter__name"}>
{ param.get("name") }
{ !required ? null : <span style={{color: "red"}}>&nbsp;*</span> }
Expand All @@ -232,7 +232,7 @@ export default class ParameterRow extends Component {
{ !showExtensions || !extensions.size ? null : extensions.map((v, key) => <ParameterExt key={`${key}-${v}`} xKey={key} xVal={v} /> )}
</td>

<td className="col parameters-col_description">
<td className="parameters-col_description">
{ param.get("description") ? <Markdown source={ param.get("description") }/> : null }

{ (bodyParam || !isExecute) && isDisplayParamEnum ?
Expand Down Expand Up @@ -291,12 +291,12 @@ export default class ParameterRow extends Component {
}

{
!bodyParam && isExecute ?
!bodyParam && isExecute ?
<ParameterIncludeEmpty
onChange={this.onChangeIncludeEmpty}
isIncluded={specSelectors.parameterInclusionSettingFor(pathMethod, param.get("name"), param.get("in"))}
isDisabled={value && value.size !== 0}
param={param} />
param={param} />
: null
}

Expand Down
4 changes: 2 additions & 2 deletions src/core/components/parameters/parameters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ export default class Parameters extends Component {
<table className="parameters">
<thead>
<tr>
<th className="col col_header parameters-col_name">Name</th>
<th className="col col_header parameters-col_description">Description</th>
<th className="col_header parameters-col_name">Name</th>
<th className="col_header parameters-col_description">Description</th>
</tr>
</thead>
<tbody>
Expand Down
10 changes: 5 additions & 5 deletions src/core/components/response.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ export default class Response extends React.Component {
sampleResponse = response.getIn(["examples", activeContentType])
} else {
sampleResponse = schema ? getSampleSchema(
schema.toJS(),
activeContentType,
schema.toJS(),
activeContentType,
{
includeReadOnly: true,
includeWriteOnly: true // writeOnly has no filtering effect in swagger 2.0
Expand All @@ -154,10 +154,10 @@ export default class Response extends React.Component {

return (
<tr className={ "response " + ( className || "") } data-code={code}>
<td className="col response-col_status">
<td className="response-col_status">
{ code }
</td>
<td className="col response-col_description">
<td className="response-col_description">

<div className="response-col_description__inner">
<Markdown source={ response.get( "description" ) } />
Expand Down Expand Up @@ -237,7 +237,7 @@ export default class Response extends React.Component {
) : null}

</td>
{isOAS3 ? <td className="col response-col_links">
{isOAS3 ? <td className="response-col_links">
{ links ?
links.toSeq().map((link, key) => {
return <OperationLink key={key} name={key} link={ link } getComponent={getComponent}/>
Expand Down
4 changes: 2 additions & 2 deletions src/core/components/responses.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ export default class Responses extends React.Component {
<table className="responses-table">
<thead>
<tr className="responses-header">
<td className="col col_header response-col_status">Code</td>
<td className="col col_header response-col_description">Description</td>
<td className="col_header response-col_status">Code</td>
<td className="col_header response-col_description">Description</td>
{ specSelectors.isOAS3() ? <td className="col col_header response-col_links">Links</td> : null }
</tr>
</thead>
Expand Down
4 changes: 2 additions & 2 deletions src/core/plugins/oas3/components/request-body.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const RequestBody = ({
const isFile = type === "string" && (format === "binary" || format === "base64")

return <tr key={key} className="parameters" data-property-name={key}>
<td className="col parameters-col_name">
<td className="parameters-col_name">
<div className={required ? "parameter__name required" : "parameter__name"}>
{ key }
{ !required ? null : <span style={{color: "red"}}>&nbsp;*</span> }
Expand All @@ -153,7 +153,7 @@ const RequestBody = ({
{ prop.get("deprecated") ? "deprecated": null }
</div>
</td>
<td className="col parameters-col_description">
<td className="parameters-col_description">
<Markdown source={ description }></Markdown>
{isExecute ? <div><JsonSchemaForm
fn={fn}
Expand Down
12 changes: 6 additions & 6 deletions test/e2e-cypress/tests/bugs/5452.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ describe("#5452: <Select /> crashing in Parameters", function() {
cy.visit("http://localhost:3230/?url=/documents/bugs/5452/openapi.yaml")
.get("#operations-default-get_endpoint")
.click()
.get(".parameters > tbody > tr > .col > select")
.get(".parameters > tbody > tr > .parameters-col_description > select")
.select("")
.get(".parameters > tbody > tr > .col > select")
.get(".parameters > tbody > tr > .parameters-col_description > select")
.should("exist")
.select("fruit")
.get(".parameters > tbody > tr > .col > select")
.get(".parameters > tbody > tr > .parameters-col_description > select")
.should("exist")
})
})
Expand All @@ -22,12 +22,12 @@ describe("#5452: <Select /> crashing in Parameters", function() {
cy.visit("http://localhost:3230/?url=/documents/bugs/5452/swagger.yaml")
.get("#operations-default-get_endpoint")
.click()
.get(".parameters > tbody > tr > .col > select")
.get(".parameters > tbody > tr > .parameters-col_description > select")
.select("")
.get(".parameters > tbody > tr > .col > select")
.get(".parameters > tbody > tr > .parameters-col_description > select")
.should("exist")
.select("fruit")
.get(".parameters > tbody > tr > .col > select")
.get(".parameters > tbody > tr > .parameters-col_description > select")
.should("exist")
})
})
Expand Down