Skip to content
This repository was archived by the owner on Jun 26, 2026. It is now read-only.

Commit de2f98b

Browse files
author
ohotnikov.ivan
committed
fix(console): address review feedback on state management and edge cases
- VncTab: reset desktopSize on reconnect to avoid stale aspect-ratio locking the layout behind the loading overlay - VMDiskWidget: replace omitted-dep workaround with an autoSelectedRef flag so auto-select fires on initial disk load while respecting user changes; restores all proper deps so the linter is satisfied - SchemaForm: guard defaults emission with emittedSchemaRef so an unexpected schema identity change cannot overwrite in-progress user input - ResourceQuotasField: sync KnownRowEditor local state (checked, localNum) with external value changes via expectedValueRef to distinguish own onChange events from parent-driven resets (e.g. yaml/form mode switch) - ModulesPage: remove hardcoded "root" tenant fallback; disable card with aria-disabled when no tenant is selected to prevent silent 404 navigation Signed-off-by: ohotnikov.ivan <[email protected]>
1 parent 3eebd4f commit de2f98b

5 files changed

Lines changed: 46 additions & 17 deletions

File tree

‎apps/console/src/components/ResourceQuotasField.tsx‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState } from "react"
1+
import { useState, useEffect, useRef } from "react"
22
import type { FieldProps } from "@rjsf/utils"
33
import { X, Plus } from "lucide-react"
44

@@ -62,12 +62,31 @@ function KnownRowEditor({ row, value, onChange, readonly }: KnownRowEditorProps)
6262
return parseSize(value, row.units).unit
6363
})
6464

65+
// expectedValueRef tracks values we emitted ourselves so we can distinguish
66+
// an external reset (e.g. form data cleared from outside) from our own onChange.
67+
const expectedValueRef = useRef(value)
68+
69+
useEffect(() => {
70+
if (value === expectedValueRef.current) return
71+
expectedValueRef.current = value
72+
const hasValue = value !== undefined && value !== ""
73+
setChecked(hasValue)
74+
if (hasValue && value) {
75+
setLocalNum(row.units ? parseSize(value, row.units).num : value)
76+
if (row.units) setLocalUnit(parseSize(value, row.units).unit)
77+
} else {
78+
setLocalNum("")
79+
}
80+
// eslint-disable-next-line react-hooks/exhaustive-deps
81+
}, [value])
82+
6583
const enabled = checked
6684

6785
const handleToggle = () => {
6886
if (enabled) {
6987
setChecked(false)
7088
setLocalNum("")
89+
expectedValueRef.current = undefined
7190
onChange(undefined)
7291
} else {
7392
setChecked(true)
@@ -80,20 +99,21 @@ function KnownRowEditor({ row, value, onChange, readonly }: KnownRowEditorProps)
8099
const trimmed = num.trim()
81100
if (!trimmed) {
82101
// Clear from parent data but keep checkbox checked locally
102+
expectedValueRef.current = undefined
83103
onChange(undefined)
84104
return
85105
}
86-
if (row.units) {
87-
onChange(formatSize(trimmed, localUnit))
88-
} else {
89-
onChange(trimmed)
90-
}
106+
const next = row.units ? formatSize(trimmed, localUnit) : trimmed
107+
expectedValueRef.current = next
108+
onChange(next)
91109
}
92110

93111
const handleUnitChange = (unit: string) => {
94112
setLocalUnit(unit)
95113
if (localNum.trim()) {
96-
onChange(formatSize(localNum, unit))
114+
const next = formatSize(localNum, unit)
115+
expectedValueRef.current = next
116+
onChange(next)
97117
}
98118
}
99119

‎apps/console/src/components/SchemaForm.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,16 @@ export function SchemaForm({
169169
const onChangeRef = useRef(onChange)
170170
onChangeRef.current = onChange
171171
const initialFormDataRef = useRef(formData)
172+
const emittedSchemaRef = useRef<RJSFSchema | null>(null)
172173

173-
// Emit defaults to parent on schema load so spec is never empty on first submit.
174+
// Emit defaults to parent once per schema so spec is never empty on first submit.
174175
// Uses initialFormDataRef so edit-mode existing values are preserved as base.
176+
// emittedSchemaRef prevents re-running on unrelated re-renders and avoids
177+
// overwriting user data if the schema object changes identity unexpectedly.
175178
useEffect(() => {
176179
if (!schema || Object.keys(schema).length === 0) return
180+
if (emittedSchemaRef.current === schema) return
181+
emittedSchemaRef.current = schema
177182
const defaults = getDefaultFormState(validator, schema, initialFormDataRef.current ?? {}, schema)
178183
onChangeRef.current(defaults)
179184
// eslint-disable-next-line react-hooks/exhaustive-deps

‎apps/console/src/components/VMDiskWidget.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,17 @@ export function VMDiskWidget(props: WidgetProps) {
3333
const onChangeRef = useRef(onChange)
3434
onChangeRef.current = onChange
3535

36-
// Auto-select first disk if required and no value set.
37-
// `disks` is intentionally omitted from deps: a new array reference from k8s watch
38-
// would otherwise re-run this effect and overwrite a user's selection.
39-
// `onChange` is also excluded — it changes reference every render.
36+
// Auto-select the first disk once when disks become available and no value is set.
37+
// A ref prevents re-triggering on every k8s watch event (new array reference)
38+
// while still firing correctly when the list loads after mount.
39+
const autoSelectedRef = useRef(false)
4040
useEffect(() => {
41+
if (autoSelectedRef.current) return
4142
if (required && !value && disks.length > 0 && !isLoading) {
43+
autoSelectedRef.current = true
4244
onChangeRef.current(disks[0].metadata.name)
4345
}
44-
// eslint-disable-next-line react-hooks/exhaustive-deps
45-
}, [required, value, isLoading])
46+
}, [required, value, disks, isLoading])
4647

4748
return (
4849
<select

‎apps/console/src/routes/ModulesPage.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,17 @@ function ModuleCard({
106106
const plural = ad.spec?.application.plural ?? ad.metadata.name
107107
const singletonName = installed?.metadata.name ?? kind.toLowerCase()
108108
const enabled = !!installed
109+
const canNavigate = enabled || !!tenantName
109110
const target = enabled
110111
? `/console/${plural}/${singletonName}`
111-
: `/console/tenants/${tenantName ?? "root"}/edit`
112+
: `/console/tenants/${tenantName}/edit`
112113
const icon = iconDataUrl(ad)
113114

114115
return (
115116
<Link
116-
to={target}
117-
className="flex items-center gap-3 rounded-lg border border-slate-200 bg-white px-4 py-3 transition-shadow hover:shadow-sm"
117+
to={canNavigate ? target : "#"}
118+
aria-disabled={!canNavigate}
119+
className={`flex items-center gap-3 rounded-lg border border-slate-200 bg-white px-4 py-3 transition-shadow ${canNavigate ? "hover:shadow-sm" : "opacity-50 cursor-not-allowed pointer-events-none"}`}
118120
>
119121
<div className="size-10 shrink-0 overflow-hidden rounded-md bg-slate-100">
120122
{icon ? <img src={icon} alt="" className="h-full w-full" /> : null}

‎apps/console/src/routes/detail/VncTab.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ export function VncTab({ ad, instance }: VncTabProps) {
130130
try { rfbRef.current.disconnect() } catch {}
131131
rfbRef.current = null
132132
}
133+
setDesktopSize(null)
133134
setConnectionKey((k) => k + 1)
134135
}
135136

0 commit comments

Comments
 (0)