Skip to content

fix: fix opened model schema resolving issue on spec change #10509

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

Merged
merged 3 commits into from
Jun 26, 2025
Merged

fix: fix opened model schema resolving issue on spec change #10509

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54fd987
fix: fix opened model schema resolving issue on spec change
ShikhaSaboo Jun 25, 2025
31f9f49
chore: resolve eslint error
ShikhaSaboo Jun 26, 2025
a10847c
Merge branch 'master' into bug/fix-allof-when-switching-openapi-version
cka121 Jun 26, 2025
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
12 changes: 10 additions & 2 deletions src/core/plugins/oas31/components/models/models.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ const Models = ({
* Effects.
*/
useEffect(() => {
const isOpenAndExpanded = isOpen && defaultModelsExpandDepth > 1
const includesExpandedSchema = Object.entries(schemas).some(
([schemaName]) =>
layoutSelectors.isShown([...schemasPath, schemaName], false)
)
const isOpenAndExpanded =
isOpen && (defaultModelsExpandDepth > 1 || includesExpandedSchema)
const isResolved = specSelectors.specResolvedSubtree(schemasPath) != null
if (isOpenAndExpanded && !isResolved) {
specActions.requestResolvedSubtree(schemasPath)
Expand All @@ -55,12 +60,15 @@ const Models = ({
}
}
const handleJSONSchema202012Expand = (schemaName) => (e, expanded) => {
const schemaPath = [...schemasPath, schemaName]
if (expanded) {
const schemaPath = [...schemasPath, schemaName]
const isResolved = specSelectors.specResolvedSubtree(schemaPath) != null
if (!isResolved) {
specActions.requestResolvedSubtree([...schemasPath, schemaName])
}
layoutActions.show(schemaPath, true)
} else {
layoutActions.show(schemaPath, false)
}
}

Expand Down