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(frontend): notification type validation (#2207)

Browse Source
This commit is contained in:
TheCatLady
2021-10-15 21:02:02 -04:00
committed by GitHub
parent 3486d0bf55
commit 2f204b9952
6 changed files with 48 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/Settings/Notifications/NotificationsDiscord.tsx
View File

@@ -48,13 +48,6 @@ const NotificationsDiscord: React.FC = () => {
otherwise: Yup.string().nullable(),
})
.url(intl.formatMessage(messages.validationUrl)),
types: Yup.number().when('enabled', {
is: true,
then: Yup.number()
.nullable()
.moreThan(0, intl.formatMessage(messages.validationTypes)),
otherwise: Yup.number().nullable(),
}),
});
if (!data && !error) {
@@ -238,8 +231,8 @@ const NotificationsDiscord: React.FC = () => {
}
}}
error={
errors.types && touched.types
? (errors.types as string)
values.enabled && !values.types && touched.types
? intl.formatMessage(messages.validationTypes)
: undefined
}
/>
@@ -266,7 +259,12 @@ const NotificationsDiscord: React.FC = () => {
<Button
buttonType="primary"
type="submit"
disabled={isSubmitting || !isValid || isTesting}
disabled={
isSubmitting ||
!isValid ||
isTesting ||
(values.enabled && !values.types)
}
>
<SaveIcon />
<span>

18
src/components/Settings/Notifications/NotificationsLunaSea/index.tsx
View File

@@ -45,13 +45,6 @@ const NotificationsLunaSea: React.FC = () => {
otherwise: Yup.string().nullable(),
})
.url(intl.formatMessage(messages.validationWebhookUrl)),
types: Yup.number().when('enabled', {
is: true,
then: Yup.number()
.nullable()
.moreThan(0, intl.formatMessage(messages.validationTypes)),
otherwise: Yup.number().nullable(),
}),
});
if (!data && !error) {
@@ -217,8 +210,8 @@ const NotificationsLunaSea: React.FC = () => {
}
}}
error={
errors.types && touched.types
? (errors.types as string)
values.enabled && !values.types && touched.types
? intl.formatMessage(messages.validationTypes)
: undefined
}
/>
@@ -245,7 +238,12 @@ const NotificationsLunaSea: React.FC = () => {
<Button
buttonType="primary"
type="submit"
disabled={isSubmitting || !isValid || isTesting}
disabled={
isSubmitting ||
!isValid ||
isTesting ||
(values.enabled && !values.types)
}
>
<SaveIcon />
<span>

18
src/components/Settings/Notifications/NotificationsPushbullet/index.tsx
View File

@@ -43,13 +43,6 @@ const NotificationsPushbullet: React.FC = () => {
.required(intl.formatMessage(messages.validationAccessTokenRequired)),
otherwise: Yup.string().nullable(),
}),
types: Yup.number().when('enabled', {
is: true,
then: Yup.number()
.nullable()
.moreThan(0, intl.formatMessage(messages.validationTypes)),
otherwise: Yup.number().nullable(),
}),
});
if (!data && !error) {
@@ -197,8 +190,8 @@ const NotificationsPushbullet: React.FC = () => {
}
}}
error={
errors.types && touched.types
? (errors.types as string)
values.enabled && !values.types && touched.types
? intl.formatMessage(messages.validationTypes)
: undefined
}
/>
@@ -225,7 +218,12 @@ const NotificationsPushbullet: React.FC = () => {
<Button
buttonType="primary"
type="submit"
disabled={isSubmitting || !isValid || isTesting}
disabled={
isSubmitting ||
!isValid ||
isTesting ||
(values.enabled && !values.types)
}
>
<SaveIcon />
<span>

18
src/components/Settings/Notifications/NotificationsPushover/index.tsx
View File

@@ -62,13 +62,6 @@ const NotificationsPushover: React.FC = () => {
/^[a-z\d]{30}$/i,
intl.formatMessage(messages.validationUserTokenRequired)
),
types: Yup.number().when('enabled', {
is: true,
then: Yup.number()
.nullable()
.moreThan(0, intl.formatMessage(messages.validationTypes)),
otherwise: Yup.number().nullable(),
}),
});
if (!data && !error) {
@@ -243,8 +236,8 @@ const NotificationsPushover: React.FC = () => {
}
}}
error={
errors.types && touched.types
? (errors.types as string)
values.enabled && !values.types && touched.types
? intl.formatMessage(messages.validationTypes)
: undefined
}
/>
@@ -271,7 +264,12 @@ const NotificationsPushover: React.FC = () => {
<Button
buttonType="primary"
type="submit"
disabled={isSubmitting || !isValid || isTesting}
disabled={
isSubmitting ||
!isValid ||
isTesting ||
(values.enabled && !values.types)
}
>
<SaveIcon />
<span>

18
src/components/Settings/Notifications/NotificationsSlack/index.tsx
View File

@@ -43,13 +43,6 @@ const NotificationsSlack: React.FC = () => {
otherwise: Yup.string().nullable(),
})
.url(intl.formatMessage(messages.validationWebhookUrl)),
types: Yup.number().when('enabled', {
is: true,
then: Yup.number()
.nullable()
.moreThan(0, intl.formatMessage(messages.validationTypes)),
otherwise: Yup.number().nullable(),
}),
});
if (!data && !error) {
@@ -195,8 +188,8 @@ const NotificationsSlack: React.FC = () => {
}
}}
error={
errors.types && touched.types
? (errors.types as string)
values.enabled && !values.types && touched.types
? intl.formatMessage(messages.validationTypes)
: undefined
}
/>
@@ -223,7 +216,12 @@ const NotificationsSlack: React.FC = () => {
<Button
buttonType="primary"
type="submit"
disabled={isSubmitting || !isValid || isTesting}
disabled={
isSubmitting ||
!isValid ||
isTesting ||
(values.enabled && !values.types)
}
>
<SaveIcon />
<span>

18
src/components/Settings/Notifications/NotificationsWebhook/index.tsx
View File

@@ -101,13 +101,6 @@ const NotificationsWebhook: React.FC = () => {
}
}
),
types: Yup.number().when('enabled', {
is: true,
then: Yup.number()
.nullable()
.moreThan(0, intl.formatMessage(messages.validationTypes)),
otherwise: Yup.number().nullable(),
}),
});
if (!data && !error) {
@@ -312,8 +305,8 @@ const NotificationsWebhook: React.FC = () => {
}
}}
error={
errors.types && touched.types
? (errors.types as string)
values.enabled && !values.types && touched.types
? intl.formatMessage(messages.validationTypes)
: undefined
}
/>
@@ -340,7 +333,12 @@ const NotificationsWebhook: React.FC = () => {
<Button
buttonType="primary"
type="submit"
disabled={isSubmitting || !isValid || isTesting}
disabled={
isSubmitting ||
!isValid ||
isTesting ||
(values.enabled && !values.types)
}
>
<SaveIcon />
<span>