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

Jump to bottom

Bug/6508 fix json response highlighting #6871

Merged
merged 6 commits into from Feb 3, 2021
Merged

Bug/6508 fix json response highlighting #6871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9da85d
Add language prop to HighlightCode component
nico-abram Jan 27, 2021
62990cc
Use language prop for JSON HighlightCode responses
nico-abram Jan 27, 2021
60c3226
Add missing language prop type in HighlightCode
nico-abram Jan 27, 2021
664cddc
Update response-body.jsx
nico-abram Jan 27, 2021
73756b4
Merge branch 'master' into bug/6508-fix-json-response-highlighting
nico-abram Jan 30, 2021
a853416
Merge branch 'master' into bug/6508-fix-json-response-highlighting
tim-lai Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/components/highlight-code.jsx
View file
Open in desktop
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
View file
Open in desktop
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