From 9112f8a148a1f12c3f8cb3d59606d72afb962055 Mon Sep 17 00:00:00 2001 From: Ashit Rath Date: Mon, 16 Dec 2024 14:12:26 +0530 Subject: [PATCH] chore: add packagePullStatus to consolidated API --- app/client/src/actions/pageActions.tsx | 15 ++++++++++----- .../components/BottomBar/PackageUpgradeStatus.tsx | 6 ++++++ app/client/src/ce/constants/ModuleConstants.ts | 6 ++++++ app/client/src/components/BottomBar/index.tsx | 2 ++ .../components/BottomBar/PackageUpgradeStatus.tsx | 3 +++ app/client/src/entities/Engine/AppEditorEngine.ts | 8 +++++++- app/client/src/pages/Editor/index.tsx | 2 +- app/client/src/sagas/InitSagas.ts | 2 ++ 8 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 app/client/src/ce/components/BottomBar/PackageUpgradeStatus.tsx create mode 100644 app/client/src/ee/components/BottomBar/PackageUpgradeStatus.tsx diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx index 22cfe873e309..0ec4b9806ce3 100644 --- a/app/client/src/actions/pageActions.tsx +++ b/app/client/src/actions/pageActions.tsx @@ -31,6 +31,8 @@ import type { PageAction, } from "../constants/AppsmithActionConstants/ActionConstants"; import { ReplayOperation } from "entities/Replay/ReplayEntity/ReplayOperations"; +import type { PACKAGE_PULL_STATUS } from "ee/constants/ModuleConstants"; +import type { ApiResponse } from "api/ApiResponses"; export interface FetchPageListPayload { applicationId: string; @@ -657,18 +659,21 @@ export interface SetupPageActionPayload { id: string; isFirstLoad?: boolean; pageWithMigratedDsl?: FetchPageResponse; + packagePullStatus?: ApiResponse; } -export const setupPageAction = ( - pageId: string, +export const setupPageAction = ({ + id, isFirstLoad = false, - pageWithMigratedDsl?: FetchPageResponse, -): ReduxAction => ({ + packagePullStatus, + pageWithMigratedDsl, +}: SetupPageActionPayload) => ({ type: ReduxActionTypes.SETUP_PAGE_INIT, payload: { - id: pageId, + id, isFirstLoad, pageWithMigratedDsl, + packagePullStatus, }, }); diff --git a/app/client/src/ce/components/BottomBar/PackageUpgradeStatus.tsx b/app/client/src/ce/components/BottomBar/PackageUpgradeStatus.tsx new file mode 100644 index 000000000000..455b707744ce --- /dev/null +++ b/app/client/src/ce/components/BottomBar/PackageUpgradeStatus.tsx @@ -0,0 +1,6 @@ +// The implementation of this is present in EE +function PackageUpgradeStatus() { + return null; +} + +export default PackageUpgradeStatus; diff --git a/app/client/src/ce/constants/ModuleConstants.ts b/app/client/src/ce/constants/ModuleConstants.ts index 189b5a014aaa..2c101aa279f4 100644 --- a/app/client/src/ce/constants/ModuleConstants.ts +++ b/app/client/src/ce/constants/ModuleConstants.ts @@ -32,3 +32,9 @@ export interface ModuleMetadata { pluginId: string; pluginType: PluginType; } + +export enum PACKAGE_PULL_STATUS { + UPGRADABLE = "UPGRADABLE", + UPGRADED = "UPGRADED", + UPGRADING = "UPGRADING", +} diff --git a/app/client/src/components/BottomBar/index.tsx b/app/client/src/components/BottomBar/index.tsx index c40dbca3fc34..565844eacfb4 100644 --- a/app/client/src/components/BottomBar/index.tsx +++ b/app/client/src/components/BottomBar/index.tsx @@ -15,6 +15,7 @@ import { useDispatch } from "react-redux"; import { softRefreshActions } from "actions/pluginActionActions"; import { START_SWITCH_ENVIRONMENT } from "ee/constants/messages"; import { getIsAnvilEnabledInCurrentApplication } from "layoutSystems/anvil/integrations/selectors"; +import PackageUpgradeStatus from "ee/components/BottomBar/PackageUpgradeStatus"; export default function BottomBar() { const appId = useSelector(getCurrentApplicationId) || ""; @@ -44,6 +45,7 @@ export default function BottomBar() { {!isPreviewMode && ( +