fix: enable mode when creating PhysicalMachineChaos with addresses (c…

…haos-mesh#3797) * fix: enable mode when creating PhysicalMachineChaos with addresses Signed-off-by: Yue Yang <[email protected]> * chore: update changelog Signed-off-by: Yue Yang <[email protected]> * fix: hasSelector Signed-off-by: Yue Yang <[email protected]> * fix: render Scope by hasSelector Signed-off-by: Yue Yang <[email protected]> Signed-off-by: Yue Yang <[email protected]>
FingerLeader · Nov 17, 2022 · d62eeb4 · d62eeb4
1 parent 042fb87
commit d62eeb4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,7 @@ For more information and how-to, see [RFC: Keep A Changelog](https://github.com/
 - Fix timechaos not injected into the child process [#3725](https://github.com/chaos-mesh/chaos-mesh/pull/3725)
 - Ignore `ScheduleSkipRemoveHistory` events to fix the memory of controller-manager keep increasing [#3761](https://github.com/chaos-mesh/chaos-mesh/issues/3761)
 - Update `is mandatory` to true in a swagger comment [#3743](https://github.com/chaos-mesh/chaos-mesh/pull/3743)
+- Enable mode when creating PhysicalMachineChaos with addresses in UI [#3797](https://github.com/chaos-mesh/chaos-mesh/pull/3797)
 
 ### Security
 

diff --git a/ui/app/src/components/AutoForm/data.ts b/ui/app/src/components/AutoForm/data.ts
@@ -18,18 +18,20 @@ import _ from 'lodash'
 
 export const podPhases = ['Pending', 'Running', 'Succeeded', 'Failed', 'Unknown']
 
-export const scopeInitialValues = {
-  selector: {
-    namespaces: [],
-    labelSelectors: [],
-    annotationSelectors: [],
-    podPhaseSelectors: [],
-    pods: [],
-    physicalMachines: [],
-  },
+export const scopeInitialValues = ({ hasSelector }: { hasSelector: boolean }) => ({
+  ...(hasSelector && {
+    selector: {
+      namespaces: [],
+      labelSelectors: [],
+      annotationSelectors: [],
+      podPhaseSelectors: [],
+      pods: [],
+      physicalMachines: [],
+    },
+  }),
   mode: 'all',
   value: undefined,
-}
+})
 
 export interface Schedule {
   schedule: string

diff --git a/ui/app/src/components/AutoForm/index.tsx b/ui/app/src/components/AutoForm/index.tsx
@@ -30,6 +30,7 @@ import { useStoreSelector } from 'store'
 import { AutocompleteField, SelectField, Submit, TextField, TextTextField } from 'components/FormField'
 import { SpecialTemplateType } from 'components/NewWorkflowNext/utils/convert'
 import Scope from 'components/Scope'
+import Mode from 'components/Scope/Mode'
 import { T } from 'components/T'
 
 import { concatKindAction } from 'lib/utils'
@@ -69,19 +70,18 @@ const AutoForm: React.FC<AutoFormProps> = ({ belong = Belong.Experiment, id, kin
 
   const { useNewPhysicalMachine } = useStoreSelector((state) => state.settings)
   const noScope =
-    kind === SpecialTemplateType.Suspend ||
-    kind === SpecialTemplateType.Serial ||
-    kind === SpecialTemplateType.Parallel ||
-    (kind === 'PhysicalMachineChaos' && !useNewPhysicalMachine)
+    kind === SpecialTemplateType.Suspend || kind === SpecialTemplateType.Serial || kind === SpecialTemplateType.Parallel
 
   const [initialValues, setInitialValues] = useState<FormikValues>({
     id,
     kind,
     action,
-    ...(kind === 'NetworkChaos' && { target: scopeInitialValues }),
-    ...(!noScope && scopeInitialValues),
+    ...(kind === 'NetworkChaos' && { target: scopeInitialValues({ hasSelector: true }) }),
+    ...(!noScope &&
+      scopeInitialValues({ hasSelector: kind === 'PhysicalMachineChaos' && !useNewPhysicalMachine ? false : true })),
     ...(belong === Belong.Workflow && { ...workflowNodeInfoInitialValues, templateType: kind }),
   })
+  const hasSelector = !!initialValues.selector
   const [form, setForm] = useState<AtomFormData[]>([])
   const [scheduled, setScheduled] = useState(false)
 
@@ -343,12 +343,14 @@ const AutoForm: React.FC<AutoFormProps> = ({ belong = Belong.Experiment, id, kin
                   <Typography variant="h6">
                     <T id="newE.steps.scope" />
                   </Typography>
-                  {useNewPhysicalMachine && (
+                  {hasSelector ? (
                     <Scope
                       env={kind === 'PhysicalMachineChaos' ? 'physic' : 'k8s'}
                       kind={kind}
                       namespaces={namespaces}
                     />
+                  ) : (
+                    <Mode scope="selector" modeScope="" />
                   )}
                   <Divider />
                   <Box>

diff --git a/ui/app/src/lib/localStorage.ts b/ui/app/src/lib/localStorage.ts
@@ -21,22 +21,22 @@ export default class LocalStorage {
   static ls = window.localStorage
 
   static get(key: string) {
-    return LocalStorage.ls.getItem(PREFIX + key)
+    return this.ls.getItem(PREFIX + key)
   }
 
   static getObj(key: string) {
-    return JSON.parse(LocalStorage.get(key) ?? '{}')
+    return JSON.parse(this.get(key) ?? '{}')
   }
 
   static set(key: string, val: string) {
-    LocalStorage.ls.setItem(PREFIX + key, val)
+    this.ls.setItem(PREFIX + key, val)
   }
 
   static setObj(key: string, obj: any) {
-    LocalStorage.set(key, JSON.stringify(obj))
+    this.set(key, JSON.stringify(obj))
   }
 
   static remove(key: string) {
-    LocalStorage.ls.removeItem(PREFIX + key)
+    this.ls.removeItem(PREFIX + key)
   }
 }