fix bug edit algorithm form in Memory Field

kube-HPC · May 8, 2022 · 12b7481 · 12b7481
1 parent 1b5bd45
commit 12b7481
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/Routes/SidebarRight/AddAlgorithm/AddAlgorithmForm.react.js b/src/Routes/SidebarRight/AddAlgorithm/AddAlgorithmForm.react.js
@@ -101,6 +101,7 @@ const AddAlgorithmForm = ({ onToggle, onSubmit, algorithmValue }) => {
 
   useEffect(() => {
     // init values in fields
+
     if (keyValueObject !== undefined) {
       // Edit algorithm
       const schemaObjectForm = form.getFieldsValue();
@@ -109,6 +110,7 @@ const AddAlgorithmForm = ({ onToggle, onSubmit, algorithmValue }) => {
         flattenObjKeyValue(keyValueObject)
       );
       setBuildType(toSelectedBuildType(keyValueObject.type));
+
       form.setFieldsValue(objValuesForm);
     } else {
       // add new algorithm
@@ -279,7 +281,7 @@ const AddAlgorithmForm = ({ onToggle, onSubmit, algorithmValue }) => {
 AddAlgorithmForm.propTypes = {
   // TODO: detail the props
   // eslint-disable-next-line
-  algorithmValue: PropTypes.object,
+  algorithmValue: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   onToggle: PropTypes.func.isRequired,
   onSubmit: PropTypes.func,
 };

diff --git a/src/Routes/SidebarRight/AddAlgorithm/MemoryField.react.js b/src/Routes/SidebarRight/AddAlgorithm/MemoryField.react.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 
 import Icon from '@ant-design/icons';
@@ -12,18 +12,22 @@ const MemoryField = React.forwardRef(
   // eslint-disable-next-line
   ({ onChange, children, value, tooltipTitle, min, iconType }, ref) => {
     const [numberInitial, unitInitial] = parseUnit(value);
-
-    const [number, setNumber] = useState(numberInitial);
+    const [numberMem, setNumberMem] = useState(numberInitial);
     const [unit, setUnit] = useState(unitInitial);
 
+    useEffect(() => {
+      setNumberMem(numberInitial);
+      setUnit(unitInitial);
+    }, [numberInitial, unitInitial]);
+
     const onNumber = target => {
-      setNumber(target);
+      setNumberMem(target);
       onChange(target === null || target === '' ? null : `${target}${unit}`);
     };
 
     const onSelect = target => {
       setUnit(target);
-      onChange(number === null ? null : `${number}${target}`);
+      onChange(numberMem === null ? null : `${numberMem}${target}`);
     };
 
     const Wrapper = tooltipTitle ? Tooltip : React.Fragment;
@@ -34,7 +38,7 @@ const MemoryField = React.forwardRef(
       <Wrapper {...wrapperProps}>
         <Input.Group compact>
           {iconType && <Icon type={iconType} />}
-          <InputNumber min={min} value={number} onChange={onNumber} />
+          <InputNumber min={min} value={numberMem} onChange={onNumber} />
           <Select style={selectStyle} value={unit} onChange={onSelect}>
             {children}
           </Select>

diff --git a/src/Routes/SidebarRight/AddAlgorithm/index.js b/src/Routes/SidebarRight/AddAlgorithm/index.js
@@ -80,7 +80,8 @@ AddAlgorithm.propTypes = {
   // eslint-disable-next-line
   onSubmit: PropTypes.func,
   // eslint-disable-next-line react/forbid-prop-types
-  algorithmValue: PropTypes.object.isRequired,
+  algorithmValue: PropTypes.oneOfType([PropTypes.string, PropTypes.object])
+    .isRequired,
 };
 
 export default memo(AddAlgorithm);