From f3be917da115069c27cad05f2f54b04abfc53a7e Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 25 Apr 2023 12:16:02 +0100 Subject: [PATCH] Enrich the upgradable version property when fetching the app package --- packages/builder/src/builderStore/store/frontend.js | 1 + .../builder/src/components/deploy/VersionModal.svelte | 9 ++++----- .../builder/portal/overview/[appId]/overview.svelte | 7 +++---- .../pages/builder/portal/overview/[appId]/version.svelte | 5 ++--- packages/server/src/api/controllers/application.ts | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 3fc0eb769e..e264dc099b 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -134,6 +134,7 @@ export const getFrontendStore = () => { previousTopNavPath: {}, version: application.version, revertableVersion: application.revertableVersion, + upgradableVersion: application.upgradableVersion, navigation: application.navigation || {}, usedPlugins: application.usedPlugins || [], })) diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte index f357cc7820..75acc974ce 100644 --- a/packages/builder/src/components/deploy/VersionModal.svelte +++ b/packages/builder/src/components/deploy/VersionModal.svelte @@ -9,7 +9,6 @@ } from "@budibase/bbui" import { store } from "builderStore" import { API } from "api" - import clientPackage from "@budibase/client/package.json" export function show() { updateModal.show() @@ -25,9 +24,9 @@ $: appId = $store.appId $: updateAvailable = - clientPackage.version && + $store.upgradableVersion && $store.version && - clientPackage.version !== $store.version + $store.upgradableVersion !== $store.version $: revertAvailable = $store.revertableVersion != null const refreshAppPackage = async () => { @@ -46,7 +45,7 @@ // Don't wait for the async refresh, since this causes modal flashing refreshAppPackage() notifications.success( - `App updated successfully to version ${clientPackage.version}` + `App updated successfully to version ${$store.upgradableVersion}` ) } catch (err) { notifications.error(`Error updating app: ${err}`) @@ -91,7 +90,7 @@ {#if updateAvailable} This app is currently using version {$store.version}, but version - {clientPackage.version} is available. Updates can contain new features, + {$store.upgradableVersion} is available. Updates can contain new features, performance improvements and bug fixes. {:else} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte index 2d2b6775fb..c049a610b6 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte @@ -13,7 +13,6 @@ notifications, } from "@budibase/bbui" import { store } from "builderStore" - import clientPackage from "@budibase/client/package.json" import { processStringSync } from "@budibase/string-templates" import { users, auth, apps, groups, overview } from "stores/portal" import { fetchData } from "@budibase/frontend-core" @@ -40,7 +39,7 @@ }, }, }) - $: updateAvailable = clientPackage.version !== $store.version + $: updateAvailable = $store.upgradableVersion !== $store.version $: isPublished = app?.status === AppStatus.DEPLOYED $: appEditorId = !app?.updatedBy ? $auth.user._id : app?.updatedBy $: appEditorText = appEditor?.firstName || appEditor?.email @@ -172,8 +171,8 @@ {$store.version} {#if updateAvailable}
- New version {clientPackage.version} is available - - + New version {$store.upgradableVersion} is + available - { $goto("./version") diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte index 676d0b4f59..723e32984d 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte @@ -1,12 +1,11 @@ @@ -18,7 +17,7 @@ {#if updateAvailable} The app is currently using version {$store.version} - but version {clientPackage.version} is available. + but version {$store.upgradableVersion} is available.
Updates can contain new features, performance improvements and bug fixes. diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index ec68ca4c72..77a4e7c7f1 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -223,7 +223,7 @@ export async function fetchAppPackage(ctx: UserCtx) { ) ctx.body = { - application, + application : {...application, upgradableVersion : envCore.VERSION}, screens, layouts, clientLibPath,