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

cka121 · web-flow · commit 0ddc74d52fed · 2025-06-26T15:38:11.000+05:30
diff --git a/src/core/plugins/oas31/components/models/models.jsx b/src/core/plugins/oas31/components/models/models.jsx
@@ -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)
@@ -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)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,12 @@ const Models = ({`
`30`	`30`	`* Effects.`
`31`	`31`	`*/`
`32`	`32`	`useEffect(() => {`
`33`		`- const isOpenAndExpanded = isOpen && defaultModelsExpandDepth > 1`
	`33`	`+ const includesExpandedSchema = Object.entries(schemas).some(`
	`34`	`+ ([schemaName]) =>`
	`35`	`+ layoutSelectors.isShown([...schemasPath, schemaName], false)`
	`36`	`+ )`
	`37`	`+ const isOpenAndExpanded =`
	`38`	`+ isOpen && (defaultModelsExpandDepth > 1 \|\| includesExpandedSchema)`
`34`	`39`	`const isResolved = specSelectors.specResolvedSubtree(schemasPath) != null`
`35`	`40`	`if (isOpenAndExpanded && !isResolved) {`
`36`	`41`	`specActions.requestResolvedSubtree(schemasPath)`
`@@ -55,12 +60,15 @@ const Models = ({`
`55`	`60`	`}`
`56`	`61`	`}`
`57`	`62`	`const handleJSONSchema202012Expand = (schemaName) => (e, expanded) => {`
	`63`	`+ const schemaPath = [...schemasPath, schemaName]`
`58`	`64`	`if (expanded) {`
`59`		`- const schemaPath = [...schemasPath, schemaName]`
`60`	`65`	`const isResolved = specSelectors.specResolvedSubtree(schemaPath) != null`
`61`	`66`	`if (!isResolved) {`
`62`	`67`	`specActions.requestResolvedSubtree([...schemasPath, schemaName])`
`63`	`68`	`}`
	`69`	`+ layoutActions.show(schemaPath, true)`
	`70`	`+ } else {`
	`71`	`+ layoutActions.show(schemaPath, false)`
`64`	`72`	`}`
`65`	`73`	`}`
`66`	`74`