diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LocalVersionPopover.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LocalVersionPopover.tsx index 1fdd245e201..6adaa0abf2b 100644 --- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LocalVersionPopover.tsx +++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LocalVersionPopover.tsx @@ -28,15 +28,18 @@ import { getSemver, semverGte, semverLte } from './LocalVersionPopover.utils' export const LocalVersionPopover = () => { const { data, isSuccess } = useCLIReleaseVersionQuery() const currentCliVersion = data?.current - const hasLatestCLIVersion = isSuccess && !!data?.latest + const latestCliVersion = data?.latest + const hasLatestCLIVersion = isSuccess && !!latestCliVersion - const current = getSemver(data?.current) - const latest = getSemver(data?.latest) + const current = getSemver(currentCliVersion) + const latest = getSemver(latestCliVersion) const hasUpdate = - !!current && !!latest ? data?.current !== data?.latest && semverLte(current, latest) : false + !!current && !!latest + ? currentCliVersion !== latestCliVersion && semverLte(current, latest) + : false const isBeta = - !!current && !!latest && data?.current !== data?.latest && semverGte(current, latest) + !!current && !!latest && currentCliVersion !== latestCliVersion && semverGte(current, latest) const approximateNextRelease = !!data?.published_at ? dayjs(data?.published_at).utc().add(14, 'day').format('DD MMM YYYY') @@ -180,7 +183,7 @@ export const LocalVersionPopover = () => { {hasLatestCLIVersion && hasUpdate && !isBeta && (

Available version:

-

{data.latest}

+

{latestCliVersion}

)} diff --git a/apps/studio/pages/api/cli-release-version.ts b/apps/studio/pages/api/cli-release-version.ts index 0c67461cb35..7c6ce96b38a 100644 --- a/apps/studio/pages/api/cli-release-version.ts +++ b/apps/studio/pages/api/cli-release-version.ts @@ -8,7 +8,7 @@ type GitHubRepositoryRelease = { published_at: string } -const current = process.env.CURRENT_CLI_VERSION +const current = `v${process.env.CURRENT_CLI_VERSION}` const handler = async (req: NextApiRequest, res: NextApiResponse) => { try {