Updated form store

mudita · Oct 14, 2024 · 6fd8e0b · 6fd8e0b
1 parent 020d81e
commit 6fd8e0b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/libs/forms/feature/src/use-form-field.ts b/libs/forms/feature/src/use-form-field.ts
@@ -23,7 +23,7 @@ interface UseFormField {
   appForm?: boolean
 }
 
-export const useFormField = ({ formName, appForm }: UseFormField) => {
+export const useFormField = ({ formName, appForm }: UseFormField = {}) => {
   const dispatch = useDispatch<Dispatch>()
   const activeDeviceId = useSelector(selectActiveApiDeviceId)
   const store = useStore<ReduxRootState>()
@@ -50,8 +50,9 @@ export const useFormField = ({ formName, appForm }: UseFormField) => {
       if (!targetFormName || !field) return undefined
 
       const source = form || forms?.[targetFormName]
-      const fields = fromDefault ? source?.defaultFields : source?.fields
-      return get(fields, field) as T
+      if (!source) return
+      const fields = fromDefault ? source.defaultFields : source.fields
+      return get(fields, field) as T | undefined
     },
     [form, formName, forms]
   )
@@ -60,7 +61,6 @@ export const useFormField = ({ formName, appForm }: UseFormField) => {
     (field: string, value: unknown, { customFormName }: SetOptions = {}) => {
       const targetFormName = customFormName || formName
       if (!targetFormName || !field) return
-
       if (getField(field, { customFormName }) === value) return
       dispatch(
         setFormField({

diff --git a/libs/forms/feature/src/use-form-register.ts b/libs/forms/feature/src/use-form-register.ts
@@ -21,6 +21,7 @@ export const useFormRegister = ({ formName, appForm, options }: Params) => {
   const dispatch = useDispatch<Dispatch>()
   const activeDeviceId = useSelector(selectActiveApiDeviceId)
   const form = useSelector((state: ReduxRootState) => {
+    if(!appForm && !activeDeviceId) return undefined
     return selectForm(state, {
       formName,
       deviceId: appForm ? undefined : activeDeviceId,

diff --git a/libs/forms/store/src/reducer.ts b/libs/forms/store/src/reducer.ts
@@ -25,29 +25,32 @@ const initialState: FormState = {
 export const formsReducer = createReducer(initialState, (builder) => {
   builder.addCase(registerForm, (state, action) => {
     const { formName, form, deviceId } = action.payload
-    if (deviceId && deviceId !== appForms) {
-      state[deviceId] = {
-        ...state[deviceId],
-        [formName]: form,
-      }
-    } else {
-      state.app = {
-        ...state.app,
-        [formName]: form,
-      }
+    const source = deviceId
+      ? deviceId === appForms
+        ? undefined
+        : deviceId
+      : appForms
+
+    if (!source || !formName) return
+    state[source] = {
+      ...state[source],
+      [formName]: form,
     }
   })
   builder.addCase(setFormField, (state, action) => {
     const { formName, field, value, deviceId } = action.payload
-    if (deviceId && deviceId !== appForms) {
-      state[deviceId][formName].fields[field] = value
-    } else {
-      state.app[formName].fields[field] = value
-    }
+    const source = deviceId
+      ? deviceId === appForms
+        ? undefined
+        : deviceId
+      : appForms
+
+    if (!source || !state[source]?.[formName]) return
+    state[source][formName].fields[field] = value
   })
   builder.addCase(resetForm, (state, action) => {
     const { formName, deviceId } = action.payload
-    const defaultValues = state[deviceId ?? "app"][formName].defaultFields
+    const defaultValues = state[deviceId || "app"]?.[formName]?.defaultFields
 
     if (!defaultValues) return
     if (deviceId && deviceId !== appForms) {