🏗 WIP fixes for AirDCPP socket connection Part Deux

src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx

@@ -1,4 +1,4 @@
-import React, { ReactElement, useCallback, useContext } from "react";
+import React, { ReactElement, useCallback, useContext, useEffect } from "react";
 import { Form, Field } from "react-final-form";
 import { useDispatch } from "react-redux";
 import { saveSettings, deleteSettings } from "../../actions/settings.actions";
@@ -8,33 +8,29 @@ import { isUndefined, isEmpty, isNil } from "lodash";
 
 export const AirDCPPSettingsForm = (): ReactElement => {
   const dispatch = useDispatch();
-  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-  const { AirDCPPSocket, settings } = airDCPPConfiguration;
-
-  const onSubmit = async (values) => {
+  const airDCPPSettings = useContext(AirDCPPSocketContext);
+  const onSubmit = useCallback(async (values) => {
     try {
-      if (!isNil(AirDCPPSocket.session_id)) {
-        dispatch(
-          saveSettings({
-            host: values,
-            airDCPPUserSettings: settings,
-          }),
-        );
-      }
+      airDCPPSettings.setSettings(values);
+      dispatch(
+        saveSettings({
+          host: values,
+        }),
+      );
     } catch (error) {
       console.log(error);
     }
-  };
-
+  }, []);
   const removeSettings = useCallback(async () => {
     dispatch(deleteSettings());
   }, []);
-
   const validate = async () => {};
-  const initFormData =
-    !isEmpty(settings.directConnect) || !isUndefined(settings.directConnect)
-      ? settings.directConnect.client.host
-      : {};
+
+  // const initFormData = !isUndefined(airDCPPSettings)
+  //   ? airDCPPSettings.airDCPPState.settings.directConnect.client.host
+  //   : {};
+  const initFormData = {};
+
   return (
     <>
       <Form
@@ -111,17 +107,20 @@ export const AirDCPPSettingsForm = (): ReactElement => {
           </form>
         )}
       />
-      {!isEmpty(settings) ? (
-        <AirDCPPSettingsConfirmation settings={settings} />
+      {!isUndefined(airDCPPSettings.airDCPPState.socketConnectionInformation) ? (
+        <AirDCPPSettingsConfirmation
+          settings={airDCPPSettings.airDCPPState.socketConnectionInformation}
+        />
       ) : null}
 
-      {!isEmpty(settings) ? (
+      {/* {!isUndefined(settings) &&
+      !isEmpty(settings.directConnect.client.airDCPPUserSettings) ? (
         <p className="control mt-4">
           <button className="button is-danger" onClick={removeSettings}>
             Delete
           </button>
         </p>
-      ) : null}
+      ) : null} */}
     </>
   );
 };