pass field resetter and initial values as props down to custom input element

web/pages/components/config/defaults.ts

@@ -9,7 +9,7 @@ export const TEXT_MAXLENGTH = 255;
 
 // Creating this so that it'll be easier to change values in one place, rather than looking for places to change it in a sea of JSX.
 // key is the input's `fieldName`
-//serversummary
+
 export const TEXTFIELD_DEFAULTS = {
   name: {
     apiPath: '/name',
@@ -17,17 +17,63 @@ export const TEXTFIELD_DEFAULTS = {
     maxLength: TEXT_MAXLENGTH,
     placeholder: DEFAULT_NAME,
     configPath: 'instanceDetails',
-    label: 'Your name',
+    label: 'Server name',
     tip: 'This is your name that shows up on things and stuff.',
   },
 
   summary: {
-    apiPath: '/summary',
+    apiPath: '/serversummary',
     defaultValue: DEFAULT_NAME,
     maxLength: TEXT_MAXLENGTH,
     placeholder: DEFAULT_NAME,
     configPath: 'instanceDetails',
     label: 'Summary',
     tip: 'A brief blurb about what your stream is about.',
+  },
+  title: {
+    apiPath: '/servertitle',
+    defaultValue: DEFAULT_NAME,
+    maxLength: TEXT_MAXLENGTH,
+    placeholder: DEFAULT_NAME,
+    configPath: 'instanceDetails',
+    label: 'Server Title',
+    tip: 'A brief blurb about what your stream is about.',
+  },
+  streamTitle: {
+    apiPath: '/streamtitle',
+    defaultValue: DEFAULT_NAME,
+    maxLength: TEXT_MAXLENGTH,
+    placeholder: DEFAULT_NAME,
+    configPath: 'instanceDetails',
+    label: 'Stream Title',
+    tip: 'The name of your stream today.',
+  },
+
+  logo: {
+    apiPath: '/logo',
+    defaultValue: DEFAULT_NAME,
+    maxLength: TEXT_MAXLENGTH,
+    placeholder: DEFAULT_NAME,
+    configPath: 'instanceDetails',
+    label: 'Stream Title',
+    tip: 'A brief blurb about what your stream is about.',
+  },
+  streamKey: {
+    apiPath: '/key',
+    defaultValue: DEFAULT_NAME,
+    maxLength: TEXT_MAXLENGTH,
+    placeholder: DEFAULT_NAME,
+    configPath: 'instanceDetails',
+    label: 'Stream Key',
+    tip: 'Secret stream key',
+  },
+
+  pageContent: {
+    apiPath: '/pagecontent',
+    placeholder: '',
+    configPath: 'instanceDetails',
+    label: 'Stream Key',
+    tip: 'Custom markup about yourself',
   }
-}
+}
+

web/pages/components/config/form-textfield.tsx

@@ -14,10 +14,19 @@ save to local state/context.
 read vals from there.
 update vals to state, andthru api.
 
+TODO
+- no on blur
+- no onEnter
+- if values chnage, then show "submit" button next to it
+  - on blur hide submit button. on submit success, hide button, blur out?
+  - esc key to reset + blur?
+
+- if field clears, repop with orig value, if no orig vlaue, pop with default
+
 
 */
 import React, { useState, useContext } from 'react';
-import { Form, Input, Tooltip } from 'antd';
+import { Button, Form, Input, InputNumber, Tooltip } from 'antd';
 import { FormItemProps } from 'antd/es/form';
 
 import { InfoCircleOutlined } from '@ant-design/icons';
@@ -31,28 +40,45 @@ import { ServerStatusContext } from '../../../utils/server-status-context';
 export const TEXTFIELD_TYPE_TEXT = 'default';
 export const TEXTFIELD_TYPE_PASSWORD = 'password'; // Input.Password
 export const TEXTFIELD_TYPE_NUMBER = 'numeric';
