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

fix(ui): Notification-related string/UI edits and field validation (#985)

Browse Source
This commit is contained in:
TheCatLady
2021-02-22 05:09:12 -05:00
committed by GitHub
parent 8589eabfff
commit c88fcb2e2d
11 changed files with 370 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,19 +14,19 @@ const messages = defineMessages({
save: 'Save Changes',
saving: 'Saving…',
agentenabled: 'Enable Agent',
accessToken: 'Access Token',
userToken: 'User Token',
validationAccessTokenRequired: 'You must provide an access token.',
validationUserTokenRequired: 'You must provide a user token.',
pushoversettingssaved: 'Pushover notification settings saved!',
accessToken: 'Application/API Token',
userToken: 'User Key',
validationAccessTokenRequired: 'You must provide a valid application token',
validationUserTokenRequired: 'You must provide a valid user key',
pushoversettingssaved: 'Pushover notification settings saved successfully!',
pushoversettingsfailed: 'Pushover notification settings failed to save.',
testsent: 'Test notification sent!',
test: 'Test',
settinguppushover: 'Setting Up Pushover Notifications',
settinguppushoverDescription:
'To configure Pushover notifications, you need to <RegisterApplicationLink>register an application</RegisterApplicationLink> and get the access token.\
When setting up the application, you can use one of the icons in the <IconLink>public folder</IconLink> on GitHub.\
You also need the Pushover user token, which can be found on the start page when you log in.',
'To configure Pushover notifications, you will need to <RegisterApplicationLink>register an application</RegisterApplicationLink> and enter the API key below.\
(You can use one of our <IconLink>official icons on GitHub</IconLink>.)\
You will need also need your user key.',
notificationtypes: 'Notification Types',
});
@@ -38,12 +38,18 @@ const NotificationsPushover: React.FC = () => {
);
const NotificationsPushoverSchema = Yup.object().shape({
accessToken: Yup.string().required(
intl.formatMessage(messages.validationAccessTokenRequired)
),
userToken: Yup.string().required(
intl.formatMessage(messages.validationUserTokenRequired)
),
accessToken: Yup.string()
.required(intl.formatMessage(messages.validationAccessTokenRequired))
.matches(
/^a[A-Za-z0-9]{29}$/,
intl.formatMessage(messages.validationAccessTokenRequired)
),
userToken: Yup.string()
.required(intl.formatMessage(messages.validationUserTokenRequired))
.matches(
/^[ug][A-Za-z0-9]{29}$/,
intl.formatMessage(messages.validationUserTokenRequired)
),
});
if (!data && !error) {