Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o action-redesign/anthropic

app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilSpaceDistribution_spec.ts

@@ -175,26 +175,21 @@ describe(
       );
 
       const zone1Selector = anvilLocators.anvilWidgetNameSelector("Zone1");
+      const section1Selector =
+        anvilLocators.anvilWidgetNameSelector("Section1");
+
       anvilLayout.sections.mouseDownSpaceDistributionHandle("Section1", 1);
       // outline color of zone while distributing space should be transparent
       cy.get(zone1Selector).should(
         "have.css",
         "outline-color",
         "rgba(0, 0, 0, 0)",
       );
-      anvilLayout.sections.mouseUpSpaceDistributionHandle("Section1", 1);
-      // select zone1
-      agHelper.GetNClick(zone1Selector);
-      // go to style tab
-      propPane.MoveToTab("Style");
-      // toggle visual separation off on property pane
-      propPane.TogglePropertyState("Visual Separation", "Off");
-      anvilLayout.sections.mouseDownSpaceDistributionHandle("Section1", 1);
-      // outline color of background less zone while distributing space should not be transparent
-      cy.get(zone1Selector).should(
+      // outline color of section while distributing space should not be transparent
+      cy.get(section1Selector).should(
         "not.have.css",
         "outline-color",
-        "rgba(0, 0, 0, 0)",
+        "transparent",
       );
     });
   },

app/client/cypress/support/index.d.ts

