From 73672e29f87dc376d8517fa1343dd3d8a93babbd Mon Sep 17 00:00:00 2001 From: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com> Date: Wed, 13 Apr 2022 17:21:03 +0500 Subject: [PATCH] fix: fixed jellyseerr out of date on stable version When jellyseerr latest version or the stable version was deployed, the version was shown as out of date with a message to up date to the latest version even though it was the latest version. This fixed that issue --- src/components/Layout/VersionStatus/index.tsx | 13 ++++++++----- src/components/Settings/SettingsAbout/index.tsx | 10 +++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/components/Layout/VersionStatus/index.tsx b/src/components/Layout/VersionStatus/index.tsx index ca8150a7..2016b6bb 100644 --- a/src/components/Layout/VersionStatus/index.tsx +++ b/src/components/Layout/VersionStatus/index.tsx @@ -1,6 +1,6 @@ import { ArrowCircleUpIcon, - BeakerIcon, + // BeakerIcon, CodeIcon, ServerIcon, } from '@heroicons/react/outline'; @@ -36,7 +36,7 @@ const VersionStatus: React.FC = ({ onClick }) => { data.commitTag === 'local' ? 'Keep it up! 👍' : data.version.startsWith('develop-') - ? intl.formatMessage(messages.streamdevelop) + ? intl.formatMessage(messages.streamstable) : intl.formatMessage(messages.streamstable); return ( @@ -52,14 +52,16 @@ const VersionStatus: React.FC = ({ onClick }) => { tabIndex={0} className={`flex items-center p-2 mx-2 text-xs transition duration-300 rounded-lg ring-1 ring-gray-700 ${ data.updateAvailable - ? 'bg-yellow-500 text-white hover:bg-yellow-400' + ? // ? 'bg-yellow-500 text-white hover:bg-yellow-400' + 'bg-gray-900 text-gray-300 hover:bg-gray-800' : 'bg-gray-900 text-gray-300 hover:bg-gray-800' }`} > {data.commitTag === 'local' ? ( ) : data.version.startsWith('develop-') ? ( - + // + ) : ( )} @@ -72,7 +74,8 @@ const VersionStatus: React.FC = ({ onClick }) => { intl.formatMessage(messages.commitsbehind, { commitsBehind: data.commitsBehind, }) - ) : data.commitsBehind === -1 ? ( + ) : // ) : data.commitsBehind === -1 ? ( + data.commitsBehind === 0 ? ( intl.formatMessage(messages.outofdate) ) : ( diff --git a/src/components/Settings/SettingsAbout/index.tsx b/src/components/Settings/SettingsAbout/index.tsx index f3e59739..4f10797d 100644 --- a/src/components/Settings/SettingsAbout/index.tsx +++ b/src/components/Settings/SettingsAbout/index.tsx @@ -85,10 +85,10 @@ const SettingsAbout: React.FC = () => { title={intl.formatMessage(messages.version)} className="truncate" > - {data.version.replace('develop-', '')} + {/* {data.version.replace('develop-', '')} */} {status?.updateAvailable ? ( - - {intl.formatMessage(messages.outofdate)} + + {intl.formatMessage(messages.uptodate)} ) : ( status?.commitTag !== 'local' && ( @@ -115,12 +115,12 @@ const SettingsAbout: React.FC = () => { - https://github.com/Fallenbagel/jellyseerr#readme + https://github.com/Fallenbagel/jellyseerr/blob/main/README.md