Merge pull request #41473 from appsmithorg/release

17/12 - Daily Promotion

Author: btsgh

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/ads/src/__assets__/icons/ads/rocket-dot.svg

@@ -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/packages/design-system/widgets-old/src/Icon/index.tsx

@@ -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/packages/design-system/widgets-old/src/assets/icons/ads/rocket-dot.svg

@@ -0,0 +1,15 @@
+import { 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,
+};

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

@@ -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/DeploymentConstants.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 = () =>
+  "The deployed version of this app is not using the latest versions of some packages. Redeploy to apply the latest package versions to the app.";
+
 // 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 needed to sync changes from edit mode";
 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";
 //
@@ -1706,6 +1712,8 @@ export const ADMIN_BRANDING_LOGO_FORMAT_ERROR = () =>
   `Uploaded file must be in .SVG .PNG, and .JPG formats`;
 export const ADMIN_BRANDING_LOGO_REQUIREMENT = () =>
   `.SVG, .PNG, or .JPG only • Max 2MB`;
+export const ADMIN_BRANDING_LOGO_SIZE_HELP = () =>
+  "Set maximum logo size in pixels. Defaults to 10rem (160px) width and 1.5rem (24px) height.";
 export const ADMIN_BRANDING_FAVICON_DIMENSION_ERROR = () =>
   `Uploaded file must have a max size of 48X48 pixels`;
 export const ADMIN_BRANDING_FAVICON_SIZE_ERROR = () =>

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

@@ -66,6 +66,7 @@ export const FEATURE_FLAG = {
     "configure_block_event_tracking_for_anonymous_users",
   release_static_url_enabled: "release_static_url_enabled",
   release_window_dimensions_enabled: "release_window_dimensions_enabled",
+  release_branding_logo_resize_enabled: "release_branding_logo_resize_enabled",
 } as const;
 
 export type FeatureFlag = keyof typeof FEATURE_FLAG;
@@ -120,6 +121,7 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   configure_block_event_tracking_for_anonymous_users: false,
   release_static_url_enabled: false,
   release_window_dimensions_enabled: false,
+  release_branding_logo_resize_enabled: false,
 };
 
 export const AB_TESTING_EVENT_KEYS = {

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

@@ -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;