@@ -2,6 +2,8 @@
 
 declare namespace Cypress {
   interface Chainable<Subject> {
+    latestDeployPreview(): Chainable<void>;
+
     SignupFromAPI(uname: string, password: string);
 
     dragTo(subject: any, targetEl: any);

app/client/src/actions/datasourceActions.ts

@@ -325,16 +325,6 @@ export const addMockDatasourceToWorkspace = (
   };
 };
 
-export const initDatasourcePane = (
-  pluginType: string,
-  urlId?: string,
-): ReduxAction<{ pluginType: string; id?: string }> => {
-  return {
-    type: ReduxActionTypes.INIT_DATASOURCE_PANE,
-    payload: { id: urlId, pluginType },
-  };
-};
-
 export const storeAsDatasource = () => {
   return {
     type: ReduxActionTypes.STORE_AS_DATASOURCE_INIT,
@@ -529,5 +519,4 @@ export const setDatasourcePreviewSelectedTableName = (
 
 export default {
   fetchDatasources,
-  initDatasourcePane,
 };

app/client/src/actions/pageActions.tsx

@@ -1,20 +1,17 @@
 import type { WidgetType } from "constants/WidgetConstants";
 import type {
+  AnyReduxAction,
   EvaluationReduxAction,
   ReduxAction,
-  UpdateCanvasPayload,
-  AnyReduxAction,
-  ClonePageSuccessPayload,
 } from "ee/constants/ReduxActionConstants";
 import {
-  ReduxActionTypes,
   ReduxActionErrorTypes,
+  ReduxActionTypes,
   WidgetReduxActionTypes,
-  ReplayReduxActionTypes,
 } from "ee/constants/ReduxActionConstants";
 import type { DynamicPath } from "utils/DynamicBindingUtils";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import type { WidgetOperation } from "widgets/BaseWidget";
+import type { WidgetOperation, WidgetProps } from "widgets/BaseWidget";
 import type {
   FetchPageResponse,
   PageLayout,
@@ -28,6 +25,12 @@ import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidg
 import type { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 import type { Replayable } from "entities/Replay/ReplayEntity/ReplayEditor";
 import * as Sentry from "@sentry/react";
+import type { DSLWidget } from "../WidgetProvider/constants";
+import type {
+  LayoutOnLoadActionErrors,
+  PageAction,
+} from "../constants/AppsmithActionConstants/ActionConstants";
+import { ReplayOperation } from "entities/Replay/ReplayEntity/ReplayOperations";
 
 export interface FetchPageListPayload {
   applicationId: string;
@@ -127,6 +130,19 @@ export const updateCurrentPage = (
   payload: { id, slug, permissions },
 });
 
+export interface UpdateCanvasPayload {
+  pageWidgetId: string;
+  widgets: { [widgetId: string]: WidgetProps };
+  currentLayoutId: string;
+  currentPageId: string;
+  currentPageName: string;
+  currentApplicationId: string;
+  dsl: Partial<DSLWidget>;
+  pageActions: PageAction[][];
+  updatedWidgetIds?: string[];
+  layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
+}
+
 export const initCanvasLayout = (
   payload: UpdateCanvasPayload,
 ): ReduxAction<UpdateCanvasPayload> => {
@@ -245,6 +261,16 @@ export const clonePageInit = (
   };
 };
 
+export interface ClonePageSuccessPayload {
+  pageName: string;
+  description?: string;
+  pageId: string;
+  basePageId: string;
+  layoutId: string;
+  isDefault: boolean;
+  slug: string;
+}
+
 export const clonePageSuccess = ({
   basePageId,
   layoutId,
@@ -524,7 +550,7 @@ export function undoAction() {
   return {
     type: ReduxActionTypes.UNDO_REDO_OPERATION,
     payload: {
-      operation: ReplayReduxActionTypes.UNDO,
+      operation: ReplayOperation.UNDO,
     },
   };
 }
@@ -533,7 +559,7 @@ export function redoAction() {
   return {
     type: ReduxActionTypes.UNDO_REDO_OPERATION,
     payload: {
-      operation: ReplayReduxActionTypes.REDO,
+      operation: ReplayOperation.REDO,
     },
   };
 }

app/client/src/actions/propertyPaneActions.ts

@@ -114,3 +114,16 @@ export const createNewQueryFromActionCreator = (
     payload,
   };
 };
+
+export interface ShowPropertyPanePayload {
+  widgetId?: string;
+  callForDragOrResize?: boolean;
+  force: boolean;
+}
+
+export const showPropertyPane = (payload: ShowPropertyPanePayload) => {
+  return {
+    type: ReduxActionTypes.SHOW_PROPERTY_PANE,
+    payload,
+  };
+};

app/client/src/actions/reflowActions.ts

@@ -1,18 +1,20 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
-import { ReflowReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import {
+  type ReduxAction,
+  ReduxActionTypes,
+} from "ee/constants/ReduxActionConstants";
 import type { ReflowedSpaceMap } from "reflow/reflowTypes";
 
 export const reflowMoveAction = (
   payload: ReflowedSpaceMap,
 ): ReduxAction<ReflowedSpaceMap> => {
   return {
-    type: ReflowReduxActionTypes.REFLOW_MOVE,
+    type: ReduxActionTypes.REFLOW_MOVE,
     payload: payload,
   };
 };
 
 export const stopReflowAction = () => {
   return {
-    type: ReflowReduxActionTypes.STOP_REFLOW,
+    type: ReduxActionTypes.STOP_REFLOW,
   };
 };

app/client/src/actions/userActions.ts

@@ -2,12 +2,7 @@ import {
   ReduxActionErrorTypes,
   ReduxActionTypes,
 } from "ee/constants/ReduxActionConstants";
-import { CurrentUserDetailsRequestPayload } from "constants/userConstants";
-import type {
-  TokenPasswordUpdateRequest,
-  UpdateUserRequest,
-  VerifyTokenRequest,
-} from "ee/api/UserApi";
+import type { UpdateUserRequest, VerifyTokenRequest } from "ee/api/UserApi";
 import type { FeatureFlags } from "ee/entities/FeatureFlag";
 import type {
   ProductAlert,
@@ -34,10 +29,6 @@ export const logoutUserError = (error: any) => ({
     error,
   },
 });
-export const setCurrentUserDetails = () => ({
-  type: ReduxActionTypes.SET_CURRENT_USER_INIT,
-  payload: CurrentUserDetailsRequestPayload,
-});
 
 export const verifyInviteSuccess = () => ({
   type: ReduxActionTypes.VERIFY_INVITE_SUCCESS,
@@ -55,15 +46,6 @@ export const verifyInviteError = (error: any) => ({
   payload: { error },
 });
 
-export const invitedUserSignup = (
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  payload: TokenPasswordUpdateRequest & { resolve: any; reject: any },
-) => ({
-  type: ReduxActionTypes.INVITED_USER_SIGNUP_INIT,
-  payload,
-});
-
 export const invitedUserSignupSuccess = () => ({
   type: ReduxActionTypes.INVITED_USER_SIGNUP_SUCCESS,
 });

app/client/src/actions/websocketActions.ts

@@ -1,7 +1,4 @@
-import {
-  ReduxActionTypes,
-  ReduxSagaChannels,
-} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { reconnectWebsocketEvent } from "constants/WebsocketConstants";
 
 export const setIsAppLevelWebsocketConnected = (payload: boolean) => ({
@@ -19,7 +16,7 @@ export const appLevelWebsocketWriteEvent = (payload: {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   payload?: any;
 }) => ({
-  type: ReduxSagaChannels.WEBSOCKET_APP_LEVEL_WRITE_CHANNEL,
+  type: ReduxActionTypes.WEBSOCKET_APP_LEVEL_WRITE_CHANNEL,
   payload,
 });
 export const pageLevelWebsocketWriteEvent = (payload: {
@@ -28,7 +25,7 @@ export const pageLevelWebsocketWriteEvent = (payload: {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   payload?: any;
 }) => ({
-  type: ReduxSagaChannels.WEBSOCKET_PAGE_LEVEL_WRITE_CHANNEL,
+  type: ReduxActionTypes.WEBSOCKET_PAGE_LEVEL_WRITE_CHANNEL,
   payload,
 });
 

app/client/src/actions/widgetActions.tsx

@@ -69,11 +69,11 @@ export const showModal = (id: string, shouldSelectModal = true) => {
   };
 };
 
-export const closePropertyPane = () => {
+export const closePropertyPane = (force = false) => {
   return {
     type: ReduxActionTypes.HIDE_PROPERTY_PANE,
     payload: {
-      force: false,
+      force,
     },
   };
 };

app/client/src/actions/widgetSidebarActions.tsx

@@ -1,40 +1,6 @@
-import {
-  ReduxActionTypes,
-  ReduxActionErrorTypes,
-} from "ee/constants/ReduxActionConstants";
-import type { WidgetCardProps } from "widgets/BaseWidget";
-
-export const fetchWidgetCards = () => {
-  return {
-    type: ReduxActionTypes.FETCH_WIDGET_CARDS,
-  };
-};
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const errorFetchingWidgetCards = (error: any) => {
-  return {
-    type: ReduxActionErrorTypes.FETCH_WIDGET_CARDS_ERROR,
-    error,
-  };
-};
-
-export const successFetchingWidgetCards = (cards: {
-  [id: string]: WidgetCardProps[];
-}) => {
-  return {
-    type: ReduxActionTypes.FETCH_WIDGET_CARDS_SUCCESS,
-    cards,
-  };
-};
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const forceOpenWidgetPanel = (flag: boolean) => ({
   type: ReduxActionTypes.SET_FORCE_WIDGET_PANEL_OPEN,
   payload: flag,
 });
-
-export default {
-  fetchWidgetCards,
-  errorFetchingWidgetCards,
-  successFetchingWidgetCards,
-};

app/client/src/ce/RouteBuilder.ts

@@ -10,10 +10,8 @@ import {
 import { APP_MODE } from "entities/App";
 import urlBuilder from "ee/entities/URLRedirect/URLAssembly";
 import type { URLBuilderParams } from "ee/entities/URLRedirect/URLAssembly";
-import type {
-  ApplicationPayload,
-  Page,
-} from "ee/constants/ReduxActionConstants";
+import type { Page } from "entities/Page";
+import type { ApplicationPayload } from "entities/Application";
 
 export const fillPathname = (
   pathname: string,

app/client/src/ce/RouteParamsMiddleware.ts

@@ -1,8 +1,6 @@
-import type {
-  ApplicationPayload,
-  Page,
-  ReduxAction,
-} from "ee/constants/ReduxActionConstants";
+import type { ApplicationPayload } from "entities/Application";
+import type { Page } from "entities/Page";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { UpdatePageResponse } from "api/PageApi";
 import type {