Refactor/socket controller (#212)

* refactor(socket): dictionary cleanup
* refactor(socket): detangle socket from EventTimer
* refactor(socket): poll object
* refactor(socket): wip, extract data responsibilities to provider
* fix: issue with onAir
* refactor: create data provider and validation utils
* refactor: remove deprecated endpoint
* refactor: detangle and validate ontime controller
* refactor: detangle and validate events controller
* refactor: validate routers
* refactor: handle post failure in modals

client/src/common/api/ontimeApi.js

@@ -165,12 +165,6 @@ export const getInfo = async () => {
   return res.data;
 };
 
-/**
- * @description HTTP request to mutate application info
- * @return {Promise}
- */
-export const postInfo = async (data) => axios.post(`${ontimeURL}/info`, data);
-
 /**
  * @description HTTP request to retrieve view settings
  * @return {Promise}

client/src/features/modals/AppSettingsModal.jsx

@@ -58,6 +58,7 @@ export default function AppSettingsModal() {
     setSubmitting(true);
 
     // set context
+    // TODO: add fast-equals here and check if event settings have changed
     saveEventSettings(formSettings);
     const validation = { isValid: false };
 
@@ -83,12 +84,17 @@ export default function AppSettingsModal() {
     if (!validation.isValid) {
       emitError(`Invalid Input: ${validation.message}`);
     } else {
-      await postSettings(formData);
-      await refetch();
+      try {
+        await postSettings(formData);
+      } catch (error) {
+        emitError(`Error saving settings: ${error}`)
+      } finally {
+        await refetch();
+        setChanged(false);
+      }
       validation?.message && emitWarning(validation.message);
     }
     setSubmitting(false);
-    setChanged(false);
   };
 
   /**

client/src/features/modals/EventSettingsModal.jsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useContext, useEffect, useState } from 'react';
 import { ModalBody } from '@chakra-ui/modal';
 import { FormLabel, Input, Textarea } from '@chakra-ui/react';
 import { EVENT_TABLE } from 'common/api/apiConstants';
@@ -6,6 +6,7 @@ import { fetchEvent, postEvent } from 'common/api/eventApi';
 import { useFetch } from 'common/hooks/useFetch';
 
 import { eventPlaceholderSettings } from '../../common/api/ontimeApi';
+import { LoggingContext } from '../../common/context/LoggingContext';
 
 import { inputProps } from './modalHelper';
 import SubmitContainer from './SubmitContainer';
@@ -14,6 +15,7 @@ import style from './Modals.module.scss';
 
 export default function SettingsModal() {
   const { data, status, refetch } = useFetch(EVENT_TABLE, fetchEvent);
+  const { emitError } = useContext(LoggingContext);
   const [formData, setFormData] = useState(eventPlaceholderSettings);
   const [changed, setChanged] = useState(false);
   const [submitting, setSubmitting] = useState(false);
@@ -42,13 +44,18 @@ export default function SettingsModal() {
       event.preventDefault();
       setSubmitting(true);
 
-      await postEvent(formData);
-      await refetch();
+      try {
+        await postEvent(formData);
+      } catch (error) {
+        emitError(`Error saving event settings: ${error}`)
+      } finally {
+        await refetch();
+        setChanged(false);
+      }
 
-      setChanged(false);
       setSubmitting(false);
     },
-    [formData, refetch]
+    [emitError, formData, refetch]
   );
 
   /**

client/src/features/modals/IntegrationSettingsModal.jsx

@@ -3,7 +3,7 @@ import { ModalBody } from '@chakra-ui/modal';
 import { FormControl, FormLabel, Input, Switch } from '@chakra-ui/react';
 import { FiInfo } from '@react-icons/all-files/fi/FiInfo';
 import { APP_TABLE } from 'common/api/apiConstants';
-import { getInfo, httpPlaceholder, ontimeVars, postInfo } from 'common/api/ontimeApi';
+import { getInfo, httpPlaceholder, ontimeVars } from 'common/api/ontimeApi';
 import { useFetch } from 'common/hooks/useFetch';
 
 import { LoggingContext } from '../../common/context/LoggingContext';
@@ -50,7 +50,7 @@ export default function IntegrationSettingsModal() {
       if (e.status) {
         emitError(`Invalid Input: ${e.message}`);
       } else {
-        await postInfo(f);
+        // call API endpoint here with value of f
         setChanged(false);
         setSubmitting(false);
       }

client/src/features/modals/OscSettingsModal.jsx

@@ -122,10 +122,14 @@ export default function OscSettingsModal() {
       if (e.status) {
         emitError(`Invalid Input: ${e.message}`);
       } else {
-        // Post here
-        await postOSC(formData);
-        await refetch();
-        setChanged(false);
+        try {
+          await postOSC(formData);
+        } catch (error){
+          emitError(`Error setting OSC: ${error}`)
+        } finally {
+          await refetch();
+          setChanged(false);
+        }
       }
       setSubmitting(false);
     },

client/src/features/modals/TableOptionsModal.jsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useContext, useEffect, useState } from 'react';
 import { ModalBody } from '@chakra-ui/modal';
 import { Input } from '@chakra-ui/react';
 import { IoInformationCircleOutline } from '@react-icons/all-files/io5/IoInformationCircleOutline';
@@ -6,6 +6,7 @@ import { USERFIELDS } from 'common/api/apiConstants';
 import { useFetch } from 'common/hooks/useFetch';
 
 import { getUserFields, postUserFields, userFieldsPlaceholder } from '../../common/api/ontimeApi';
+import { LoggingContext } from '../../common/context/LoggingContext';
 import { handleLinks, host } from '../../common/utils/linkUtils';
 
 import SubmitContainer from './SubmitContainer';
@@ -14,6 +15,7 @@ import style from './Modals.module.scss';
 
 export default function TableOptionsModal() {
   const { data, status, refetch } = useFetch(USERFIELDS, getUserFields);
+  const { emitError } = useContext(LoggingContext);
   const [changed, setChanged] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const [userFields, setUserFields] = useState(userFieldsPlaceholder);
@@ -43,13 +45,17 @@ export default function TableOptionsModal() {
     }
 
     if (!errors) {
-      await postUserFields(validatedFields);
+      try {
+        await postUserFields(validatedFields);
+      } catch (error) {
+        emitError(`Error saving table options: ${error}`)
+      }
       await refetch();
       setChanged(false);
     }
 
     setSubmitting(false);
-  },[refetch, userFields]);
+  },[emitError, refetch, userFields]);
 
   /**
    * Reverts local state equals to server state

client/src/features/modals/ViewsSettingsModal.jsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useContext, useEffect, useState } from 'react';
 import { ModalBody } from '@chakra-ui/modal';
 import { FormControl, FormLabel } from '@chakra-ui/react';
 import { IoInformationCircleOutline } from '@react-icons/all-files/io5/IoInformationCircleOutline';
@@ -6,6 +6,7 @@ import { IoInformationCircleOutline } from '@react-icons/all-files/io5/IoInforma
 import { VIEW_SETTINGS } from '../../common/api/apiConstants';
 import { getView, postView, viewsPlaceholder } from '../../common/api/ontimeApi';
 import EnableBtn from '../../common/components/buttons/EnableBtn';
+import { LoggingContext } from '../../common/context/LoggingContext';
 import { useFetch } from '../../common/hooks/useFetch';
 import { openLink } from '../../common/utils/linkUtils';
 
@@ -15,6 +16,7 @@ import style from './Modals.module.scss';
 
 export default function ViewsSettingsModal() {
   const { data, status, refetch } = useFetch(VIEW_SETTINGS, getView);
+  const { emitError } = useContext(LoggingContext);
   const [formData, setFormData] = useState(viewsPlaceholder);
   const [changed, setChanged] = useState(false);
   const [submitting, setSubmitting] = useState(false);
@@ -35,12 +37,17 @@ export default function ViewsSettingsModal() {
     async (event) => {
       event.preventDefault();
       setSubmitting(true);
-      await postView(formData);
-      await refetch();
-      setChanged(false);
+      try {
+        await postView(formData);
+      } catch (error) {
+        emitError(`Error view settings: ${error}`)
+      } finally{
+        await refetch();
+        setChanged(false);
+      }
       setSubmitting(false);
     },
-    [formData, refetch]
+    [emitError, formData, refetch]
   );
 
   /**