From d0eb1446f3a79b778c45b9bd679f74e4d87aa9cb Mon Sep 17 00:00:00 2001
From: gingervitis <omqmail@gmail.com>
Date: Sat, 22 May 2021 23:27:51 -0700
Subject: [PATCH] fixes for various admin issues (#181)

* up max char count for variant name to fix https://github.com/owncast/owncast/issues/1037

* max widthing the line chart canvas size so it scales with the page.
fixes
- https://github.com/owncast/owncast/issues/842
- https://github.com/owncast/owncast/issues/1024

* A fix to make Storage Endpoint URL validation have better feedback.

- give the field a type of "url"
- give the field a pattern to check
- have native browser handle the validation
- if the field is invalid, use :invalid selector to turn the text red on blur.

fixes: https://github.com/owncast/owncast/issues/1000

* a fix for https://github.com/owncast/owncast/issues/874

* - fixes for https://github.com/owncast/owncast/issues/972
Add optional prop to text field to trim() whitespaces from field. Apply logic to mostly url fields.

- move textfield blur if invalid turn red to globaal

* - a fix for bug:  https://github.com/owncast/owncast/issues/998
don't return null if platform name not found because its custom.

- clean up react key problem on socialhandles table

* fix react key issue on Actions table

* fix for https://github.com/owncast/owncast/issues/1008 to display 'other' field when editing an item not in predefined social list

* clean up other potential react key warnings

* Prettified Code!

Co-authored-by: gingervitis <gingervitis@users.noreply.github.com>
---
 web/components/config/edit-social-links.tsx   | 30 ++++++++++++---
 .../config/form-textfield-with-submit.tsx     |  3 +-
 web/components/config/form-textfield.tsx      | 13 +++++--
 .../config/video-codec-selector.tsx           |  4 +-
 web/components/config/video-variant-form.tsx  |  2 +-
 web/pages/actions.tsx                         | 37 +++++++++++++------
 web/pages/config-video.tsx                    |  2 +-
 web/pages/hardware-info.tsx                   |  6 +--
 web/pages/help.tsx                            |  8 ++--
 web/pages/upgrade.tsx                         | 10 ++++-
 web/pages/webhooks.tsx                        | 23 ++++++++----
 web/styles/config-video-variants.scss         |  5 +++
 web/styles/globals.scss                       | 14 +++++++
 web/utils/config-constants.tsx                | 15 +++++++-
 web/utils/urls.ts                             |  3 ++
 15 files changed, 132 insertions(+), 43 deletions(-)

diff --git a/web/components/config/edit-social-links.tsx b/web/components/config/edit-social-links.tsx
index 0b7d4ebbb..d51b43463 100644
--- a/web/components/config/edit-social-links.tsx
+++ b/web/components/config/edit-social-links.tsx
@@ -13,7 +13,7 @@ import {
   OTHER_SOCIAL_HANDLE_OPTION,
 } from '../../utils/config-constants';
 import { SocialHandle, UpdateArgs } from '../../types/config-section';
-import isValidUrl from '../../utils/urls';
+import isValidUrl, { DEFAULT_TEXTFIELD_URL_PATTERN } from '../../utils/urls';
 import TextField from './form-textfield';
 import { createInputStatus, STATUS_ERROR, STATUS_SUCCESS } from '../../utils/input-statuses';
 import FormStatusIndicator from './form-status-indicator';
@@ -62,6 +62,10 @@ export default function EditSocialLinks() {
     }
   };
 
+  const isPredefinedSocial = (platform: string) => {
+    return availableIconsList.find(item => item.key === platform) || false;
+  };
+
   const selectedOther =
     modalDataState.platform !== '' &&
     !availableIconsList.find(item => item.key === modalDataState.platform);
