& { profileName?: string };
+ request: RequestResultsResponse['results'][number];
revalidateList: () => void;
- radarrData?: RadarrSettings[];
- sonarrData?: SonarrSettings[];
}
-const RequestItem = ({
- request,
- revalidateList,
- radarrData,
- sonarrData,
-}: RequestItemProps) => {
+const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
const settings = useSettings();
const { ref, inView } = useInView({
triggerOnce: true,
@@ -398,23 +391,6 @@ const RequestItem = ({
iOSPlexUrl4k: requestData?.media?.iOSPlexUrl4k,
});
- const serviceExists = () => {
- if (title?.mediaInfo) {
- if (title?.mediaInfo.mediaType === MediaType.MOVIE) {
- return (
- radarrData?.find((radarr) => radarr.id === request.serverId) !==
- undefined
- );
- } else {
- return (
- sonarrData?.find((sonarr) => sonarr.id === request.serverId) !==
- undefined
- );
- }
- }
- return false;
- };
-
if (!title && !error) {
return (
deleteRequest()}
- confirmText={intl.formatMessage(globalMessages.areyousure)}
- className="w-full"
- >
-
- {intl.formatMessage(messages.deleterequest)}
-
- )}
- {hasPermission(Permission.MANAGE_REQUESTS) &&
- title?.mediaInfo?.serviceId &&
- serviceExists() && (
- deleteMediaFile()}
- confirmText={intl.formatMessage(globalMessages.areyousure)}
- className="w-full"
- >
-
-
- {intl.formatMessage(messages.removearr, {
- arr: request.type === 'movie' ? 'Radarr' : 'Sonarr',
- })}
-
-
+ <>
+ deleteRequest()}
+ confirmText={intl.formatMessage(globalMessages.areyousure)}
+ className="w-full"
+ >
+
+ {intl.formatMessage(messages.deleterequest)}
+
+ {request.canRemove && (
+ deleteMediaFile()}
+ confirmText={intl.formatMessage(globalMessages.areyousure)}
+ className="w-full"
+ >
+
+
+ {intl.formatMessage(messages.removearr, {
+ arr: request.type === 'movie' ? 'Radarr' : 'Sonarr',
+ })}
+
+
+ )}
+
)}
{requestData.status === MediaRequestStatus.PENDING &&
hasPermission(Permission.MANAGE_REQUESTS) && (
diff --git a/src/components/RequestList/index.tsx b/src/components/RequestList/index.tsx
index 468c0853e5..6cdf5b0bfb 100644
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -17,8 +17,6 @@ import {
FunnelIcon,
} from '@heroicons/react/24/solid';
import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces';
-import { Permission } from '@server/lib/permissions';
-import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
import Link from 'next/link';
import { useRouter } from 'next/router';
import { useEffect, useState } from 'react';
@@ -53,7 +51,7 @@ const RequestList = () => {
const { user } = useUser({
id: Number(router.query.userId),
});
- const { user: currentUser, hasPermission } = useUser();
+ const { user: currentUser } = useUser();
const [currentFilter, setCurrentFilter] = useState(Filter.PENDING);
const [currentSort, setCurrentSort] = useState('added');
const [currentSortDirection, setCurrentSortDirection] =
@@ -64,13 +62,6 @@ const RequestList = () => {
const pageIndex = page - 1;
const updateQueryParams = useUpdateQueryParams({ page: page.toString() });
- const { data: radarrData } = useSWR(
- hasPermission(Permission.ADMIN) ? '/api/v1/settings/radarr' : null
- );
- const { data: sonarrData } = useSWR(
- hasPermission(Permission.ADMIN) ? '/api/v1/settings/sonarr' : null
- );
-
const {
data,
error,
@@ -254,8 +245,6 @@ const RequestList = () => {
revalidate()}
- radarrData={radarrData}
- sonarrData={sonarrData}
/>
);
diff --git a/src/components/ServiceWorkerSetup/index.tsx b/src/components/ServiceWorkerSetup/index.tsx
index f9b42cd397..2e0313f4db 100644
--- a/src/components/ServiceWorkerSetup/index.tsx
+++ b/src/components/ServiceWorkerSetup/index.tsx
@@ -1,10 +1,9 @@
/* eslint-disable no-console */
-import useSettings from '@app/hooks/useSettings';
+
import { useUser } from '@app/hooks/useUser';
import { useEffect } from 'react';
const ServiceWorkerSetup = () => {
- const { currentSettings } = useSettings();
const { user } = useUser();
useEffect(() => {
if ('serviceWorker' in navigator && user?.id) {
@@ -15,40 +14,12 @@ const ServiceWorkerSetup = () => {
'[SW] Registration successful, scope is:',
registration.scope
);
-
- if (currentSettings.enablePushRegistration) {
- const sub = await registration.pushManager.subscribe({
- userVisibleOnly: true,
- applicationServerKey: currentSettings.vapidPublic,
- });
-
- const parsedSub = JSON.parse(JSON.stringify(sub));
-
- if (parsedSub.keys.p256dh && parsedSub.keys.auth) {
- const res = await fetch('/api/v1/user/registerPushSubscription', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify({
- endpoint: parsedSub.endpoint,
- p256dh: parsedSub.keys.p256dh,
- auth: parsedSub.keys.auth,
- }),
- });
- if (!res.ok) throw new Error();
- }
- }
})
.catch(function (error) {
console.log('[SW] Service worker registration failed, error:', error);
});
}
- }, [
- user,
- currentSettings.vapidPublic,
- currentSettings.enablePushRegistration,
- ]);
+ }, [user]);
return null;
};
diff --git a/src/components/Settings/OverrideRule/OverrideRuleTiles.tsx b/src/components/Settings/OverrideRule/OverrideRuleTiles.tsx
index 8b2acaf67b..7f1f3f2c08 100644
--- a/src/components/Settings/OverrideRule/OverrideRuleTiles.tsx
+++ b/src/components/Settings/OverrideRule/OverrideRuleTiles.tsx
@@ -141,7 +141,7 @@ const OverrideRuleTiles = ({
}
setUsers(users);
})();
- }, [rules]);
+ }, [rules, users]);
return (
<>
diff --git a/src/components/UserList/PlexImportModal.tsx b/src/components/UserList/PlexImportModal.tsx
index 078d1f1a10..28bbc89811 100644
--- a/src/components/UserList/PlexImportModal.tsx
+++ b/src/components/UserList/PlexImportModal.tsx
@@ -57,9 +57,9 @@ const PlexImportModal = ({ onCancel, onComplete }: PlexImportProps) => {
}),
});
if (!res.ok) throw new Error();
- const { data: createdUsers } = await res.json();
+ const createdUsers = await res.json();
- if (!createdUsers.length) {
+ if (!Array.isArray(createdUsers) || createdUsers.length === 0) {
throw new Error('No users were imported from Plex.');
}
diff --git a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
index 90fbb13c79..e0df3f5d40 100644
--- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
@@ -415,7 +415,7 @@ const UserGeneralSettings = () => {
-
+
{
-
+
{
- const intl = useIntl();
- const { addToast } = useToasts();
- const router = useRouter();
- const { user } = useUser({ id: Number(router.query.userId) });
- const {
- data,
- error,
- mutate: revalidate,
- } = useSWR(
- user ? `/api/v1/user/${user?.id}/settings/notifications` : null
- );
-
- if (!data && !error) {
- return ;
- }
-
- return (
- {
- try {
- const res = await fetch(
- `/api/v1/user/${user?.id}/settings/notifications`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify({
- pgpKey: data?.pgpKey,
- discordId: data?.discordId,
- pushbulletAccessToken: data?.pushbulletAccessToken,
- pushoverApplicationToken: data?.pushoverApplicationToken,
- pushoverUserKey: data?.pushoverUserKey,
- telegramChatId: data?.telegramChatId,
- telegramSendSilently: data?.telegramSendSilently,
- notificationTypes: {
- webpush: values.types,
- },
- }),
- }
- );
- if (!res.ok) throw new Error();
- mutate('/api/v1/settings/public');
- addToast(intl.formatMessage(messages.webpushsettingssaved), {
- appearance: 'success',
- autoDismiss: true,
- });
- } catch (e) {
- addToast(intl.formatMessage(messages.webpushsettingsfailed), {
- appearance: 'error',
- autoDismiss: true,
- });
- } finally {
- revalidate();
- }
- }}
- >
- {({
- errors,
- touched,
- isSubmitting,
- isValid,
- values,
- setFieldValue,
- setFieldTouched,
- }) => {
- return (
-
- );
- }}
-
- );
-};
-
-export default UserWebPushSettings;
diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx
new file mode 100644
index 0000000000..59da71093a
--- /dev/null
+++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx
@@ -0,0 +1,110 @@
+import ConfirmButton from '@app/components/Common/ConfirmButton';
+import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
+import {
+ ComputerDesktopIcon,
+ DevicePhoneMobileIcon,
+ TrashIcon,
+} from '@heroicons/react/24/solid';
+import { useIntl } from 'react-intl';
+import { UAParser } from 'ua-parser-js';
+
+interface DeviceItemProps {
+ disablePushNotifications: (p256dh: string) => void;
+ device: {
+ endpoint: string;
+ p256dh: string;
+ auth: string;
+ userAgent: string;
+ createdAt: Date;
+ };
+}
+
+const messages = defineMessages(
+ 'components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush',
+ {
+ operatingsystem: 'Operating System',
+ browser: 'Browser',
+ engine: 'Engine',
+ deletesubscription: 'Delete Subscription',
+ unknown: 'Unknown',
+ }
+);
+
+const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
+ const intl = useIntl();
+
+ return (
+
+
+
+
+ {UAParser(device.userAgent).device.type === 'mobile' ? (
+
+ ) : (
+
+ )}
+
+
+
+ {device.createdAt
+ ? intl.formatDate(device.createdAt, {
+ year: 'numeric',
+ month: 'long',
+ day: 'numeric',
+ })
+ : 'N/A'}
+
+
+ {device.userAgent
+ ? UAParser(device.userAgent).device.model
+ : intl.formatMessage(messages.unknown)}
+
+
+
+
+
+
+ {intl.formatMessage(messages.operatingsystem)}
+
+
+ {device.userAgent ? UAParser(device.userAgent).os.name : 'N/A'}
+
+
+
+
+ {intl.formatMessage(messages.browser)}
+
+
+ {device.userAgent
+ ? UAParser(device.userAgent).browser.name
+ : 'N/A'}
+
+
+
+
+ {intl.formatMessage(messages.engine)}
+
+
+ {device.userAgent
+ ? UAParser(device.userAgent).engine.name
+ : 'N/A'}
+
+
+
+
+
+ disablePushNotifications(device.p256dh)}
+ confirmText={intl.formatMessage(globalMessages.areyousure)}
+ className="w-full"
+ >
+
+ {intl.formatMessage(messages.deletesubscription)}
+
+
+
+
+ {intl.formatMessage(messages.managedevices)}
+
+
+ {dataDevices?.length ? (
+ dataDevices
+ ?.sort((a, b) => {
+ const dateA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
+ const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
+ return dateB - dateA;
+ })
+ .map((device, index) => (
+
+
+
+ ))
+ ) : (
+ <>
+
+
+ )}
+
+
