From 19e20749c181588b1e3d1537696af11839ffc25e Mon Sep 17 00:00:00 2001 From: fallenbagel <98979876+Fallenbagel@users.noreply.github.com> Date: Thu, 14 Mar 2024 04:07:03 +0500 Subject: [PATCH] revert: removed conditional render of the auto-request permission reverts the conditional render toshow the auto-request permission if the mediaServerType was set to Plex as this should be handled in a different PR and Cypress tests should be modified accordingly(currently cypress test would fail if this conditional check is there) --- src/components/PermissionEdit/index.tsx | 88 +++++++++++++------------ 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/src/components/PermissionEdit/index.tsx b/src/components/PermissionEdit/index.tsx index b328cc780..82971bf03 100644 --- a/src/components/PermissionEdit/index.tsx +++ b/src/components/PermissionEdit/index.tsx @@ -138,13 +138,19 @@ export const PermissionEdit = ({ mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.PLEX ? 'Plex' - : 'Local', + : settings.currentSettings.mediaServerType === + MediaServerType.JELLYFIN + ? 'Jellyfin' + : 'Emby', }), description: intl.formatMessage(messages.viewwatchlistsDescription, { mediaServerName: settings.currentSettings.mediaServerType === MediaServerType.PLEX ? 'Plex' - : 'Local', + : settings.currentSettings.mediaServerType === + MediaServerType.JELLYFIN + ? 'Jellyfin' + : 'Emby', }), permission: Permission.WATCHLIST_VIEW, }, @@ -207,47 +213,43 @@ export const PermissionEdit = ({ }, ], }, - ...(settings.currentSettings.mediaServerType === MediaServerType.PLEX - ? [ - { - id: 'autorequest', - name: intl.formatMessage(messages.autorequest), - description: intl.formatMessage(messages.autorequestDescription), - permission: Permission.AUTO_REQUEST, - requires: [{ permissions: [Permission.REQUEST] }], - children: [ - { - id: 'autorequestmovies', - name: intl.formatMessage(messages.autorequestMovies), - description: intl.formatMessage( - messages.autorequestMoviesDescription - ), - permission: Permission.AUTO_REQUEST_MOVIE, - requires: [ - { - permissions: [Permission.REQUEST, Permission.REQUEST_MOVIE], - type: 'or', - }, - ], - }, - { - id: 'autorequesttv', - name: intl.formatMessage(messages.autorequestSeries), - description: intl.formatMessage( - messages.autorequestSeriesDescription - ), - permission: Permission.AUTO_REQUEST_TV, - requires: [ - { - permissions: [Permission.REQUEST, Permission.REQUEST_TV], - type: 'or', - }, - ], - }, - ], - } as PermissionItem, - ] - : []), + { + id: 'autorequest', + name: intl.formatMessage(messages.autorequest), + description: intl.formatMessage(messages.autorequestDescription), + permission: Permission.AUTO_REQUEST, + requires: [{ permissions: [Permission.REQUEST] }], + children: [ + { + id: 'autorequestmovies', + name: intl.formatMessage(messages.autorequestMovies), + description: intl.formatMessage( + messages.autorequestMoviesDescription + ), + permission: Permission.AUTO_REQUEST_MOVIE, + requires: [ + { + permissions: [Permission.REQUEST, Permission.REQUEST_MOVIE], + type: 'or', + }, + ], + }, + { + id: 'autorequesttv', + name: intl.formatMessage(messages.autorequestSeries), + description: intl.formatMessage( + messages.autorequestSeriesDescription + ), + permission: Permission.AUTO_REQUEST_TV, + requires: [ + { + permissions: [Permission.REQUEST, Permission.REQUEST_TV], + type: 'or', + }, + ], + }, + ], + }, { id: 'request4k', name: intl.formatMessage(messages.request4k),