Add some basic validation logic for form. Closes https://github.com/owncast/owncast/issues/1847

This commit is contained in:
Gabe Kangas 2022-04-24 18:44:32 -07:00
parent 29ae557c0f
commit 55ce0c0869
2 changed files with 44 additions and 10 deletions

View file

@ -26,15 +26,21 @@ export default function ConfigNotify() {
const { notifications } = serverConfig || {};
const { twitter } = notifications || {};
const { enabled, apiKey, apiSecret, accessToken, accessTokenSecret, bearerToken, goLiveMessage } =
twitter || {};
const [formDataValues, setFormDataValues] = useState<any>({});
const [submitStatus, setSubmitStatus] = useState<StatusState>(null);
const [enableSaveButton, setEnableSaveButton] = useState<boolean>(false);
useEffect(() => {
const {
enabled,
apiKey,
apiSecret,
accessToken,
accessTokenSecret,
bearerToken,
goLiveMessage,
} = twitter || {};
setFormDataValues({
enabled,
apiKey,
@ -46,7 +52,27 @@ export default function ConfigNotify() {
});
}, [twitter]);
const canSave = (): boolean => true;
const canSave = (): boolean => {
const {
enabled,
apiKey,
apiSecret,
accessToken,
accessTokenSecret,
bearerToken,
goLiveMessage,
} = formDataValues;
return (
enabled &&
!!apiKey &&
!!apiSecret &&
!!accessToken &&
!!accessTokenSecret &&
!!bearerToken &&
!!goLiveMessage
);
};
// update individual values in state
const handleFieldChange = ({ fieldName, value }: UpdateArgs) => {
@ -60,7 +86,11 @@ export default function ConfigNotify() {
// toggle switch.
const handleSwitchChange = (switchEnabled: boolean) => {
const previouslySaved = formDataValues.enabled;
handleFieldChange({ fieldName: 'enabled', value: switchEnabled });
return switchEnabled !== previouslySaved;
};
let resetTimer = null;
@ -68,6 +98,7 @@ export default function ConfigNotify() {
setSubmitStatus(null);
resetTimer = null;
clearTimeout(resetTimer);
setEnableSaveButton(false);
};
const save = async () => {
@ -100,11 +131,7 @@ export default function ConfigNotify() {
</p>
<div style={{ display: formDataValues.enabled ? 'block' : 'none' }}>
<p className="description reduced-margins">
<a
href="https://developer.twitter.com/en/portal/dashboard"
target="_blank"
rel="noreferrer"
>
<a href="https://owncast.online/docs/notifications" target="_blank" rel="noreferrer">
Read how to configure your Twitter account
</a>{' '}
to support posting from Owncast.

View file

@ -12,6 +12,7 @@ import TextFieldWithSubmit, {
import { TEXTFIELD_PROPS_FEDERATION_INSTANCE_URL } from '../utils/config-constants';
import { ServerStatusContext } from '../utils/server-status-context';
import { UpdateArgs } from '../types/config-section';
import isValidUrl from '../utils/urls';
const { Title } = Typography;
@ -21,6 +22,7 @@ export default function ConfigNotify() {
const { serverConfig } = serverStatusData || {};
const { yp } = serverConfig;
const { instanceUrl } = yp;
const [urlValid, setUrlValid] = useState(false);
useEffect(() => {
setFormDataValues({
@ -29,6 +31,10 @@ export default function ConfigNotify() {
}, [yp]);
const handleSubmitInstanceUrl = () => {
if (!urlValid) {
return;
}
setFormDataValues({
...formDataValues,
enabled: false,
@ -36,6 +42,8 @@ export default function ConfigNotify() {
};
const handleFieldChange = ({ fieldName, value }: UpdateArgs) => {
setUrlValid(isValidUrl(value));
setFormDataValues({
...formDataValues,
[fieldName]: value,
@ -43,7 +51,6 @@ export default function ConfigNotify() {
};
const enabled = instanceUrl !== '';
console.log(enabled);
const configurationWarning = !enabled && (
<>
<Alert