Skip to content

Commit 0b3489b

Browse files
thierrydallacroceshockey
authored andcommitted
fix: remove .col class that causes collision with Bootstrap (via #5541)
* improvement: address Bootstrap conflict by removing our .col class (#4574) * use `.parameters-col_description` selector in Cypress tests
1 parent 1793df6 commit 0b3489b

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

src/core/components/live-response.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ export default class LiveResponse extends React.Component {
8383
<table className="responses-table live-responses-table">
8484
<thead>
8585
<tr className="responses-header">
86-
<td className="col col_header response-col_status">Code</td>
87-
<td className="col col_header response-col_description">Details</td>
86+
<td className="col_header response-col_status">Code</td>
87+
<td className="col_header response-col_description">Details</td>
8888
</tr>
8989
</thead>
9090
<tbody>
9191
<tr className="response">
92-
<td className="col response-col_status">
92+
<td className="response-col_status">
9393
{ status }
9494
{
9595
notDocumented ? <div className="response-undocumented">
@@ -98,7 +98,7 @@ export default class LiveResponse extends React.Component {
9898
: null
9999
}
100100
</td>
101-
<td className="col response-col_description">
101+
<td className="response-col_description">
102102
{
103103
isError ? <span>
104104
{`${response.get("name")}: ${response.get("message")}`}

src/core/components/operation-extensions.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export const OperationExt = ({ extensions, getComponent }) => {
1313
<table>
1414
<thead>
1515
<tr>
16-
<td className="col col_header">Field</td>
17-
<td className="col col_header">Value</td>
16+
<td className="col_header">Field</td>
17+
<td className="col_header">Value</td>
1818
</tr>
1919
</thead>
2020
<tbody>

src/core/components/parameter-row.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default class ParameterRow extends Component {
6565
onChangeWrapper = (value, isXml = false) => {
6666
let { onChange, rawParam } = this.props
6767
let valueForUpstream
68-
68+
6969
// Coerce empty strings and empty Immutable objects to null
7070
if(value === "" || (value && value.size === 0)) {
7171
valueForUpstream = null
@@ -126,7 +126,7 @@ export default class ParameterRow extends Component {
126126

127127
getParamKey() {
128128
const { param } = this.props
129-
129+
130130
if(!param) return null
131131

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

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

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

238238
{ (bodyParam || !isExecute) && isDisplayParamEnum ?
@@ -291,12 +291,12 @@ export default class ParameterRow extends Component {
291291
}
292292

293293
{
294-
!bodyParam && isExecute ?
294+
!bodyParam && isExecute ?
295295
<ParameterIncludeEmpty
296296
onChange={this.onChangeIncludeEmpty}
297297
isIncluded={specSelectors.parameterInclusionSettingFor(pathMethod, param.get("name"), param.get("in"))}
298298
isDisabled={value && value.size !== 0}
299-
param={param} />
299+
param={param} />
300300
: null
301301
}
302302

src/core/components/parameters/parameters.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ export default class Parameters extends Component {
139139
<table className="parameters">
140140
<thead>
141141
<tr>
142-
<th className="col col_header parameters-col_name">Name</th>
143-
<th className="col col_header parameters-col_description">Description</th>
142+
<th className="col_header parameters-col_name">Name</th>
143+
<th className="col_header parameters-col_description">Description</th>
144144
</tr>
145145
</thead>
146146
<tbody>

src/core/components/response.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ export default class Response extends React.Component {
140140
sampleResponse = response.getIn(["examples", activeContentType])
141141
} else {
142142
sampleResponse = schema ? getSampleSchema(
143-
schema.toJS(),
144-
activeContentType,
143+
schema.toJS(),
144+
activeContentType,
145145
{
146146
includeReadOnly: true,
147147
includeWriteOnly: true // writeOnly has no filtering effect in swagger 2.0
@@ -154,10 +154,10 @@ export default class Response extends React.Component {
154154

155155
return (
156156
<tr className={ "response " + ( className || "") } data-code={code}>
157-
<td className="col response-col_status">
157+
<td className="response-col_status">
158158
{ code }
159159
</td>
160-
<td className="col response-col_description">
160+
<td className="response-col_description">
161161

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

239239
</td>
240-
{isOAS3 ? <td className="col response-col_links">
240+
{isOAS3 ? <td className="response-col_links">
241241
{ links ?
242242
links.toSeq().map((link, key) => {
243243
return <OperationLink key={key} name={key} link={ link } getComponent={getComponent}/>

src/core/components/responses.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ export default class Responses extends React.Component {
117117
<table className="responses-table">
118118
<thead>
119119
<tr className="responses-header">
120-
<td className="col col_header response-col_status">Code</td>
121-
<td className="col col_header response-col_description">Description</td>
120+
<td className="col_header response-col_status">Code</td>
121+
<td className="col_header response-col_description">Description</td>
122122
{ specSelectors.isOAS3() ? <td className="col col_header response-col_links">Links</td> : null }
123123
</tr>
124124
</thead>

src/core/plugins/oas3/components/request-body.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ const RequestBody = ({
139139
const isFile = type === "string" && (format === "binary" || format === "base64")
140140

141141
return <tr key={key} className="parameters" data-property-name={key}>
142-
<td className="col parameters-col_name">
142+
<td className="parameters-col_name">
143143
<div className={required ? "parameter__name required" : "parameter__name"}>
144144
{ key }
145145
{ !required ? null : <span style={{color: "red"}}>&nbsp;*</span> }
@@ -153,7 +153,7 @@ const RequestBody = ({
153153
{ prop.get("deprecated") ? "deprecated": null }
154154
</div>
155155
</td>
156-
<td className="col parameters-col_description">
156+
<td className="parameters-col_description">
157157
<Markdown source={ description }></Markdown>
158158
{isExecute ? <div><JsonSchemaForm
159159
fn={fn}

test/e2e-cypress/tests/bugs/5452.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ describe("#5452: <Select /> crashing in Parameters", function() {
88
cy.visit("http://localhost:3230/?url=/documents/bugs/5452/openapi.yaml")
99
.get("#operations-default-get_endpoint")
1010
.click()
11-
.get(".parameters > tbody > tr > .col > select")
11+
.get(".parameters > tbody > tr > .parameters-col_description > select")
1212
.select("")
13-
.get(".parameters > tbody > tr > .col > select")
13+
.get(".parameters > tbody > tr > .parameters-col_description > select")
1414
.should("exist")
1515
.select("fruit")
16-
.get(".parameters > tbody > tr > .col > select")
16+
.get(".parameters > tbody > tr > .parameters-col_description > select")
1717
.should("exist")
1818
})
1919
})
@@ -22,12 +22,12 @@ describe("#5452: <Select /> crashing in Parameters", function() {
2222
cy.visit("http://localhost:3230/?url=/documents/bugs/5452/swagger.yaml")
2323
.get("#operations-default-get_endpoint")
2424
.click()
25-
.get(".parameters > tbody > tr > .col > select")
25+
.get(".parameters > tbody > tr > .parameters-col_description > select")
2626
.select("")
27-
.get(".parameters > tbody > tr > .col > select")
27+
.get(".parameters > tbody > tr > .parameters-col_description > select")
2828
.should("exist")
2929
.select("fruit")
30-
.get(".parameters > tbody > tr > .col > select")
30+
.get(".parameters > tbody > tr > .parameters-col_description > select")
3131
.should("exist")
3232
})
3333
})

0 commit comments

Comments
 (0)