From 05167f77e5c8a70433fd753624246591b1ad27d7 Mon Sep 17 00:00:00 2001
From: gingervitis <omqmail@gmail.com>
Date: Sun, 31 Jan 2021 22:07:00 -0800
Subject: [PATCH] adjust other status info areas

---
 .../components/config/edit-social-links.tsx   | 39 +++++++------------
 .../config/form-textfield-with-submit.tsx     | 13 +++----
 .../config/form-toggleswitch-with-submit.tsx  | 35 +++++++++--------
 web/styles/config-formfields.scss             | 11 +++++-
 4 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/web/pages/components/config/edit-social-links.tsx b/web/pages/components/config/edit-social-links.tsx
index 25f5f1626..ce2c9224f 100644
--- a/web/pages/components/config/edit-social-links.tsx
+++ b/web/pages/components/config/edit-social-links.tsx
@@ -9,12 +9,14 @@ import {
   API_SOCIAL_HANDLES,
   postConfigUpdateToAPI,
   RESET_TIMEOUT,
-  SUCCESS_STATES,
   DEFAULT_SOCIAL_HANDLE,
   OTHER_SOCIAL_HANDLE_OPTION,
 } from './constants';
-import { SocialHandle } from '../../../types/config-section';
+import { SocialHandle, UpdateArgs } from '../../../types/config-section';
 import { isValidUrl } from '../../../utils/urls';
+import TextField from './form-textfield';
+import { createInputStatus, STATUS_ERROR, STATUS_SUCCESS } from '../../../utils/input-statuses';
+import InputStatusInfo from './input-status-info';
 
 const { Title } = Typography;
 
@@ -31,7 +33,6 @@ export default function EditSocialLinks() {
   const [modalDataState, setModalDataState] = useState(DEFAULT_SOCIAL_HANDLE);
 
   const [submitStatus, setSubmitStatus] = useState(null);
-  const [submitStatusMessage, setSubmitStatusMessage] = useState('');
 
   const serverStatusData = useContext(ServerStatusContext);
   const { serverConfig, setFieldInConfigState } = serverStatusData || {};
@@ -71,7 +72,6 @@ export default function EditSocialLinks() {
 
   const resetStates = () => {
     setSubmitStatus(null);
-    setSubmitStatusMessage('');
     resetTimer = null;
     clearTimeout(resetTimer);
   };
@@ -106,8 +106,8 @@ export default function EditSocialLinks() {
     const { value } = event.target;
     updateModalState('platform', value);
   };
-  const handleUrlChange = event => {
-    const { value } = event.target;
+
+  const handleUrlChange = ({ value }: UpdateArgs) => {
     updateModalState('url', value);
   };
 
@@ -127,13 +127,12 @@ export default function EditSocialLinks() {
         setModalProcessing(false);
         handleModalCancel();
 
-        setSubmitStatus('success');
-        setSubmitStatusMessage('Social Handles updated.');
+        setSubmitStatus(createInputStatus(STATUS_SUCCESS));
+
         resetTimer = setTimeout(resetStates, RESET_TIMEOUT);
       },
       onError: (message: string) => {
-        setSubmitStatus('error');
-        setSubmitStatusMessage(message);
+        setSubmitStatus(createInputStatus(STATUS_ERROR, `There was an error: ${message}`));
         resetTimer = setTimeout(resetStates, RESET_TIMEOUT);
       },
     });
@@ -221,24 +220,16 @@ export default function EditSocialLinks() {
     },
   ];
 
-  const { icon: newStatusIcon = null, message: newStatusMessage = '' } =
-    SUCCESS_STATES[submitStatus] || {};
-  const statusMessage = (
-    <div className={`status-message ${submitStatus || ''}`}>
-      {newStatusIcon} {newStatusMessage} {submitStatusMessage}
-    </div>
-  );
-
   const okButtonProps = {
     disabled: !isValidUrl(modalDataState.url),
   };
 
   return (
-    <div className={`socialLinksEditor`}>
+    <div className="social-links-edit-container">
       <Title level={2}>Social Links</Title>
       <p>Add all your social media handles and links to your other profiles here.</p>
 
-      {statusMessage}
+      <InputStatusInfo status={submitStatus} />
 
       <Table
         className="dataTable"
@@ -273,14 +264,14 @@ export default function EditSocialLinks() {
           </>
         ) : null}
         <br />
