Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions src/pages/backends/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,29 @@ export const backendActions = [
];

export const json2Yaml = (obj: Record<string, any>) => {
if (!obj || !Object.keys(obj).length) return '';
const res = jsYaml.dump(JSON.parse(JSON.stringify(obj)));
return res;
try {
if (!obj || !Object.keys(obj).length) return '';
const res = jsYaml.dump(JSON.parse(JSON.stringify(obj)));
return res;
} catch (error) {
console.error('json2Yaml error:', error);
return '';
}
};

export const yaml2Json = (input: string) => {
const str = trim(input);
const obj = jsYaml.load(str, { schema: SEAL_SCHEMA });
if (typeof obj !== 'object' || obj === null) {
try {
const str = trim(input);
const obj = jsYaml.load(str, { schema: SEAL_SCHEMA });
if (typeof obj !== 'object' || obj === null) {
return {};
}
const jsonStr = JSON.stringify(obj);
return JSON.parse(jsonStr);
} catch (error) {
console.error('yaml2Json error:', error);
return {};
}
const jsonStr = JSON.stringify(obj);
return JSON.parse(jsonStr);
};

export const customColors = [
Expand Down
17 changes: 15 additions & 2 deletions src/pages/cluster-management/components/cluster-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,23 @@ const ClusterForm: React.FC<AddModalProps> = forwardRef(
form.submit();
},
setFieldsValue: (values: any) => {
form.setFieldsValue(values);
form.setFieldsValue({
...values,
worker_config: undefined
});
const workerConfigYaml = json2Yaml(values.worker_config || {});
advanceConfigRef.current?.setYamlValue(workerConfigYaml);
},
getFieldsValue: () => {
return form.getFieldsValue();
const workerConfig = yaml2Json(
advanceConfigRef.current?.getYamlValue()
);
return {
...form.getFieldsValue(),
worker_config: {
...workerConfig
}
};
},
validateFields: async () => {
const values = await form.validateFields();
Expand Down