Merge pull request #121 from notfakie/develop

Hide Overseerr settings when running in Jellyfin/Emby mode
Fallenbagel · Jun 2, 2022 · 5298e5f · 5298e5f
2 parents 3e7d64e + 7450138
commit 5298e5f
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 64 deletions.
diff --git a/src/components/Settings/SettingsAbout/index.tsx b/src/components/Settings/SettingsAbout/index.tsx
@@ -188,35 +188,6 @@ const SettingsAbout: React.FC = () => {
           </List.Item>
         </List>
       </div>
-      <div className="section">
-        <List title={intl.formatMessage(messages.supportoverseerr)}>
-          <List.Item
-            title={`${intl.formatMessage(messages.helppaycoffee)} ☕️`}
-          >
-            <a
-              href="https://github.com/sponsors/sct"
-              target="_blank"
-              rel="noreferrer"
-              className="text-indigo-500 transition duration-300 hover:underline"
-            >
-              https://github.com/sponsors/sct
-            </a>
-            <Badge className="ml-2">
-              {intl.formatMessage(messages.preferredmethod)}
-            </Badge>
-          </List.Item>
-          <List.Item title="">
-            <a
-              href="https://patreon.com/overseerr"
-              target="_blank"
-              rel="noreferrer"
-              className="text-indigo-500 transition duration-300 hover:underline"
-            >
-              https://patreon.com/overseerr
-            </a>
-          </List.Item>
-        </List>
-      </div>
       <div className="section">
         <Releases currentVersion={data.version} />
       </div>

diff --git a/src/components/Settings/SettingsJobsCache/index.tsx b/src/components/Settings/SettingsJobsCache/index.tsx
@@ -10,9 +10,11 @@ import {
 } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
+import { MediaServerType } from '../../../../server/constants/server';
 import { CacheItem } from '../../../../server/interfaces/api/settingsInterfaces';
 import { JobId } from '../../../../server/lib/settings';
 import Spinner from '../../../assets/spinner.svg';
+import useSettings from '../../../hooks/useSettings';
 import globalMessages from '../../../i18n/globalMessages';
 import { formatBytes } from '../../../utils/numberHelpers';
 import Badge from '../../Common/Badge';
@@ -102,6 +104,7 @@ const SettingsJobs: React.FC = () => {
   const [isSaving, setIsSaving] = useState(false);
   const [jobScheduleMinutes, setJobScheduleMinutes] = useState(5);
   const [jobScheduleHours, setJobScheduleHours] = useState(1);
+  const settings = useSettings();
 
   if (!data && !error) {
     return <LoadingSpinner />;
@@ -369,22 +372,33 @@ const SettingsJobs: React.FC = () => {
             </tr>
           </thead>
           <Table.TBody>
-            {cacheData?.map((cache) => (
-              <tr key={`cache-list-${cache.id}`}>
-                <Table.TD>{cache.name}</Table.TD>
-                <Table.TD>{intl.formatNumber(cache.stats.hits)}</Table.TD>
-                <Table.TD>{intl.formatNumber(cache.stats.misses)}</Table.TD>
-                <Table.TD>{intl.formatNumber(cache.stats.keys)}</Table.TD>
-                <Table.TD>{formatBytes(cache.stats.ksize)}</Table.TD>
-                <Table.TD>{formatBytes(cache.stats.vsize)}</Table.TD>
-                <Table.TD alignText="right">
-                  <Button buttonType="danger" onClick={() => flushCache(cache)}>
-                    <TrashIcon />
-                    <span>{intl.formatMessage(messages.flushcache)}</span>
-                  </Button>
-                </Table.TD>
-              </tr>
-            ))}
+            {cacheData
+              ?.filter(
+                (cache) =>
+                  !(
+                    settings.currentSettings.mediaServerType !==
+                      MediaServerType.PLEX && cache.id === 'plexguid'
+                  )
+              )
+              .map((cache) => (
+                <tr key={`cache-list-${cache.id}`}>
+                  <Table.TD>{cache.name}</Table.TD>
+                  <Table.TD>{intl.formatNumber(cache.stats.hits)}</Table.TD>
+                  <Table.TD>{intl.formatNumber(cache.stats.misses)}</Table.TD>
+                  <Table.TD>{intl.formatNumber(cache.stats.keys)}</Table.TD>
+                  <Table.TD>{formatBytes(cache.stats.ksize)}</Table.TD>
+                  <Table.TD>{formatBytes(cache.stats.vsize)}</Table.TD>
+                  <Table.TD alignText="right">
+                    <Button
+                      buttonType="danger"
+                      onClick={() => flushCache(cache)}
+                    >
+                      <TrashIcon />
+                      <span>{intl.formatMessage(messages.flushcache)}</span>
+                    </Button>
+                  </Table.TD>
+                </tr>
+              ))}
           </Table.TBody>
         </Table>
       </div>

diff --git a/src/components/Settings/SettingsLayout.tsx b/src/components/Settings/SettingsLayout.tsx
@@ -1,9 +1,11 @@
+import getConfig from 'next/config';
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
+import { MediaServerType } from '../../../server/constants/server';
+import useSettings from '../../hooks/useSettings';
 import globalMessages from '../../i18n/globalMessages';
 import PageTitle from '../Common/PageTitle';
 import SettingsTabs, { SettingsRoute } from '../Common/SettingsTabs';
-import getConfig from 'next/config';
 
 const messages = defineMessages({
   menuGeneralSettings: 'General',
@@ -20,6 +22,7 @@ const messages = defineMessages({
 const SettingsLayout: React.FC = ({ children }) => {
   const intl = useIntl();
   const { publicRuntimeConfig } = getConfig();
+  const settings = useSettings();
   const settingsRoutes: SettingsRoute[] = [
     {
       text: intl.formatMessage(messages.menuGeneralSettings),
@@ -31,16 +34,17 @@ const SettingsLayout: React.FC = ({ children }) => {
       route: '/settings/users',
       regex: /^\/settings\/users/,
     },
-    {
-      text: intl.formatMessage(messages.menuPlexSettings),
-      route: '/settings/plex',
-      regex: /^\/settings\/plex/,
-    },
-    {
-      text: getAvalaibleMediaServerName(),
-      route: '/settings/jellyfin',
-      regex: /^\/settings\/jellyfin/,
-    },
+    settings.currentSettings.mediaServerType === MediaServerType.PLEX
+      ? {
+          text: intl.formatMessage(messages.menuPlexSettings),
+          route: '/settings/plex',
+          regex: /^\/settings\/plex/,
+        }
+      : {
+          text: getAvailableMediaServerName(),
+          route: '/settings/jellyfin',
+          regex: /^\/settings\/jellyfin/,
+        },
     {
       text: intl.formatMessage(messages.menuServices),
       route: '/settings/services',
@@ -77,15 +81,10 @@ const SettingsLayout: React.FC = ({ children }) => {
       <div className="mt-10 text-white">{children}</div>
     </>
   );
-  function getAvalaibleMediaServerName() {
-    if (publicRuntimeConfig.JELLYFIN_TYPE === 'emby') {
-      return intl.formatMessage(messages.menuJellyfinSettings, {
-        mediaServerName: 'Emby',
-      });
-    }
-
+  function getAvailableMediaServerName() {
     return intl.formatMessage(messages.menuJellyfinSettings, {
-      mediaServerName: 'Jellyfin',
+      mediaServerName:
+        publicRuntimeConfig.JELLYFIN_TYPE === 'emby' ? 'Emby' : 'Jellyfin',
     });
   }
 };