-        URL
-        <Input
+        <TextField
+          fieldName="social-url"
+          label="URL"
           placeholder="Url to page"
-          defaultValue={modalDataState.url}
           value={modalDataState.url}
           onChange={handleUrlChange}
         />
-        {statusMessage}
+        <InputStatusInfo status={submitStatus} />
       </Modal>
       <br />
       <Button
diff --git a/web/pages/components/config/form-textfield-with-submit.tsx b/web/pages/components/config/form-textfield-with-submit.tsx
index e24690c31..a06c29982 100644
--- a/web/pages/components/config/form-textfield-with-submit.tsx
+++ b/web/pages/components/config/form-textfield-with-submit.tsx
@@ -28,7 +28,7 @@ interface TextFieldWithSubmitProps extends TextFieldProps {
 }
 
 export default function TextFieldWithSubmit(props: TextFieldWithSubmitProps) {
-  const [fieldStatus, setFieldStatus] = useState<StatusState>(null);
+  const [submitStatus, setSubmitStatus] = useState<StatusState>(null);
 
   const [hasChanged, setHasChanged] = useState(false);
 
@@ -48,7 +48,7 @@ export default function TextFieldWithSubmit(props: TextFieldWithSubmitProps) {
 
   // Clear out any validation states and messaging
   const resetStates = () => {
-    setFieldStatus(null);
+    setSubmitStatus(null);
     setHasChanged(false);
     clearTimeout(resetTimer);
     resetTimer = null;
@@ -84,17 +84,17 @@ export default function TextFieldWithSubmit(props: TextFieldWithSubmitProps) {
   // how to get current value of input
   const handleSubmit = async () => {
     if ((required && value !== '') || value !== initialValue) {
-      setFieldStatus(createInputStatus(STATUS_PROCESSING));
+      setSubmitStatus(createInputStatus(STATUS_PROCESSING));
 
       await postConfigUpdateToAPI({
         apiPath,
         data: { value },
         onSuccess: () => {
           setFieldInConfigState({ fieldName, value, path: configPath });
-          setFieldStatus(createInputStatus(STATUS_SUCCESS));
+          setSubmitStatus(createInputStatus(STATUS_SUCCESS));
         },
         onError: (message: string) => {
-          setFieldStatus(createInputStatus(STATUS_ERROR, `There was an error: ${message}`));
+          setSubmitStatus(createInputStatus(STATUS_ERROR, `There was an error: ${message}`));
         },
       });
       resetTimer = setTimeout(resetStates, RESET_TIMEOUT);
@@ -115,7 +115,6 @@ export default function TextFieldWithSubmit(props: TextFieldWithSubmitProps) {
       <div className="textfield-component">
         <TextField
           {...textFieldProps}
-          status={status || fieldStatus}
           onSubmit={null}
           onBlur={handleBlur}
           onChange={handleChange}
@@ -125,7 +124,7 @@ export default function TextFieldWithSubmit(props: TextFieldWithSubmitProps) {
         <p className="label-spacer" />
         <div className="lower-content">
           <div className="field-tip">{tip}</div>
-          <InputStatusInfo status={status || fieldStatus} />
+          <InputStatusInfo status={status || submitStatus} />
           <div className="update-button-container">
             <Button
               type="primary"
diff --git a/web/pages/components/config/form-toggleswitch-with-submit.tsx b/web/pages/components/config/form-toggleswitch-with-submit.tsx
index f0710fa3f..6410636d9 100644
--- a/web/pages/components/config/form-toggleswitch-with-submit.tsx
+++ b/web/pages/components/config/form-toggleswitch-with-submit.tsx
@@ -1,8 +1,15 @@
 import React, { useState, useContext } from 'react';
 import { Switch } from 'antd';
-import { FormItemProps } from 'antd/es/form';
+import {
+  createInputStatus,
+  StatusState,
+  STATUS_ERROR,
+  STATUS_PROCESSING,
+  STATUS_SUCCESS,
+} from '../../../utils/input-statuses';
+import InputStatusInfo from './input-status-info';
 
-import { RESET_TIMEOUT, SUCCESS_STATES, postConfigUpdateToAPI } from './constants';
+import { RESET_TIMEOUT, postConfigUpdateToAPI } from './constants';
 
 import { ServerStatusContext } from '../../../utils/server-status-context';
 import InfoTip from '../info-tip';
@@ -19,8 +26,7 @@ interface ToggleSwitchProps {
 }
 
 export default function ToggleSwitch(props: ToggleSwitchProps) {
-  const [submitStatus, setSubmitStatus] = useState<FormItemProps['validateStatus']>('');
-  const [submitStatusMessage, setSubmitStatusMessage] = useState('');
+  const [submitStatus, setSubmitStatus] = useState<StatusState>(null);
 
   let resetTimer = null;
 
@@ -30,37 +36,35 @@ export default function ToggleSwitch(props: ToggleSwitchProps) {
   const { apiPath, checked, configPath = '', disabled = false, fieldName, label, tip } = props;
 
   const resetStates = () => {
-    setSubmitStatus('');
+    setSubmitStatus(null);
     clearTimeout(resetTimer);
     resetTimer = null;
   };
 
   const handleChange = async (isChecked: boolean) => {
-    setSubmitStatus('validating');
+    setSubmitStatus(createInputStatus(STATUS_PROCESSING));
+
     await postConfigUpdateToAPI({
       apiPath,
       data: { value: isChecked },
       onSuccess: () => {
         setFieldInConfigState({ fieldName, value: isChecked, path: configPath });
-        setSubmitStatus('success');
+        setSubmitStatus(createInputStatus(STATUS_SUCCESS));
       },
       onError: (message: string) => {
-        setSubmitStatus('error');
-        setSubmitStatusMessage(`There was an error: ${message}`);
+        setSubmitStatus(createInputStatus(STATUS_ERROR, `There was an error: ${message}`));
       },
     });
     resetTimer = setTimeout(resetStates, RESET_TIMEOUT);
   };
 
-  const { icon: newStatusIcon = null, message: newStatusMessage = '' } =
-    SUCCESS_STATES[submitStatus] || {};
-
+  const loading = submitStatus !== null && submitStatus.type === STATUS_PROCESSING;
   return (
     <div className="toggleswitch-container">
       <div className="toggleswitch">
         <Switch
           className={`switch field-${fieldName}`}
-          loading={submitStatus === 'validating'}
+          loading={loading}
           onChange={handleChange}
           defaultChecked={checked}
           checked={checked}
@@ -71,11 +75,8 @@ export default function ToggleSwitch(props: ToggleSwitchProps) {
         <span className="label">
           {label} <InfoTip tip={tip} />
         </span>
-        {submitStatus}
-      </div>
-      <div className={`status-message ${submitStatus || ''}`}>
-        {newStatusIcon} {newStatusMessage} {submitStatusMessage}
       </div>
+      <InputStatusInfo status={submitStatus} />
     </div>
   );
 }
diff --git a/web/styles/config-formfields.scss b/web/styles/config-formfields.scss
index bb379031c..e49ce5c89 100644
--- a/web/styles/config-formfields.scss
+++ b/web/styles/config-formfields.scss
@@ -1,5 +1,6 @@
 // Base styles for form-textfield, form-textfield-with-submit, and helper components.
 
+/* STATUS-CONTAINER BASE */
 .status-container {
   &.status-success {
     color: var(--ant-success);
@@ -25,12 +26,15 @@
   }
 }
 
+
+/* TIP CONTAINER BASE */
 .field-tip {
   font-size: .7em;
-  color: rgba(255,255,255,.7)
+  color: rgba(255,255,255,.5)
 }
 
 
+/* TEXTFIELD-CONTAINER BASE */
 .textfield-container {
   display: flex;
   flex-direction: row;
@@ -99,7 +103,7 @@
   }
 }
 
-
+/* TEXTFIELD-WITH-SUBMIT-CONTAINER BASE */
 .textfield-with-submit-container {
   display: flex;
   flex-direction: column;
@@ -139,6 +143,9 @@
       }
       .status-container {
         margin: .5em;
+        &.empty {
+          display: none;
+        }
       }
     }
     .update-button-container {