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

Ft/value retainer sample gen #6920

Merged
merged 4 commits into from Feb 11, 2021
Merged

Ft/value retainer sample gen #6920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccb8d2c
feat: use example gen for multiple example value retainer examples
mathis-m Feb 9, 2021
9ee31ad
fix: multiple examples with same value jumps to first example
mathis-m Feb 9, 2021
aa4247c
fix: naming and revert to const
mathis-m Feb 10, 2021
dd42181
Merge branch 'master' into ft/value_retainer_sample_gen
tim-lai Feb 11, 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
13 changes: 10 additions & 3 deletions src/core/components/examples-select-value-retainer.jsx
View file
Open in desktop
Expand Up @@ -189,16 +189,23 @@ export default class ExamplesSelectValueRetainer extends React.PureComponent {
nextProps
)

const exampleMatchingNewValue = examples.find(
const examplesMatchingNewValue = examples.filter(
(example) =>
example.get("value") === newValue ||
// sometimes data is stored as a string (e.g. in Request Bodies), so
// let's check against a stringified version of our example too
stringify(example.get("value")) === newValue
)

if (exampleMatchingNewValue) {
onSelect(examples.keyOf(exampleMatchingNewValue), {
if (examplesMatchingNewValue.size) {
let key
if(examplesMatchingNewValue.has(nextProps.currentKey))
{
key = nextProps.currentKey
} else {
key = examplesMatchingNewValue.keySeq().first()
}
onSelect(key, {
isSyntheticChange: true,
})
} else if (
Expand Down
21 changes: 16 additions & 5 deletions src/core/plugins/oas3/components/request-body.jsx
View file
Open in desktop
Expand Up @@ -83,7 +83,18 @@ const RequestBody = ({

const mediaTypeValue = requestBodyContent.get(contentType, OrderedMap())
const schemaForMediaType = mediaTypeValue.get("schema", OrderedMap())
const examplesForMediaType = mediaTypeValue.get("examples", null)
const rawExamplesOfMediaType = mediaTypeValue.get("examples", null)
const sampleForMediaType = rawExamplesOfMediaType?.map((container, key) => {
const val = container?.get("value", null)
if(val) {
container = container.set("value", getDefaultRequestBodyValue(
requestBody,
contentType,
key,
), val)
}
return container
})

const handleExamplesSelect = (key /*, { isSyntheticChange } */) => {
updateActiveExamplesKey(key)
Expand Down Expand Up @@ -223,10 +234,10 @@ const RequestBody = ({
<Markdown source={requestBodyDescription} />
}
{
examplesForMediaType ? (
sampleForMediaType ? (
<ExamplesSelectValueRetainer
userHasEditedBody={userHasEditedBody}
examples={examplesForMediaType}
examples={sampleForMediaType}
currentKey={activeExamplesKey}
currentUserInputValue={requestBodyValue}
onSelect={handleExamplesSelect}
Expand Down Expand Up @@ -269,9 +280,9 @@ const RequestBody = ({
)
}
{
examplesForMediaType ? (
sampleForMediaType ? (
<Example
example={examplesForMediaType.get(activeExamplesKey)}
example={sampleForMediaType.get(activeExamplesKey)}
getComponent={getComponent}
getConfigs={getConfigs}
/>
Expand Down