@@ -172,9 +176,18 @@ export default function EditSocialLinks() {
       key: 'combo',
       render: (data, record) => {
         const { platform, url } = record;
-        const platformInfo = availableIconsList.find(item => item.key === platform);
+        const platformInfo = isPredefinedSocial(platform);
+
+        // custom platform case
         if (!platformInfo) {
-          return platform;
+          return (
+            <div className="social-handle-cell">
+              <p className="option-label">
+                <strong>{platform}</strong>
+                <span className="handle-url" title={url}>{url}</span>
+              </p>
+            </div>
+          );
         }
         const { icon, platform: platformName } = platformInfo;
         const iconUrl = NEXT_PUBLIC_API_HOST + `${icon.slice(1)}`;
@@ -201,9 +214,13 @@ export default function EditSocialLinks() {
           <Button
             size="small"
             onClick={() => {
+              const platformInfo = currentSocialHandles[index];
               setEditId(index);
-              setModalDataState({ ...currentSocialHandles[index] });
+              setModalDataState({ ...platformInfo });
               setDisplayModal(true);
+              if (!isPredefinedSocial(platformInfo.platform)) {
+                setDisplayOther(true);
+              }
             }}
           >
             Edit
@@ -251,7 +268,7 @@ export default function EditSocialLinks() {
         className="social-handles-table"
         pagination={false}
         size="small"
-        rowKey={record => record.url}
+        rowKey={record => `${record.platform}-${record.url}`}
         columns={socialHandlesColumns}
         dataSource={currentSocialHandles}
       />
@@ -278,6 +295,9 @@ export default function EditSocialLinks() {
             placeholder={PLACEHOLDERS[modalDataState.platform] || 'Url to page'}
             value={modalDataState.url}
             onChange={handleUrlChange}
+            useTrim
+            type="url"
+            pattern={DEFAULT_TEXTFIELD_URL_PATTERN}
           />
           <FormStatusIndicator status={submitStatus} />
         </div>
diff --git a/web/components/config/form-textfield-with-submit.tsx b/web/components/config/form-textfield-with-submit.tsx
index 00105daec..33aec1498 100644
--- a/web/components/config/form-textfield-with-submit.tsx
+++ b/web/components/config/form-textfield-with-submit.tsx
@@ -41,6 +41,7 @@ export default function TextFieldWithSubmit(props: TextFieldWithSubmitProps) {
     apiPath,
     configPath = '',
     initialValue,
+    useTrim,
     ...textFieldProps // rest of props
   } = props;
 
@@ -70,7 +71,7 @@ export default function TextFieldWithSubmit(props: TextFieldWithSubmitProps) {
   // if field is required but value is empty, or equals initial value, then don't show submit/update button. otherwise clear out any result messaging and display button.
   const handleChange = ({ fieldName: changedFieldName, value: changedValue }: UpdateArgs) => {
     if (onChange) {
-      onChange({ fieldName: changedFieldName, value: changedValue });
+      onChange({ fieldName: changedFieldName, value: useTrim ? changedValue.trim() : changedValue });
     }
   };
 
diff --git a/web/components/config/form-textfield.tsx b/web/components/config/form-textfield.tsx
index c0523f141..ea71730cf 100644
--- a/web/components/config/form-textfield.tsx
+++ b/web/components/config/form-textfield.tsx
@@ -22,11 +22,13 @@ export interface TextFieldProps {
   disabled?: boolean;
   label?: string;
   maxLength?: number;
+  pattern?: string;
   placeholder?: string;
   required?: boolean;
   status?: StatusState;
   tip?: string;
   type?: string;
+  useTrim?: boolean;
   value?: string | number;
   onBlur?: FieldUpdaterFunc;
   onChange?: FieldUpdaterFunc;
@@ -42,20 +44,21 @@ export default function TextField(props: TextFieldProps) {
     onBlur,
     onChange,
     onPressEnter,
+    pattern,
     placeholder,
     required,
     status,
     tip,
     type,
+    useTrim,
     value,
   } = props;
 
-  // if field is required but value is empty, or equals initial value, then don't show submit/update button. otherwise clear out any result messaging and display button.
   const handleChange = (e: any) => {
-    const val = type === TEXTFIELD_TYPE_NUMBER ? e : e.target.value;
     // if an extra onChange handler was sent in as a prop, let's run that too.
     if (onChange) {
-      onChange({ fieldName, value: val });
+      const val = type === TEXTFIELD_TYPE_NUMBER ? e : e.target.value;
+      onChange({ fieldName, value: useTrim ? val.trim() : val });
     }
   };
 
@@ -100,6 +103,7 @@ export default function TextField(props: TextFieldProps) {
   } else if (type === TEXTFIELD_TYPE_URL) {
     fieldProps = {
       type: 'url',
+      pattern,
     };
   }
 
@@ -114,6 +118,7 @@ export default function TextField(props: TextFieldProps) {
     required,
     [`status-${statusType}`]: status,
   });
+
   return (
     <div className={containerClass}>
       {label ? (
@@ -130,7 +135,7 @@ export default function TextField(props: TextFieldProps) {
             id={fieldId}
             className={`field ${className} ${fieldId}`}
             {...fieldProps}
-            allowClear
+            {...(type !== TEXTFIELD_TYPE_NUMBER && { allowClear: true })}
             placeholder={placeholder}
             maxLength={maxLength}
             onChange={handleChange}
diff --git a/web/components/config/video-codec-selector.tsx b/web/components/config/video-codec-selector.tsx
index db7dbc399..6a9489f39 100644
--- a/web/components/config/video-codec-selector.tsx
+++ b/web/components/config/video-codec-selector.tsx
@@ -120,7 +120,7 @@ export default function CodecSelector() {
       <Title level={3} className="section-title">
         Video Codec
       </Title>
-      <p className="description">
+      <div className="description">
         If you have access to specific hardware with the drivers and software installed for them,
         you may be able to improve your video encoding performance.
         <p>
@@ -133,7 +133,7 @@ export default function CodecSelector() {
             unplayable.
           </a>
         </p>
-      </p>
+      </div>
       <div className="segment-slider-container">
         <Popconfirm
           title={`Are you sure you want to change your video codec to ${pendingSaveCodec} and understand what this means?`}
diff --git a/web/components/config/video-variant-form.tsx b/web/components/config/video-variant-form.tsx
index 84fea3338..4c14991b7 100644
--- a/web/components/config/video-variant-form.tsx
+++ b/web/components/config/video-variant-form.tsx
@@ -153,7 +153,7 @@ export default function VideoVariantForm({
               <p className="selected-value-note">{cpuUsageNote()}</p>
             </div>
             <p className="read-more-subtext">
-              This could mean GPU or CPU usage depending on your server environment. {' '}
+              This could mean GPU or CPU usage depending on your server environment.{' '}
               <a
                 href="https://owncast.online/docs/video/?source=admin#cpu-usage"
                 target="_blank"
diff --git a/web/pages/actions.tsx b/web/pages/actions.tsx
index a39081842..4c5e489ed 100644
--- a/web/pages/actions.tsx
+++ b/web/pages/actions.tsx
@@ -4,7 +4,7 @@ import React, { useState, useEffect, useContext } from 'react';
 import { Table, Space, Button, Modal, Checkbox, Input, Typography } from 'antd';
 import { ServerStatusContext } from '../utils/server-status-context';
 import { DeleteOutlined } from '@ant-design/icons';
-import isValidUrl from '../utils/urls';
+import isValidUrl, { DEFAULT_TEXTFIELD_URL_PATTERN } from '../utils/urls';
 import FormStatusIndicator from '../components/config/form-status-indicator';
 import {
   createInputStatus,
@@ -41,12 +41,12 @@ function NewActionModal(props: Props) {
 
   function save() {
     onOk(actionUrl, actionTitle, actionDescription, actionIcon, actionColor, openExternally);
-    setActionUrl('')
-    setActionTitle('')
-    setActionDescription('')
-    setActionIcon('')
-    setActionColor('')
-    setOpenExternally(false)
+    setActionUrl('');
+    setActionTitle('');
+    setActionDescription('');
+    setActionIcon('');
+    setActionColor('');
+    setOpenExternally(false);
   }
 
   function canSave(): Boolean {
@@ -91,7 +91,9 @@ function NewActionModal(props: Props) {
             value={actionUrl}
             required
             placeholder="https://myserver.com/action (required)"
-            onChange={input => setActionUrl(input.currentTarget.value)}
+            onChange={input => setActionUrl(input.currentTarget.value.trim())}
+            type="url"
+            pattern={DEFAULT_TEXTFIELD_URL_PATTERN}
           />
         </p>
         <p>
@@ -184,7 +186,7 @@ export default function Actions() {
       dataIndex: 'icon',
       key: 'icon',
       render: (url: string) => {
-        return url ? <img style={{width: '2vw'}} src={url} /> : null;
+        return url ? <img style={{ width: '2vw' }} src={url} /> : null;
       },
     },
     {
@@ -289,11 +291,22 @@ export default function Actions() {
       </Paragraph>
       <Paragraph>
         Read more about how to use actions, with examples, at{' '}
-        <a href="https://owncast.online/thirdparty/?source=admin" target="_blank"
-          rel="noopener noreferrer">our documentation</a>.
+        <a
+          href="https://owncast.online/thirdparty/?source=admin"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          our documentation
+        </a>
+        .
       </Paragraph>
 
-      <Table rowKey="id" columns={columns} dataSource={actions} pagination={false} />
+      <Table
+        rowKey={record => `${record.title}-${record.url}`}
+        columns={columns}
+        dataSource={actions}
+        pagination={false}
+      />
       <br />
       <Button type="primary" onClick={showCreateModal}>
         Create New Action
diff --git a/web/pages/config-video.tsx b/web/pages/config-video.tsx
index 9e25743c8..560d94d0d 100644
--- a/web/pages/config-video.tsx
+++ b/web/pages/config-video.tsx
@@ -37,7 +37,7 @@ export default function ConfigVideoSettings() {
             <VideoLatency />
           </div>
 
-          <Collapse className="advanced-settings">
+          <Collapse className="advanced-settings codec-module">
             <Panel header="Advanced Settings" key="1">
               <div className="form-module variants-table-module">
                 <VideoCodecSelector />
diff --git a/web/pages/hardware-info.tsx b/web/pages/hardware-info.tsx
index bb2a3779f..aa0433b91 100644
--- a/web/pages/hardware-info.tsx
+++ b/web/pages/hardware-info.tsx
@@ -75,7 +75,7 @@ export default function HardwareInfo() {
           <Col>
             <StatisticItem
               title={series[0].name}
-              value={`${currentCPUUsage}`}
+              value={`${currentCPUUsage || 0}`}
               prefix={<LaptopOutlined style={{ color: series[0].color }} />}
               color={series[0].color}
               progress
@@ -85,7 +85,7 @@ export default function HardwareInfo() {
           <Col>
             <StatisticItem
               title={series[1].name}
-              value={`${currentRamUsage}`}
+              value={`${currentRamUsage || 0}`}
               prefix={<BulbOutlined style={{ color: series[1].color }} />}
               color={series[1].color}
               progress
@@ -95,7 +95,7 @@ export default function HardwareInfo() {
           <Col>
             <StatisticItem
               title={series[2].name}
-              value={`${currentDiskUsage}`}
+              value={`${currentDiskUsage || 0}`}
               prefix={<SaveOutlined style={{ color: series[2].color }} />}
               color={series[2].color}
               progress
diff --git a/web/pages/help.tsx b/web/pages/help.tsx
index bc9349698..76191d7b0 100644
--- a/web/pages/help.tsx
+++ b/web/pages/help.tsx
@@ -205,8 +205,8 @@ export default function Help() {
       <Title level={2}>Common tasks</Title>
       <Row gutter={[16, 16]}>
         {questions.map(question => (
-          <Col xs={24} lg={12}>
-            <Card key={question.title}>
+          <Col xs={24} lg={12} key={question.title}>
+            <Card>
               <Meta avatar={question.icon} title={question.title} description={question.content} />
             </Card>
           </Col>
@@ -216,8 +216,8 @@ export default function Help() {
       <Title level={2}>Other</Title>
       <Row gutter={[16, 16]}>
         {otherResources.map(question => (
-          <Col xs={24} lg={12}>
-            <Card key={question.title}>
+          <Col xs={24} lg={12} key={question.title}>
+            <Card>
               <Meta avatar={question.icon} title={question.title} description={question.content} />
             </Card>
           </Col>
diff --git a/web/pages/upgrade.tsx b/web/pages/upgrade.tsx
index c5a3795f2..c19326c9c 100644
--- a/web/pages/upgrade.tsx
+++ b/web/pages/upgrade.tsx
@@ -23,7 +23,15 @@ function AssetTable(assets) {
     },
   ];
 
-  return <Table dataSource={data} columns={columns} rowKey="id" size="large" pagination={false} />;
+  return (
+    <Table
+      dataSource={data}
+      columns={columns}
+      rowKey={record => record.id}
+      size="large"
+      pagination={false}
+    />
+  );
 }
 
 export default function Logs() {
diff --git a/web/pages/webhooks.tsx b/web/pages/webhooks.tsx
index 2e94b4d5d..d508fe203 100644
--- a/web/pages/webhooks.tsx
+++ b/web/pages/webhooks.tsx
@@ -13,7 +13,7 @@ import {
   Col,
 } from 'antd';
 import { DeleteOutlined } from '@ant-design/icons';
-import isValidUrl from '../utils/urls';
+import isValidUrl, { DEFAULT_TEXTFIELD_URL_PATTERN } from '../utils/urls';
 
 import { fetchData, DELETE_WEBHOOK, CREATE_WEBHOOK, WEBHOOKS } from '../utils/apis';
 
@@ -86,7 +86,11 @@ function NewWebhookModal(props: Props) {
   };
 
   const checkboxes = events.map(function (singleEvent) {
-    return (<Col span={8} key={singleEvent.value}><Checkbox value={singleEvent.value}>{singleEvent.label}</Checkbox></Col>)
+    return (
+      <Col span={8} key={singleEvent.value}>
+        <Checkbox value={singleEvent.value}>{singleEvent.label}</Checkbox>
+      </Col>
+    );
   });
 
   return (
@@ -101,15 +105,15 @@ function NewWebhookModal(props: Props) {
         <Input
           value={webhookUrl}
           placeholder="https://myserver.com/webhook"
-          onChange={input => setWebhookUrl(input.currentTarget.value)}
+          onChange={input => setWebhookUrl(input.currentTarget.value.trim())}
+          type="url"
+          pattern={DEFAULT_TEXTFIELD_URL_PATTERN}
         />
       </div>
 
       <p>Select the events that will be sent to this webhook.</p>
       <Checkbox.Group style={{ width: '100%' }} value={selectedEvents} onChange={onChange}>
-        <Row>
-          {checkboxes}
-        </Row>
+        <Row>{checkboxes}</Row>
       </Checkbox.Group>
       <p>
         <Button type="primary" onClick={selectAll}>
@@ -225,7 +229,12 @@ export default function Webhooks() {
         .
       </Paragraph>
 
-      <Table rowKey="id" columns={columns} dataSource={webhooks} pagination={false} />
+      <Table
+        rowKey={record => record.id}
+        columns={columns}
+        dataSource={webhooks}
+        pagination={false}
+      />
       <br />
       <Button type="primary" onClick={showCreateModal}>
         Create Webhook
diff --git a/web/styles/config-video-variants.scss b/web/styles/config-video-variants.scss
index 9d3e556c9..464d605c5 100644
--- a/web/styles/config-video-variants.scss
+++ b/web/styles/config-video-variants.scss
@@ -62,3 +62,8 @@
 .read-more-subtext {
   font-size: 0.8rem;
 }
+.codec-module {
+  .ant-collapse-content-active {
+    background-color: var(--white-15);
+  }
+}
diff --git a/web/styles/globals.scss b/web/styles/globals.scss
index 91ae2ac7e..3b71b9944 100644
--- a/web/styles/globals.scss
+++ b/web/styles/globals.scss
@@ -30,6 +30,7 @@ a {
 
 p,
 p.description,
+.description,
 .ant-typography {
   font-weight: 300;
   margin: 1em 0;
@@ -65,6 +66,10 @@ strong {
   margin: 2em auto;
   padding: 1em;
   border: 1px solid var(--gray-dark);
+
+  canvas {
+    max-width: 100%;
+  }
 }
 
 .form-module {
@@ -106,3 +111,12 @@ strong {
     font-size: 0.92em;
   }
 }
+
+
+input {
+  &:not(:focus) {
+    &:invalid  {
+      color: var(--ant-error);
+    }  
+  }
+}
diff --git a/web/utils/config-constants.tsx b/web/utils/config-constants.tsx
index d0fbbee87..c90df5442 100644
--- a/web/utils/config-constants.tsx
+++ b/web/utils/config-constants.tsx
@@ -1,6 +1,8 @@
 // DEFAULT VALUES
 import { fetchData, SERVER_CONFIG_UPDATE_URL } from './apis';
 import { ApiPostArgs, VideoVariant, SocialHandle } from '../types/config-section';
+import { TEXTFIELD_TYPE_URL } from '../components/config/form-textfield';
+import { DEFAULT_TEXTFIELD_URL_PATTERN } from './urls';
 
 export const TEXT_MAXLENGTH = 255;
 
@@ -131,6 +133,9 @@ export const TEXTFIELD_PROPS_INSTANCE_URL = {
   placeholder: 'https://owncast.mysite.com',
   label: 'Server URL',
   tip: 'The full url to your Owncast server.',
+  type: TEXTFIELD_TYPE_URL,
+  pattern: DEFAULT_TEXTFIELD_URL_PATTERN,
+  useTrim: true,
 };
 // MISC FIELDS
 export const FIELD_PROPS_TAGS = {
@@ -247,7 +252,7 @@ export const VIDEO_BITRATE_DEFAULTS = {
 export const VIDEO_NAME_DEFAULTS = {
   fieldName: 'name',
   label: 'Name',
-  maxLength: 12,
+  maxLength: 15,
   placeholder: 'HD or Low',
   tip: 'Human-readable name for for displaying in the player.',
 };
@@ -313,7 +318,10 @@ export const S3_TEXT_FIELDS_INFO = {
     label: 'Endpoint',
     maxLength: 255,
     placeholder: 'https://your.s3.provider.endpoint.com',
-    tip: 'The full URL endpoint your storage provider gave you.',
+    tip: 'The full URL (with "https://") endpoint from your storage provider.',
+    useTrim: true,
+    type: TEXTFIELD_TYPE_URL,
+    pattern: DEFAULT_TEXTFIELD_URL_PATTERN, 
   },
   region: {
     fieldName: 'region',
@@ -336,5 +344,8 @@ export const S3_TEXT_FIELDS_INFO = {
     placeholder: 'http://cdn.ss3.provider.endpoint.com',
     tip:
       'Optional URL that content should be accessed from instead of the default.  Used with CDNs and specific storage providers. Generally not required.',
+    type: TEXTFIELD_TYPE_URL,
+    pattern: DEFAULT_TEXTFIELD_URL_PATTERN,
+    useTrim: true,
   },
 };
diff --git a/web/utils/urls.ts b/web/utils/urls.ts
index 03ba8a42c..8ed9b6ff6 100644
--- a/web/utils/urls.ts
+++ b/web/utils/urls.ts
@@ -1,3 +1,6 @@
+// to use with <input type="url"> fields, as the default pattern only checks for `:`,
+export const DEFAULT_TEXTFIELD_URL_PATTERN = 'https?://.*';
+
 export default function isValidUrl(url: string): boolean {
   const validProtocols = ['http:', 'https:'];