diff --git a/src/apps/experimental/components/drawers/dashboard/AdvancedDrawerSection.tsx b/src/apps/experimental/components/drawers/dashboard/AdvancedDrawerSection.tsx index 617ee2de50..7e0bb4e366 100644 --- a/src/apps/experimental/components/drawers/dashboard/AdvancedDrawerSection.tsx +++ b/src/apps/experimental/components/drawers/dashboard/AdvancedDrawerSection.tsx @@ -1,4 +1,11 @@ -import { Lan, VpnKey, Article, EditNotifications, Extension, Schedule, ExpandLess, ExpandMore } from '@mui/icons-material'; +import Article from '@mui/icons-material/Article'; +import EditNotifications from '@mui/icons-material/EditNotifications'; +import ExpandLess from '@mui/icons-material/ExpandLess'; +import ExpandMore from '@mui/icons-material/ExpandMore'; +import Extension from '@mui/icons-material/Extension'; +import Lan from '@mui/icons-material/Lan'; +import Schedule from '@mui/icons-material/Schedule'; +import VpnKey from '@mui/icons-material/VpnKey'; import Collapse from '@mui/material/Collapse'; import List from '@mui/material/List'; import ListItem from '@mui/material/ListItem'; @@ -63,7 +70,7 @@ const AdvancedDrawerSection = () => { - + diff --git a/src/apps/experimental/routes/asyncRoutes/admin.ts b/src/apps/experimental/routes/asyncRoutes/admin.ts index 0f2ec6b9cf..72bcc6f32b 100644 --- a/src/apps/experimental/routes/asyncRoutes/admin.ts +++ b/src/apps/experimental/routes/asyncRoutes/admin.ts @@ -1,6 +1,7 @@ import { AsyncRoute } from '../../../../components/router/AsyncRoute'; export const ASYNC_ADMIN_ROUTES: AsyncRoute[] = [ + { path: 'notificationsettings.html', page: 'dashboard/notifications' }, { path: 'usernew.html', page: 'user/usernew' }, { path: 'userprofiles.html', page: 'user/userprofiles' }, { path: 'useredit.html', page: 'user/useredit' }, diff --git a/src/apps/experimental/routes/legacyRoutes/admin.ts b/src/apps/experimental/routes/legacyRoutes/admin.ts index dd1f95f6e5..e2037ddb11 100644 --- a/src/apps/experimental/routes/legacyRoutes/admin.ts +++ b/src/apps/experimental/routes/legacyRoutes/admin.ts @@ -103,18 +103,6 @@ export const LEGACY_ADMIN_ROUTES: LegacyRoute[] = [ controller: 'dashboard/metadatanfo', view: 'dashboard/metadatanfo.html' } - }, { - path: 'notificationsetting.html', - pageProps: { - controller: 'dashboard/notifications/notification/index', - view: 'dashboard/notifications/notification/index.html' - } - }, { - path: 'notificationsettings.html', - pageProps: { - controller: 'dashboard/notifications/notifications/index', - view: 'dashboard/notifications/notifications/index.html' - } }, { path: 'playbackconfiguration.html', pageProps: { diff --git a/src/apps/stable/routes/asyncRoutes/admin.ts b/src/apps/stable/routes/asyncRoutes/admin.ts index 0f2ec6b9cf..72bcc6f32b 100644 --- a/src/apps/stable/routes/asyncRoutes/admin.ts +++ b/src/apps/stable/routes/asyncRoutes/admin.ts @@ -1,6 +1,7 @@ import { AsyncRoute } from '../../../../components/router/AsyncRoute'; export const ASYNC_ADMIN_ROUTES: AsyncRoute[] = [ + { path: 'notificationsettings.html', page: 'dashboard/notifications' }, { path: 'usernew.html', page: 'user/usernew' }, { path: 'userprofiles.html', page: 'user/userprofiles' }, { path: 'useredit.html', page: 'user/useredit' }, diff --git a/src/apps/stable/routes/dashboard/notifications.tsx b/src/apps/stable/routes/dashboard/notifications.tsx new file mode 100644 index 0000000000..ca874d1333 --- /dev/null +++ b/src/apps/stable/routes/dashboard/notifications.tsx @@ -0,0 +1,36 @@ +import React from 'react'; + +import Page from 'components/Page'; +import globalize from 'scripts/globalize'; + +const PluginLink = () => ( +
+ ${globalize.translate('GetThePlugin')} + ` + }} + /> +); + +const Notifications = () => ( + +
+

{globalize.translate('Notifications')}

+

+ {globalize.translate('NotificationsMovedMessage')} +

+ +
+ +); + +export default Notifications; diff --git a/src/apps/stable/routes/legacyRoutes/admin.ts b/src/apps/stable/routes/legacyRoutes/admin.ts index dd1f95f6e5..e2037ddb11 100644 --- a/src/apps/stable/routes/legacyRoutes/admin.ts +++ b/src/apps/stable/routes/legacyRoutes/admin.ts @@ -103,18 +103,6 @@ export const LEGACY_ADMIN_ROUTES: LegacyRoute[] = [ controller: 'dashboard/metadatanfo', view: 'dashboard/metadatanfo.html' } - }, { - path: 'notificationsetting.html', - pageProps: { - controller: 'dashboard/notifications/notification/index', - view: 'dashboard/notifications/notification/index.html' - } - }, { - path: 'notificationsettings.html', - pageProps: { - controller: 'dashboard/notifications/notifications/index', - view: 'dashboard/notifications/notifications/index.html' - } }, { path: 'playbackconfiguration.html', pageProps: { diff --git a/src/controllers/dashboard/notifications/notification/index.html b/src/controllers/dashboard/notifications/notification/index.html deleted file mode 100644 index b922beb344..0000000000 --- a/src/controllers/dashboard/notifications/notification/index.html +++ /dev/null @@ -1,68 +0,0 @@ -
- -
-
- -
- -
-
-

- ${Help} -
-
- - -
- - - -
-
- -
- -
-
- -
- -
-
-
${AdditionalNotificationServices}
-
-
- -
-
- - - -
-
- -
-
-
diff --git a/src/controllers/dashboard/notifications/notification/index.js b/src/controllers/dashboard/notifications/notification/index.js deleted file mode 100644 index 20ac2ea974..0000000000 --- a/src/controllers/dashboard/notifications/notification/index.js +++ /dev/null @@ -1,121 +0,0 @@ -import escapeHtml from 'escape-html'; -import 'jquery'; -import '../../../../elements/emby-checkbox/emby-checkbox'; -import Dashboard from '../../../../utils/dashboard'; -import { getParameterByName } from '../../../../utils/url.ts'; - -function fillItems(elem, items, cssClass, idPrefix, currentList, isEnabledList) { - let html = '
'; - html += items.map(function (u) { - const isChecked = isEnabledList ? currentList.indexOf(u.Id) != -1 : currentList.indexOf(u.Id) == -1; - const checkedHtml = isChecked ? ' checked="checked"' : ''; - return ''; - }).join(''); - html += '
'; - elem.html(html).trigger('create'); -} - -function reload(page) { - const type = getParameterByName('type'); - const promise1 = ApiClient.getUsers(); - const promise2 = ApiClient.getNamedConfiguration(notificationsConfigurationKey); - const promise3 = ApiClient.getJSON(ApiClient.getUrl('Notifications/Types')); - const promise4 = ApiClient.getJSON(ApiClient.getUrl('Notifications/Services')); - Promise.all([promise1, promise2, promise3, promise4]).then(function (responses) { - const users = responses[0]; - const notificationOptions = responses[1]; - const types = responses[2]; - const services = responses[3]; - let notificationConfig = notificationOptions.Options.filter(function (n) { - return n.Type == type; - })[0]; - const typeInfo = types.filter(function (n) { - return n.Type == type; - })[0] || {}; - - if (typeInfo.IsBasedOnUserEvent) { - $('.monitorUsers', page).show(); - } else { - $('.monitorUsers', page).hide(); - } - - $('.notificationType', page).html(escapeHtml(typeInfo.Name || '') || 'Unknown Notification'); - - if (!notificationConfig) { - notificationConfig = { - DisabledMonitorUsers: [], - SendToUsers: [], - DisabledServices: [], - SendToUserMode: 'Admins' - }; - } - - fillItems($('.monitorUsersList', page), users, 'chkMonitor', 'chkMonitor', notificationConfig.DisabledMonitorUsers); - fillItems($('.sendToUsersList', page), users, 'chkSendTo', 'chkSendTo', notificationConfig.SendToUsers, true); - fillItems($('.servicesList', page), services, 'chkService', 'chkService', notificationConfig.DisabledServices); - $('#chkEnabled', page).prop('checked', notificationConfig.Enabled || false); - $('#selectUsers', page).val(notificationConfig.SendToUserMode).trigger('change'); - }); -} - -function save(page) { - const type = getParameterByName('type'); - const promise1 = ApiClient.getNamedConfiguration(notificationsConfigurationKey); - // TODO: Check if this promise is really needed, as it's unused. - const promise2 = ApiClient.getJSON(ApiClient.getUrl('Notifications/Types')); - Promise.all([promise1, promise2]).then(function (responses) { - const notificationOptions = responses[0]; - let notificationConfig = notificationOptions.Options.filter(function (n) { - return n.Type == type; - })[0]; - - if (!notificationConfig) { - notificationConfig = { - Type: type - }; - notificationOptions.Options.push(notificationConfig); - } - - notificationConfig.Enabled = $('#chkEnabled', page).is(':checked'); - notificationConfig.SendToUserMode = $('#selectUsers', page).val(); - notificationConfig.DisabledMonitorUsers = $('.chkMonitor', page).get().filter(function (c) { - return !c.checked; - }).map(function (c) { - return c.getAttribute('data-itemid'); - }); - notificationConfig.SendToUsers = $('.chkSendTo', page).get().filter(function (c) { - return c.checked; - }).map(function (c) { - return c.getAttribute('data-itemid'); - }); - notificationConfig.DisabledServices = $('.chkService', page).get().filter(function (c) { - return !c.checked; - }).map(function (c) { - return c.getAttribute('data-itemid'); - }); - ApiClient.updateNamedConfiguration(notificationsConfigurationKey, notificationOptions).then(function () { - Dashboard.processServerConfigurationUpdateResult(); - Dashboard.navigate('notificationsettings.html'); - }); - }); -} - -function onSubmit() { - save($(this).parents('.page')); - return false; -} - -const notificationsConfigurationKey = 'notifications'; -$(document).on('pageinit', '#notificationSettingPage', function () { - const page = this; - $('#selectUsers', page).on('change', function () { - if (this.value == 'Custom') { - $('.selectCustomUsers', page).show(); - } else { - $('.selectCustomUsers', page).hide(); - } - }); - $('.notificationSettingForm').off('submit', onSubmit).on('submit', onSubmit); -}).on('pageshow', '#notificationSettingPage', function () { - reload(this); -}); diff --git a/src/controllers/dashboard/notifications/notifications/index.html b/src/controllers/dashboard/notifications/notifications/index.html deleted file mode 100644 index 241e1cef2c..0000000000 --- a/src/controllers/dashboard/notifications/notifications/index.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
-
-
-
-
-
-
diff --git a/src/controllers/dashboard/notifications/notifications/index.js b/src/controllers/dashboard/notifications/notifications/index.js deleted file mode 100644 index c416cf3170..0000000000 --- a/src/controllers/dashboard/notifications/notifications/index.js +++ /dev/null @@ -1,61 +0,0 @@ -import loading from '../../../../components/loading/loading'; -import globalize from '../../../../scripts/globalize'; -import '../../../../components/listview/listview.scss'; -import '../../../../elements/emby-button/emby-button'; - -function reload(page) { - loading.show(); - ApiClient.getJSON(ApiClient.getUrl('Notifications/Types')).then(function (list) { - let html = ''; - let lastCategory = ''; - let showHelp = true; - html += list.map(function (notification) { - let itemHtml = ''; - if (notification.Category !== lastCategory) { - lastCategory = notification.Category; - if (lastCategory) { - itemHtml += '
'; - itemHtml += ''; - } - itemHtml += '
'; - itemHtml += '
'; - itemHtml += '

'; - itemHtml += notification.Category; - itemHtml += '

'; - if (showHelp) { - showHelp = false; - itemHtml += ''; - itemHtml += globalize.translate('Help'); - itemHtml += ''; - } - itemHtml += '
'; - itemHtml += '
'; - } - itemHtml += ''; - if (notification.Enabled) { - itemHtml += ''; - } else { - itemHtml += ''; - } - itemHtml += '
'; - itemHtml += '
' + notification.Name + '
'; - itemHtml += '
'; - itemHtml += ''; - itemHtml += ''; - return itemHtml; - }).join(''); - - if (list.length) { - html += '
'; - html += '
'; - } - page.querySelector('.notificationList').innerHTML = html; - loading.hide(); - }); -} - -export default function (view) { - view.addEventListener('viewshow', function () { - reload(view); - }); -} diff --git a/src/controllers/dashboard/plugins/add/index.html b/src/controllers/dashboard/plugins/add/index.html index 7d3abd55fa..7f83304609 100644 --- a/src/controllers/dashboard/plugins/add/index.html +++ b/src/controllers/dashboard/plugins/add/index.html @@ -23,7 +23,7 @@
${ServerRestartNeededAfterPluginInstall}
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js index ec7f26a0b2..ae59829aa5 100644 --- a/src/scripts/libraryMenu.js +++ b/src/scripts/libraryMenu.js @@ -516,10 +516,9 @@ function createToolsMenuList(pluginItems) { icon: 'bug_report' }); links.push({ - name: globalize.translate('TabNotifications'), + name: globalize.translate('Notifications'), icon: 'notifications', - href: '#/notificationsettings.html', - pageIds: ['notificationSettingsPage', 'notificationSettingPage'] + href: '#/notificationsettings.html' }); links.push({ name: globalize.translate('TabPlugins'), diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 06da99fada..df3dd81a93 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -4,7 +4,6 @@ "Actor": "Actor", "Add": "Add", "AddedOnValue": "Added {0}", - "AdditionalNotificationServices": "Browse the plugin catalog to install additional notification services.", "AddToCollection": "Add to collection", "AddToFavorites": "Add to favorites", "AddToPlaylist": "Add to playlist", @@ -293,6 +292,7 @@ "General": "General", "Genre": "Genre", "Genres": "Genres", + "GetThePlugin": "Get the Plugin", "GoogleCastUnsupported": "Google Cast Unsupported", "GroupBySeries": "Group by series", "GroupVersions": "Group versions", @@ -773,7 +773,6 @@ "LabelModelName": "Model name", "LabelModelNumber": "Model number", "LabelModelUrl": "Model URL", - "LabelMonitorUsers": "Monitor activity from", "LabelMovieCategories": "Movie categories", "LabelMoviePrefix": "Movie prefix", "LabelMoviePrefixHelp": "If a prefix is applied to movie titles, enter it here so the server can handle it properly.", @@ -785,7 +784,6 @@ "LabelNewPassword": "New password", "LabelNewPasswordConfirm": "New password confirm", "LabelNewsCategories": "News categories", - "LabelNotificationEnabled": "Enable this notification", "LabelNumber": "Number", "LabelNumberOfGuideDays": "Number of days of guide data to download", "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will pick based on the number of channels.", @@ -858,9 +856,7 @@ "LabelSeasonNumber": "Season number", "LabelSelectFolderGroups": "Automatically group content from the following folders into views such as 'Movies', 'Music' and 'TV'", "LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.", - "LabelSelectUsers": "Select users", "LabelSelectVersionToInstall": "Select version to install", - "LabelSendNotificationToUsers": "Send the notification to", "LabelSerialNumber": "Serial number", "LabelSeriesRecordingPath": "Series recording path", "LabelServerHost": "Host", @@ -971,7 +967,6 @@ "LabelUDPPortRange": "UDP Communication Range", "LabelUDPPortRangeHelp": "Restrict Jellyfin to use this port range when making UDP connections. (Default is 1024 - 645535).
Note: Certain function require fixed ports that may be outside of this range.", "LabelUnstable": "Unstable", - "LabelUseNotificationServices": "Use the following services", "LabelUser": "User", "LabelUserAgent": "User agent", "LabelUserLibrary": "User library", @@ -1175,6 +1170,8 @@ "Normal": "Normal", "NoSubtitleSearchResultsFound": "No results found.", "NoSubtitlesHelp": "Subtitles will not be loaded by default. They can still be turned on manually during playback.", + "Notifications": "Notifications", + "NotificationsMovedMessage": "The notifications functionality has moved to the Webhook plugin.", "NumLocationsValue": "{0} folders", "Off": "Off", "OnApplicationStartup": "On application startup", @@ -1184,7 +1181,6 @@ "OnlyImageFormats": "Only Image Formats (VobSub, PGS, SUB)", "OnWakeFromSleep": "On wake from sleep", "Option3D": "3D", - "OptionAdminUsers": "Administrators", "OptionAllowAudioPlaybackTranscoding": "Allow audio playback that requires transcoding", "OptionAllowBrowsingLiveTv": "Allow Live TV access", "OptionAllowContentDownload": "Allow media downloads", @@ -1201,14 +1197,12 @@ "OptionAllowUserToManageServer": "Allow this user to manage the server", "OptionAllowVideoPlaybackRemuxing": "Allow video playback that requires conversion without re-encoding", "OptionAllowVideoPlaybackTranscoding": "Allow video playback that requires transcoding", - "OptionAllUsers": "All users", "OptionAutomaticallyGroupSeries": "Automatically merge series that are spread across multiple folders", "OptionAutomaticallyGroupSeriesHelp": "Series that are spread across multiple folders within this library will be automatically merged into a single series.", "OptionBluray": "BD", "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)", "OptionCommunityRating": "Community Rating", "OptionCriticRating": "Critics Rating", - "OptionCustomUsers": "Custom", "OptionDaily": "Daily", "OptionDateAdded": "Date Added", "OptionDateEpisodeAdded": "Date Episode Added", @@ -1507,7 +1501,6 @@ "TabNetworking": "Networking", "TabNetworks": "TV Networks", "TabNfoSettings": "NFO Settings", - "TabNotifications": "Notifications", "TabOther": "Other", "TabParentalControl": "Parental Control", "TabPlugins": "Plugins",