fix: added Redeploy button that allows the user to sync the latest changes

app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx

@@ -204,6 +204,9 @@ const RightArrowIcon2 = importRemixIcon(
 const RocketIcon = importRemixIcon(
   async () => import("remixicon-react/RocketLineIcon"),
 );
+const RocketDotIcon = importSvg(
+  async () => import("../__assets__/icons/ads/rocket-dot.svg"),
+);
 const RobotIcon = importRemixIcon(
   async () => import("remixicon-react/RobotLineIcon"),
 );
@@ -1589,6 +1592,7 @@ const ICON_LOOKUP = {
   reaction: Reaction,
   refresh: RefreshLineIcon,
   rocket: RocketIcon,
+  "rocket-dot": RocketDotIcon,
   robot: RobotIcon,
   "robot-2": Robot2LineIcon,
   "sparkling-filled": SparklingFilledIcon,

app/client/packages/design-system/widgets-old/src/Icon/index.tsx

@@ -414,6 +414,9 @@ const RightArrowIcon2 = importRemixIcon(
 const RocketIcon = importRemixIcon(
   async () => import("remixicon-react/RocketLineIcon"),
 );
+const RocketDotIcon = importSvg(
+  async () => import("../assets/icons/ads/rocket-dot.svg"),
+);
 const SearchIcon = importRemixIcon(
   async () => import("remixicon-react/SearchLineIcon"),
 );
@@ -869,6 +872,7 @@ const ICON_LOOKUP = {
   reaction: <Reaction />,
   refresh: <RefreshLineIcon />,
   rocket: <RocketIcon />,
+  "rocket-dot": <RocketDotIcon />,
   search: <SearchIcon />,
   setting: <SettingIcon />,
   share: <ShareForwardIcon />,

app/client/src/ce/actions/applicationActions.ts

@@ -185,6 +185,15 @@ export const publishApplication = (applicationId: string) => {
   };
 };
 
+export const redeployApplication = (applicationId: string) => {
+  return {
+    type: ReduxActionTypes.REDEPLOY_APPLICATION_INIT,
+    payload: {
+      applicationId,
+    },
+  };
+};
+
 export const publishAnvilApplication = (applicationId: string) => {
   return {
     type: ReduxActionTypes.PUBLISH_ANVIL_APPLICATION_INIT,

app/client/src/ce/constants/DeploymentConstants.ts

@@ -0,0 +1,25 @@
+import {
+  REDEPLOY_APP_BUTTON_TOOLTIP,
+  REDEPLOY_APP_WARNING,
+} from "ee/constants/messages";
+
+export const REDEPLOY_TRIGGERS = {
+  PendingDeployment: "PENDING_DEPLOYMENT",
+} as const;
+
+type ValueOf<T> = T[keyof T];
+export type RedeployTriggerValue = ValueOf<typeof REDEPLOY_TRIGGERS>;
+
+export const REDEPLOY_WARNING_MESSAGE: Record<
+  RedeployTriggerValue,
+  () => string
+> = {
+  [REDEPLOY_TRIGGERS.PendingDeployment]: REDEPLOY_APP_WARNING,
+};
+
+export const REDEPLOY_BUTTON_TOOLTIP: Record<
+  RedeployTriggerValue,
+  () => string
+> = {
+  [REDEPLOY_TRIGGERS.PendingDeployment]: REDEPLOY_APP_BUTTON_TOOLTIP,
+};

app/client/src/ce/constants/ReduxActionConstants.tsx

@@ -1018,6 +1018,8 @@ const AppViewActionTypes = {
     "FETCH_PUBLISHED_PAGE_RESOURCES_SUCCESS",
   PUBLISH_ANVIL_APPLICATION_INIT: "PUBLISH_ANVIL_APPLICATION_INIT",
   PUBLISH_ANVIL_APPLICATION_SUCCESS: "PUBLISH_ANVIL_APPLICATION_SUCCESS",
+  REDEPLOY_APPLICATION_INIT: "REDEPLOY_APPLICATION_INIT",
+  REDEPLOY_APPLICATION_SUCCESS: "REDEPLOY_APPLICATION_SUCCESS",
 };
 
 const AppViewActionErrorTypes = {
@@ -1028,6 +1030,7 @@ const AppViewActionErrorTypes = {
   FETCH_JS_ACTIONS_VIEW_MODE_ERROR: "FETCH_JS_ACTIONS_VIEW_MODE_ERROR",
   FETCH_PUBLISHED_PAGE_RESOURCES_ERROR: "FETCH_PUBLISHED_PAGE_RESOURCES_ERROR",
   PUBLISH_ANVIL_APPLICATION_ERROR: "PUBLISH_ANVIL_APPLICATION_ERROR",
+  REDEPLOY_APPLICATION_ERROR: "REDEPLOY_APPLICATION_ERROR",
 };
 
 const WorkspaceActionTypes = {

app/client/src/ce/constants/messages.ts

@@ -1054,6 +1054,9 @@ export const CURRENT_PAGE_DISCARD_WARNING = (page: string) =>
   `Current page (${page}) is in the discard list.`;
 export const DISCARD_MESSAGE = () =>
   `Some changes may reappear after discarding them, these changes support new features in Appsmith. You can safely commit them to your repository.`;
+export const REDEPLOY_APP_WARNING = () =>
+  "We have noticed some changes and require you to redeploy your application to see the latest updates.";
+
 // GIT DEPLOY end
 
 // GIT CHANGE LIST begin
@@ -1462,6 +1465,8 @@ export const LAYOUT_DROPDOWN_TOOLTIP = () =>
   "Choose how your application looks on desktop, tablet and mobile devices";
 export const DEPLOY_BUTTON_TOOLTIP = () =>
   "Deploy the current version of the application";
+export const REDEPLOY_APP_BUTTON_TOOLTIP = () =>
+  "Redeploy to see the latest updates";
 export const SHARE_BUTTON_TOOLTIP = () => "Invite your team to Appsmith";
 export const SHARE_BUTTON_TOOLTIP_WITH_USER = (length: number) => () =>
   `Shared with ${length} other`;
@@ -1474,6 +1479,7 @@ export const NOTIFICATIONS_TOOLTIP = () => "Notifications";
 
 // Navigation Menu
 export const DEPLOY_MENU_OPTION = () => "Deploy";
+export const REDEPLOY_MENU_OPTION = () => "Redeploy";
 export const CURRENT_DEPLOY_PREVIEW_OPTION = () => "Current deployed version";
 export const CONNECT_TO_GIT_OPTION = () => "Connect to Git repository";
 //

app/client/src/ce/reducers/uiReducers/editorReducer.tsx

@@ -18,6 +18,8 @@ export const initialState: EditorReduxState = {
   loadingStates: {
     publishing: false,
     publishingError: false,
+    redeploying: false,
+    redeployingError: false,
     saving: false,
     savingError: false,
     savingEntity: false,
@@ -117,6 +119,28 @@ export const handlers = {
 
     return { ...state };
   },
+  [ReduxActionTypes.REDEPLOY_APPLICATION_INIT]: (state: EditorReduxState) => {
+    state.loadingStates.redeploying = true;
+    state.loadingStates.redeployingError = false;
+
+    return { ...state };
+  },
+  [ReduxActionErrorTypes.REDEPLOY_APPLICATION_ERROR]: (
+    state: EditorReduxState,
+  ) => {
+    state.loadingStates.redeploying = false;
+    state.loadingStates.redeployingError = true;
+
+    return { ...state };
+  },
+  [ReduxActionTypes.REDEPLOY_APPLICATION_SUCCESS]: (
+    state: EditorReduxState,
+  ) => {
+    state.loadingStates.redeploying = false;
+    state.loadingStates.redeployingError = false;
+
+    return { ...state };
+  },
   [ReduxActionTypes.SAVE_PAGE_INIT]: (state: EditorReduxState) => {
     state.loadingStates.saving = true;
     state.loadingStates.savingError = false;
@@ -338,6 +362,8 @@ export interface EditorReduxState {
     publishing: boolean;
     published?: string;
     publishingError: boolean;
+    redeploying: boolean;
+    redeployingError: boolean;
     loading: boolean;
     loadingError: boolean;
     isPageSwitching: boolean;

app/client/src/ce/sagas/ApplicationSagas.tsx

@@ -224,6 +224,63 @@ export function* publishApplicationSaga(
   }
 }
 
+export function* redeployApplicationSaga() {
+  try {
+    const currentApplication: ApplicationPayload | undefined = yield select(
+      getCurrentApplication,
+    );
+
+    if (!currentApplication) {
+      throw new Error("Current Application is missing while redeploying App");
+    }
+
+    const applicationId: string = currentApplication.id;
+    const appName: string = currentApplication.name;
+
+    AnalyticsUtil.logEvent("REDEPLOY_APP", {
+      appId: applicationId,
+      appName,
+    });
+    const request: PublishApplicationRequest = {
+      applicationId,
+    };
+    const response: PublishApplicationResponse = yield call(
+      ApplicationApi.publishApplication,
+      request,
+    );
+    const isValidResponse: boolean = yield validateResponse(response);
+
+    if (isValidResponse) {
+      const currentPageId: string = yield select(getCurrentPageId);
+
+      yield put(
+        fetchApplication({
+          applicationId,
+          pageId: currentPageId,
+          mode: APP_MODE.EDIT,
+        }),
+      );
+
+      // Wait for the fetch application success or error to ensure the application is fetched
+      yield take([
+        ReduxActionTypes.FETCH_APPLICATION_SUCCESS,
+        ReduxActionErrorTypes.FETCH_APPLICATION_ERROR,
+      ]);
+
+      yield put({
+        type: ReduxActionTypes.REDEPLOY_APPLICATION_SUCCESS,
+      });
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.REDEPLOY_APPLICATION_ERROR,
+      payload: {
+        error,
+      },
+    });
+  }
+}
+
 export function* fetchAllApplicationsOfWorkspaceSaga(
   action?: ReduxAction<string>,
 ) {

app/client/src/ce/selectors/applicationSelectors.tsx

@@ -11,6 +11,10 @@ import type { GitApplicationMetadata } from "ee/api/ApplicationApi";
 import { getApplicationsOfWorkspace } from "ee/selectors/selectedWorkspaceSelectors";
 import { type ThemeSetting, defaultThemeSetting } from "constants/AppConstants";
 import { DEFAULT_EVALUATION_VERSION } from "constants/EvalConstants";
+import {
+  REDEPLOY_TRIGGERS,
+  type RedeployTriggerValue,
+} from "ee/constants/DeploymentConstants";
 
 const fuzzySearchOptions = {
   keys: ["applications.name", "workspace.name", "packages.name"],
@@ -214,3 +218,28 @@ export const getIsFetchingAppSlugSuggestion = (state: DefaultRootState) =>
 
 export const getAppSlugSuggestion = (state: DefaultRootState) =>
   state.ui.applications.appSlugSuggestion;
+
+export const getRedeployApplicationTrigger = createSelector(
+  getCurrentApplication,
+  (currentApplication): RedeployTriggerValue | null => {
+    if (!currentApplication?.modifiedAt) {
+      return null;
+    }
+
+    if (!currentApplication?.lastDeployedAt) {
+      return REDEPLOY_TRIGGERS.PendingDeployment;
+    }
+
+    const lastDeployedAtMs = new Date(
+      currentApplication.lastDeployedAt,
+    ).getTime();
+    const modifiedAtMs = new Date(currentApplication.modifiedAt).getTime();
+
+    // If modifiedAt is greater than lastDeployedAt by more than 1 second, deployment is needed
+    if (modifiedAtMs - lastDeployedAtMs > 1000) {
+      return REDEPLOY_TRIGGERS.PendingDeployment;
+    }
+
+    return null;
+  },
+);

app/client/src/ce/utils/analyticsUtilTypes.ts

@@ -42,6 +42,7 @@ export type EventName =
   | "DELETE_PAGE"
   | "SIDEBAR_NAVIGATION"
   | "PUBLISH_APP"
+  | "REDEPLOY_APP"
   | "PREVIEW_APP"
   | "APP_VIEWED_WITH_NAVBAR"
   | "EDITOR_OPEN"
@@ -202,6 +203,7 @@ export type EventName =
   | "GS_DEPLOY_GIT_CLICK"
   | "GS_DEPLOY_GIT_MODAL_TRIGGERED"
   | "GS_MERGE_GIT_MODAL_TRIGGERED"
+  | "GS_REDEPLOY_APPLICATION_CLICK"
   | "GS_SETTINGS_GIT_MODAL_TRIGGERED"
   | "GS_REPO_LIMIT_ERROR_MODAL_TRIGGERED"
   | "GS_GIT_DOCUMENTATION_LINK_CLICK"

app/client/src/ee/constants/DeploymentConstants.ts

@@ -0,0 +1 @@
+export * from "ce/constants/DeploymentConstants";

app/client/src/ee/sagas/ApplicationSagas.tsx

@@ -1,6 +1,7 @@
 export * from "ce/sagas/ApplicationSagas";
 import {
   publishApplicationSaga,
+  redeployApplicationSaga,
   updateApplicationLayoutSaga,
   updateApplicationSaga,
   changeAppViewAccessSaga,
@@ -33,6 +34,10 @@ export default function* applicationSagas() {
       ReduxActionTypes.PUBLISH_APPLICATION_INIT,
       publishApplicationSaga,
     ),
+    takeLatest(
+      ReduxActionTypes.REDEPLOY_APPLICATION_INIT,
+      redeployApplicationSaga,
+    ),
     takeLatest(ReduxActionTypes.UPDATE_APP_LAYOUT, updateApplicationLayoutSaga),
     takeLatest(ReduxActionTypes.UPDATE_APPLICATION, updateApplicationSaga),
     takeLatest(

app/client/src/git/components/OpsModal/TabDeploy/RedeployWarning.tsx

@@ -0,0 +1,47 @@
+import React from "react";
+import { createMessage } from "ee/constants/messages";
+import {
+  REDEPLOY_WARNING_MESSAGE,
+  type RedeployTriggerValue,
+} from "ee/constants/DeploymentConstants";
+import { Callout, Text } from "@appsmith/ads";
+import styled from "styled-components";
+
+const Container = styled.div`
+  margin: 8px 0 16px;
+`;
+
+interface RedeployWarningProps {
+  redeployTrigger: RedeployTriggerValue | null;
+}
+
+const RedeployWarning: React.FC<RedeployWarningProps> = ({
+  redeployTrigger,
+}) => {
+  const redeployDocUrl =
+    "https://docs.appsmith.com/advanced-concepts/version-control-with-git/commit-and-push";
+
+  return (
+    <Container>
+      <Callout
+        data-testid="t--git-ops-redeploy-warning-callout"
+        kind="warning"
+        links={[
+          {
+            children: "Learn more",
+            endIcon: "right-arrow",
+            to: redeployDocUrl,
+            target: "_blank",
+          },
+        ]}
+      >
+        <Text kind="heading-xs">
+          {redeployTrigger &&
+            createMessage(REDEPLOY_WARNING_MESSAGE[redeployTrigger])}
+        </Text>
+      </Callout>
+    </Container>
+  );
+};
+
+export default RedeployWarning;