OCDP/ocdp-go
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: real K8s replicas in list API, full Helm values in modify YAML editor

Browse Source 
- Add Replicas field to entity.Instance
- Add EnrichReplicas to InstanceService (batch K8s deployment query)
- convertInstanceResponse uses instance.Replicas instead of hardcoded 0
- ModifyModal: load full Helm values from values-diff API (Current deployed)
- Remove stale loadValuesDiff, use single useEffect for all data loading
- Fix YAML lineWidth:0 for no line wrapping
This commit is contained in:
Ivan087
2026-05-13 16:15:11 +08:00
parent 96d42ee3e1
commit b88fe24aab
4 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
frontend/src/features/artifact/instances/components/ModifyModal.tsx
View File

@ -40,37 +40,47 @@ export const ModifyModal: React.FC<ModifyModalProps> = ({
// Values Diff support
const [showDiff, setShowDiff] = useState(false);
const [loadingDiff, setLoadingDiff] = useState(false);
const [loadingDiff] = useState(false);
const [diffData, setDiffData] = useState<{
current: Record<string, any>;
defaults: Record<string, any>;
} | null>(null);
const [diffError, setDiffError] = useState<string | null>(null);
const [diffError] = useState<string | null>(null);
// Fetch full instance detail (list excludes values) and load diff
// Fetch full Helm values (via values-diff API) and instance detail
useEffect(() => {
setTag(instance.version || "");
setDescription("");
const loadFullInstance = async () => {
const loadData = async () => {
if (instance.clusterId && instance.id) {
// Load values diff first — gives us the full current Helm values
try {
const detail = await getInstance(
{ clusterId: instance.clusterId, instanceId: instance.id },
);
if (detail.values && Object.keys(detail.values).length > 0) {
const currentYaml = stringifyYaml(detail.values, { lineWidth: 0 });
const data = await getInstanceValuesDiff(instance.clusterId, instance.id);
if (data?.current && Object.keys(data.current).length > 0) {
const currentYaml = stringifyYaml(data.current, { lineWidth: 0 });
setValuesYaml(currentYaml);
setOriginalValuesYaml(currentYaml);
setDiffData({ current: data.current, defaults: data.defaults ?? {} });
}
} catch (err) {
console.error('[ModifyModal] Failed to fetch instance detail:', err);
console.error('[ModifyModal] Failed to load values diff:', err);
// Fallback: try instance detail
try {
const detail = await getInstance({ clusterId: instance.clusterId, instanceId: instance.id });
if (detail.values && Object.keys(detail.values).length > 0) {
const y = stringifyYaml(detail.values, { lineWidth: 0 });
setValuesYaml(y);
setOriginalValuesYaml(y);
}
} catch (err2) {
console.error('[ModifyModal] Failed to load instance detail:', err2);
}
}
}
loadValuesDiff();
};
loadFullInstance();
loadData();
}, [instance]);
// Recompute modified keys when valuesYaml or diffData changes
@ -98,24 +108,6 @@ export const ModifyModal: React.FC<ModifyModalProps> = ({
} catch { /* ignore parse errors */ }
}, [valuesYaml, diffData]);
const loadValuesDiff = async () => {
if (!instance.clusterId || !instance.id) return;
setLoadingDiff(true);
setDiffError(null);
setDiffData(null);
try {
const data = await getInstanceValuesDiff(instance.clusterId, instance.id);
if (data && data.current && data.defaults) {
setDiffData({ current: data.current, defaults: data.defaults });
}
} catch (err) {
console.error("[ModifyModal] Failed to load values diff:", err);
setDiffError("Failed to load values diff");
} finally {
setLoadingDiff(false);
}
};
const applyDefaults = () => {
if (!diffData?.defaults) return;
@ -303,9 +295,6 @@ export const ModifyModal: React.FC<ModifyModalProps> = ({
<button
type="button"
onClick={() => {
if (!showDiff && !diffData) {
loadValuesDiff();
}
setShowDiff(!showDiff);
}}
className="flex items-center gap-2 text-sm font-medium text-indigo-600 hover:text-indigo-700 transition-colors"