Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions src/core/components/responses.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react"
import { fromJS, Iterable } from "immutable"
import PropTypes from "prop-types"
import ImPropTypes from "react-immutable-proptypes"
import { defaultStatusCode, getAcceptControllingResponse } from "core/utils"
import { defaultStatusCode, getAcceptControllingResponse, isExtension } from "core/utils"
import createHtmlReadyId from "core/utils/create-html-ready-id"

export default class Responses extends React.Component {
Expand Down Expand Up @@ -87,10 +87,11 @@ export default class Responses extends React.Component {
const acceptControllingResponse = isSpecOAS3 ?
getAcceptControllingResponse(responses) : null

const nonExtensionResponses = responses.filter((_, key) => !isExtension(key))
const regionId = createHtmlReadyId(`${method}${path}_responses`)
const controlId = `${regionId}_select`

return (
return (!nonExtensionResponses || !nonExtensionResponses.size) ? null : (
<div className="responses-wrapper">
<div className="opblock-section-header">
<h4>Responses</h4>
Expand Down Expand Up @@ -131,7 +132,7 @@ export default class Responses extends React.Component {
</thead>
<tbody>
{
responses.entrySeq().map( ([code, response]) => {
nonExtensionResponses.entrySeq().map( ([code, response]) => {

let className = tryItOutResponse && tryItOutResponse.get("status") == code ? "response_current" : ""
return (
Expand Down
10 changes: 7 additions & 3 deletions src/core/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -704,12 +704,16 @@ export const createDeepLinkPath = (str) => typeof str == "string" || str instanc
// suitable for use in CSS classes and ids
export const escapeDeepLinkPath = (str) => cssEscape( createDeepLinkPath(str).replace(/%20/g, "_") )

export const getExtensions = (defObj) => {
export const isExtension = (key) => {
const extensionRegExp = /^x-/
return extensionRegExp.test(key)
}

export const getExtensions = (defObj) => {
if(Map.isMap(defObj)) {
return defObj.filter((v, k) => extensionRegExp.test(k))
return defObj.filter((v, k) => isExtension(k))
}
return Object.keys(defObj).filter((key) => extensionRegExp.test(key))
return Object.keys(defObj).filter((key) => isExtension(key))
}
export const getCommonExtensions = (defObj) => defObj.filter((v, k) => /^pattern|maxLength|minLength|maximum|minimum/.test(k))

Expand Down