shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): add validation to hostname/IP fields (#1206)

Browse Source
This commit is contained in:
TheCatLady
2021-03-17 20:12:00 -04:00
committed by GitHub
parent eb6807b9e2
commit f49a02449c
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Settings/Notifications/NotificationsEmail.tsx
View File

@@ -73,7 +73,11 @@ const NotificationsEmail: React.FC = () => {
emailFrom: Yup.string() emailFrom: Yup.string()
.required(intl.formatMessage(messages.validationEmail)) .required(intl.formatMessage(messages.validationEmail))
.email(intl.formatMessage(messages.validationEmail)), .email(intl.formatMessage(messages.validationEmail)),
smtpHost: Yup.string().required( smtpHost: Yup.string()
.required(intl.formatMessage(messages.validationSmtpHostRequired))
.matches(
// eslint-disable-next-line
/^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
intl.formatMessage(messages.validationSmtpHostRequired) intl.formatMessage(messages.validationSmtpHostRequired)
), ),
smtpPort: Yup.number().required( smtpPort: Yup.number().required(

13
src/components/Settings/RadarrModal/index.tsx
View File

@@ -91,7 +91,11 @@ const RadarrModal: React.FC<RadarrModalProps> = ({
name: Yup.string().required( name: Yup.string().required(
intl.formatMessage(messages.validationNameRequired) intl.formatMessage(messages.validationNameRequired)
), ),
hostname: Yup.string().required( hostname: Yup.string()
.required(intl.formatMessage(messages.validationHostnameRequired))
.matches(
// eslint-disable-next-line
/^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
intl.formatMessage(messages.validationHostnameRequired) intl.formatMessage(messages.validationHostnameRequired)
), ),
port: Yup.number().required( port: Yup.number().required(
@@ -312,7 +316,12 @@ const RadarrModal: React.FC<RadarrModalProps> = ({
} }
}} }}
secondaryDisabled={ secondaryDisabled={
!values.apiKey || !values.hostname || !values.port || isTesting !values.apiKey ||
!values.hostname ||
!values.port ||
isTesting ||
isSubmitting ||
!isValid
} }
okDisabled={!isValidated || isSubmitting || isTesting || !isValid} okDisabled={!isValidated || isSubmitting || isTesting || !isValid}
onOk={() => handleSubmit()} onOk={() => handleSubmit()}

6
src/components/Settings/SettingsPlex.tsx
View File

@@ -113,7 +113,11 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
const intl = useIntl(); const intl = useIntl();
const { addToast, removeToast } = useToasts(); const { addToast, removeToast } = useToasts();
const PlexSettingsSchema = Yup.object().shape({ const PlexSettingsSchema = Yup.object().shape({
hostname: Yup.string().required( hostname: Yup.string()
.required(intl.formatMessage(messages.validationHostnameRequired))
.matches(
// eslint-disable-next-line
/^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
intl.formatMessage(messages.validationHostnameRequired) intl.formatMessage(messages.validationHostnameRequired)
), ),
port: Yup.number().required( port: Yup.number().required(

13
src/components/Settings/SonarrModal/index.tsx
View File

@@ -102,7 +102,11 @@ const SonarrModal: React.FC<SonarrModalProps> = ({
name: Yup.string().required( name: Yup.string().required(
intl.formatMessage(messages.validationNameRequired) intl.formatMessage(messages.validationNameRequired)
), ),
hostname: Yup.string().required( hostname: Yup.string()
.required(intl.formatMessage(messages.validationHostnameRequired))
.matches(
// eslint-disable-next-line
/^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
intl.formatMessage(messages.validationHostnameRequired) intl.formatMessage(messages.validationHostnameRequired)
), ),
port: Yup.number().required( port: Yup.number().required(
@@ -341,7 +345,12 @@ const SonarrModal: React.FC<SonarrModalProps> = ({
} }
}} }}
secondaryDisabled={ secondaryDisabled={
!values.apiKey || !values.hostname || !values.port || isTesting !values.apiKey ||
!values.hostname ||
!values.port ||
isTesting ||
isSubmitting ||
!isValid
} }
okDisabled={!isValidated || isSubmitting || isTesting || !isValid} okDisabled={!isValidated || isSubmitting || isTesting || !isValid}
onOk={() => handleSubmit()} onOk={() => handleSubmit()}