Skip to content

Commit

Permalink
fix(responseBody): json response highlighting (#6871)
Browse files Browse the repository at this point in the history
Refs #6508 

* Add language prop to HighlightCode component

* Use language prop for JSON HighlightCode responses in response-body.jsx
  • Loading branch information
nico-abram committed Feb 3, 2021
1 parent 5c4dfc2 commit 13fea13
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/core/components/highlight-code.jsx
Expand Up @@ -12,6 +12,7 @@ export default class HighlightCode extends Component {
className: PropTypes.string,
downloadable: PropTypes.bool,
fileName: PropTypes.string,
language: PropTypes.string,
canCopy: PropTypes.bool
}

Expand Down Expand Up @@ -39,14 +40,15 @@ export default class HighlightCode extends Component {
}

render () {
let { value, className, downloadable, getConfigs, canCopy } = this.props
let { value, className, downloadable, getConfigs, canCopy, language } = this.props

const config = getConfigs ? getConfigs() : {syntaxHighlight: {activated: true, theme: "agate"}}

className = className || ""

const codeBlock = get(config, "syntaxHighlight.activated")
? <SyntaxHighlighter
language={language}
className={className + " microlight"}
onWheel={this.preventYScrollingBeyondElement}
style={getStyle(get(config, "syntaxHighlight.theme"))}
Expand Down
4 changes: 3 additions & 1 deletion src/core/components/response-body.jsx
Expand Up @@ -94,13 +94,15 @@ export default class ResponseBody extends React.PureComponent {
// Anything else (CORS)
} else if (/json/i.test(contentType)) {
// JSON
let language = null
try {
body = JSON.stringify(JSON.parse(content), null, " ")
language = "json"
} catch (error) {
body = "can't parse JSON. Raw result:\n\n" + content
}

bodyEl = <HighlightCode downloadable fileName={`${downloadName}.json`} value={ body } getConfigs={ getConfigs } canCopy />
bodyEl = <HighlightCode language={language} downloadable fileName={`${downloadName}.json`} value={ body } getConfigs={ getConfigs } canCopy />

// XML
} else if (/xml/i.test(contentType)) {
Expand Down

0 comments on commit 13fea13

Please sign in to comment.