+export const TEXTFIELD_TYPE_TEXTAREA = 'textarea';
+
 
 export default function TextField(props: TextFieldProps) {
   const [submitStatus, setSubmitStatus] = useState<FormItemProps['validateStatus']>('');
   const [submitStatusMessage, setSubmitStatusMessage] = useState('');
+  const [hasChanged, setHasChanged] = useState(false);
+  const [fieldValueForSubmit, setFieldValueForSubmit] = useState('');
+
+  let resetTimer = null;
+
   const serverStatusData = useContext(ServerStatusContext);
   const { setConfigField } = serverStatusData || {};
-
+  
-
   const {
     fieldName,
+    type,
+    initialValues = {},
+    handleResetValue,
   } = props;
 
+  const initialValue = initialValues[fieldName] || '';
+  
   const {
     apiPath = '',
-    defaultValue = '', // if empty
     configPath = '',
     maxLength = TEXT_MAXLENGTH,
-    placeholder = '',
+    // placeholder = '',
     label = '',
     tip = '',
   } = TEXTFIELD_DEFAULTS[fieldName] || {};
 
+  const resetStates = () => {
+    setSubmitStatus('');
+    setHasChanged(false);
+    clearTimeout(resetTimer);
+    resetTimer = null;
+  }
+
   const postUpdateToAPI = async (postValue: any) => {
     setSubmitStatus('validating');
     const result = await fetchData(`${SERVER_CONFIG_UPDATE_URL}${apiPath}`, {
@@ -63,51 +89,85 @@ export default function TextField(props: TextFieldProps) {
     if (result.success) {
       setConfigField({ fieldName, value: postValue, path: configPath });
       setSubmitStatus('success');
+      resetTimer = setTimeout(resetStates, 3000);
     } else {
       setSubmitStatus('warning');
       setSubmitStatusMessage(`There was an error: ${result.message}`);
     }
   };
 
-  const handleEnter = (event: React.KeyboardEvent<HTMLInputElement>) => {
+  const handleChange = e => {
-    const newValue = event.target.value;
+    const val = e.target.value;
-    if (newValue !== '') {
+    if (val === '' || val === initialValue) {
-      postUpdateToAPI(newValue);
+      setHasChanged(false);
-    }
-  }
-  const handleBlur = (event: React.FocusEvent<HTMLInputElement>) => {
-    const newValue = event.target.value;
-    if (newValue !== '') {
-      console.log("blur post..", newValue)
-      postUpdateToAPI(newValue);
     } else {
-      // event.target.value = value;
+      resetStates();
+      setHasChanged(true);
+      setFieldValueForSubmit(val);
+    }
+  };
+
+  const handleBlur = e => {
+    const val = e.target.value;
+    if (val === '') {
+      handleResetValue(fieldName);
+      // todo: find a way to reset to initial value
+    }
+  };
+
+  // how to get current value of input
+  const handleSubmit = () => {
+    if (fieldValueForSubmit !== '' && fieldValueForSubmit !== initialValue) {
+      postUpdateToAPI(fieldValueForSubmit);
     }
   }
 
+  let Field = Input;
+  let fieldProps = {};
+  if (type === TEXTFIELD_TYPE_TEXTAREA) {
+    Field = Input.TextArea;
+    fieldProps = {
+      autoSize: true,
+    };
+  } else if (type === TEXTFIELD_TYPE_PASSWORD) {
+    Field = Input.Password;
+    fieldProps = {
+      visibilityToggle: true,
+    };
+  } else if (type === TEXTFIELD_TYPE_NUMBER) {
+    Field = InputNumber;
+  }
+
    return (
-    <div className="textfield">
+    <div className="textfield-container">
-      <Form.Item
+      <div className="textfield">
-        label={label}
+       <span className="info">
-        name={fieldName}
+          <Tooltip title={tip}>
-        hasFeedback
+            <InfoCircleOutlined />
-        validateStatus={submitStatus}
+          </Tooltip>
-        help={submitStatusMessage}
+        </span>
-      >
+        <Form.Item
-       <Input
+          label={label}
-          className="field"
+          name={fieldName}
-          allowClear
+          hasFeedback
-          placeholder={placeholder}
+          validateStatus={submitStatus}
-          maxLength={maxLength}
+          help={submitStatusMessage}
-          onPressEnter={handleEnter}
+        >
-          // onBlur={handleBlur}
+        <Field
-        />
+            className="field"
-      </Form.Item>
+            allowClear
-      <div className="info">
+            placeholder={initialValue}
-        <Tooltip title={tip}>
+            maxLength={maxLength}
-          <InfoCircleOutlined />
+            onChange={handleChange}
-        </Tooltip>
+            onBlur={handleBlur}
+            {...fieldProps}
+          />
+        </Form.Item>
+   
       </div>
+
+      { hasChanged ? <Button type="primary" size="small" className="submit-button" onClick={handleSubmit}>Update</Button> : null }
+
     </div>
   ); 
 }

web/pages/components/config/public-facing-details.tsx

@@ -1,28 +1,33 @@
 import React, { useContext, useEffect } from 'react';
-import { Typography, Form, Input } from 'antd';
+import { Typography, Form } from 'antd';
 
-import TextField from './form-textfield';
+import TextField, { TEXTFIELD_TYPE_TEXTAREA } from './form-textfield';
 
 import { ServerStatusContext } from '../../../utils/server-status-context';
 
-import { UpdateArgs } from '../../../types/config-section';
-
 const { Title } = Typography;
 
 export default function PublicFacingDetails() {
   const [form] = Form.useForm();
 
   const serverStatusData = useContext(ServerStatusContext);
-  const { serverConfig, setConfigField } = serverStatusData || {};
+  const { serverConfig } = serverStatusData || {};
 
-  const { instanceDetails = {},  } = serverConfig;
+  const { instanceDetails = {} } = serverConfig;
-
-  const { name, summary, title } = instanceDetails;
   
   useEffect(() => {
     form.setFieldsValue({...instanceDetails});
   }, [instanceDetails]);
-  
+
+
+  const handleResetValue = (fieldName: string) => {
+    form.setFieldsValue({ [fieldName]: instanceDetails[fieldName]});
+  }
+
+  const extraProps = {
+    handleResetValue,
+    initialValues: instanceDetails,
+  };
 
   return (
     <>
@@ -34,8 +39,10 @@ export default function PublicFacingDetails() {
             form={form}
             layout="vertical"
           >
-            <TextField fieldName="name" />
+            <TextField fieldName="name" {...extraProps} />
-            <TextField fieldName="summary" />
+            <TextField fieldName="summary" type={TEXTFIELD_TYPE_TEXTAREA} {...extraProps} />
+            <TextField fieldName="title" {...extraProps} />
+            <TextField fieldName="streamTitle" {...extraProps} />
           </Form>
         </div>
         <div className="misc-optionals">

web/styles/config.scss

@@ -9,19 +9,37 @@
     margin-right: 1rem;
   }
 }
+.textfield-container {
+  // width: 28rem;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: flex-end;
+  position: relative;
+}
 
 .textfield {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
-  justify-content: flex-end;
 
   .field {
-    width: 20rem;
+    width: 18rem;
 
   }
   .info {
-    transform: translateY(.35rem);
+    margin-right: .75rem;
-    margin-left: .5rem;
+  }
+  .ant-form-item-label label {
+    font-weight: bold;
+    color: var(--owncast-purple);
+  }
+  .ant-form-item-explain {
+    width: 70%;
   }
 }
+.submit-button {
+  position: absolute;
+  right: 0;
+  bottom: 1em;
+}

web/types/config-section.ts

@@ -3,7 +3,7 @@
 export interface TextFieldProps {
   onUpdate: ({ fieldName, value }: UpdateArgs) => void;
   fieldName: string;
-  value: string;
+  initialValue: string;
   type: string;
 }