Sync changes from EE excluding enterprise directory

app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx

@@ -59,7 +59,7 @@ import {
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { isGACEnabled } from "ee/utils/planHelpers";
 import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
-import { getDatasourceInfo } from "../../../utils/getDatasourceInfo";
+import { getDatasourceInfo } from "../utils/getDatasourceInfo";
 
 interface ReduxStateProps {
   workspaceId: string;

app/client/src/PluginActionEditor/constants/AppsmithAIEditorConstants.ts

@@ -1,5 +1,5 @@
 import { DEFAULT_APPSMITH_AI_QUERY_TIMEOUT_MS } from "ee/constants/ApiConstants";
-import type { ActionConfig } from "../../entities/Action";
+import type { ActionConfig } from "entities/Action";
 
 // Appsmith AI Default Config
 export const DEFAULT_APPSMITH_AI_ACTION_CONFIG: ActionConfig = {

app/client/src/PluginActionEditor/constants/GraphQLEditorConstants.ts

@@ -1,4 +1,4 @@
-import type { ApiActionConfig } from "../../entities/Action";
+import type { ApiActionConfig } from "entities/Action";
 import { DEFAULT_ACTION_TIMEOUT } from "ee/constants/ApiConstants";
 import {
   CONTENT_TYPE_HEADER_KEY,

app/client/src/PluginActionEditor/transformers/RestAPIDatasourceFormTransformer.ts

@@ -1,6 +1,6 @@
 import { isEnvironmentValid } from "ee/utils/Environments";
-import type { Property } from "../../entities/Action";
-import type { Datasource, DatasourceStorage } from "../../entities/Datasource";
+import type { Property } from "entities/Action";
+import type { Datasource, DatasourceStorage } from "entities/Datasource";
 import type {
   ApiDatasourceForm,
   Authentication,
@@ -11,12 +11,8 @@ import type {
   ApiKey,
   BearerToken,
   SSL,
-} from "../../entities/Datasource/RestAPIForm";
-import {
-  AuthType,
-  GrantType,
-  SSLType,
-} from "../../entities/Datasource/RestAPIForm";
+} from "entities/Datasource/RestAPIForm";
+import { AuthType, GrantType, SSLType } from "entities/Datasource/RestAPIForm";
 import { get, set } from "lodash";
 
 export const datasourceToFormValues = (

app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts

@@ -2,13 +2,12 @@ import {
   extractApiUrlPath,
   transformRestAction,
 } from "./RestActionTransformer";
-import type { ApiAction } from "../../entities/Action";
-import { PluginType } from "../../entities/Action";
+import type { ApiAction } from "entities/Action";
+import { PluginType } from "entities/Action";
 import {
   HTTP_PROTOCOL,
   MultiPartOptionTypes,
   POST_BODY_FORMAT_OPTIONS,
-  // POST_BODY_FORMAT_OPTIONS_ENUM,
 } from "../constants/CommonApiConstants";
 
 // jest.mock("POST_");

app/client/src/api/helpers/validateJsonResponseMeta.ts

@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/react";
 import type { AxiosResponse } from "axios";
-import { CONTENT_TYPE_HEADER_KEY } from "../../PluginActionEditor/constants/CommonApiConstants";
+import { CONTENT_TYPE_HEADER_KEY } from "PluginActionEditor/constants/CommonApiConstants";
 
 export const validateJsonResponseMeta = (response: AxiosResponse) => {
   if (

app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts

@@ -1,10 +1,10 @@
 import { getHasExecuteActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { DEFAULT_DATASOURCE_NAME } from "PluginActionEditor/constants/ApiEditorConstants";
 import { UIComponentTypes } from "api/PluginApi";
 import { SQL_DATASOURCES } from "constants/QueryEditorConstants";
 import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
-import { DEFAULT_DATASOURCE_NAME } from "PluginActionEditor/constants/ApiEditorConstants";
 
 const useBlockExecution = () => {
   const { action, plugin } = usePluginActionContext();

app/client/src/ce/navigation/FocusElements/AppIDE.ts

@@ -73,15 +73,15 @@ import {
 import { getFirstDatasourceId } from "selectors/datasourceSelectors";
 import { FocusElement, FocusElementConfigType } from "navigation/FocusElements";
 import type { FocusElementsConfigList } from "sagas/FocusRetentionSaga";
-import { ActionExecutionResizerHeight } from "../../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import {
   getPluginActionConfigSelectedTab,
   getPluginActionDebuggerState,
   setPluginActionEditorDebuggerState,
   setPluginActionEditorSelectedTab,
 } from "PluginActionEditor/store";
 import { EDITOR_TABS } from "constants/QueryEditorConstants";
-import { API_EDITOR_TABS } from "../../../PluginActionEditor/constants/CommonApiConstants";
+import { API_EDITOR_TABS } from "PluginActionEditor/constants/CommonApiConstants";
 
 export const AppIDEFocusElements: FocusElementsConfigList = {
   [FocusEntity.DATASOURCE_LIST]: [

app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx

@@ -9,7 +9,7 @@ import { getCodeFromMoustache, getEvaluationVersion } from "../../utils";
 import { ApiMethodIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import { getCurrentActions } from "ee/selectors/entitiesSelector";
 import { useSelector } from "react-redux";
-import type { HTTP_METHOD } from "../../../../../PluginActionEditor/constants/CommonApiConstants";
+import type { HTTP_METHOD } from "PluginActionEditor/constants/CommonApiConstants";
 
 function GetIconForAction(
   actionType: ActionTree["actionType"],

app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseView.test.tsx → app/client/src/components/editorComponents/ApiResponseView.test.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { render } from "@testing-library/react";
-import ApiResponseView from "components/editorComponents/ApiResponseView";
+import ApiResponseView from "./ApiResponseView";
 import configureStore from "redux-mock-store";
 import { Provider } from "react-redux";
 import { ThemeProvider } from "styled-components";
@@ -12,7 +12,7 @@ import "@testing-library/jest-dom/extend-expect";
 import { APIFactory } from "test/factories/Actions/API";
 import { noop } from "lodash";
 
-jest.mock("components/editorComponents/EntityBottomTabs", () => ({
+jest.mock("./EntityBottomTabs", () => ({
   __esModule: true,
   default: () => <div />,
 }));

app/client/src/components/editorComponents/ApiResponseView.tsx

@@ -16,7 +16,7 @@ import type { BottomTab } from "./EntityBottomTabs";
 import EntityBottomTabs from "./EntityBottomTabs";
 import { DEBUGGER_TAB_KEYS } from "./Debugger/constants";
 import { getErrorCount } from "selectors/debuggerSelectors";
-import { ActionExecutionResizerHeight } from "../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import type { Action } from "entities/Action";
 import { EMPTY_RESPONSE } from "./emptyResponse";
 import {

app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx

@@ -22,7 +22,7 @@ import {
 } from "ee/constants/messages";
 import { DEBUGGER_TAB_KEYS } from "./constants";
 import EntityBottomTabs from "../EntityBottomTabs";
-import { ActionExecutionResizerHeight } from "../../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import { IDEBottomView, ViewHideBehaviour, ViewDisplayMode } from "IDE";
 
 function DebuggerTabs() {

app/client/src/components/editorComponents/Debugger/Resizer/index.tsx

@@ -2,7 +2,7 @@ import { Layers } from "constants/Layers";
 import type { RefObject } from "react";
 import React, { useState, useEffect } from "react";
 import styled, { css } from "styled-components";
-import { ActionExecutionResizerHeight } from "../../../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 
 export const ResizerCSS = css`
   width: 100%;

app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx

@@ -17,7 +17,7 @@ import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import {
   DEFAULT_MULTI_PART_DROPDOWN_PLACEHOLDER,
   MULTI_PART_DROPDOWN_OPTIONS,
-} from "../../../../PluginActionEditor/constants/CommonApiConstants";
+} from "PluginActionEditor/constants/CommonApiConstants";
 import { Button, Text } from "@appsmith/ads";
 import RequestDropdownField from "./RequestDropdownField";
 

app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts

@@ -5,7 +5,7 @@ import {
 import {
   HTTP_PROTOCOL,
   HTTP_PROTOCOL_VERSIONS,
-} from "../../../PluginActionEditor/constants/CommonApiConstants";
+} from "PluginActionEditor/constants/CommonApiConstants";
 
 export default [
   {

app/client/src/entities/AppsmithConsole/index.ts

@@ -2,7 +2,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import type LOG_TYPE from "./logtype";
 import type { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils";
 import type { PluginType } from "entities/Action";
-import type { HTTP_METHOD } from "../../PluginActionEditor/constants/CommonApiConstants";
+import type { HTTP_METHOD } from "PluginActionEditor/constants/CommonApiConstants";
 import type {
   ENTITY_TYPE,
   PLATFORM_ERROR,

app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx

@@ -13,7 +13,7 @@ import {
 import type { CommonFormProps } from "../CommonEditorForm";
 import CommonEditorForm from "../CommonEditorForm";
 import Pagination from "PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/Pagination";
-import { GRAPHQL_HTTP_METHOD_OPTIONS } from "../../../../PluginActionEditor/constants/GraphQLEditorConstants";
+import { GRAPHQL_HTTP_METHOD_OPTIONS } from "PluginActionEditor/constants/GraphQLEditorConstants";
 import PostBodyData from "PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData";
 
 type APIFormProps = {

app/client/src/pages/Editor/DataSourceEditor/Debugger.tsx

@@ -22,7 +22,7 @@ import {
   getErrorCount,
   getResponsePaneHeight,
 } from "selectors/debuggerSelectors";
-import { ActionExecutionResizerHeight } from "../../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import { IDEBottomView, ViewHideBehaviour } from "IDE";
 
 export const ResizerMainContainer = styled.div`

app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx

@@ -19,7 +19,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import {
   datasourceToFormValues,
   formValuesToDatasource,
-} from "../../../PluginActionEditor/transformers/RestAPIDatasourceFormTransformer";
+} from "PluginActionEditor/transformers/RestAPIDatasourceFormTransformer";
 import type {
   ApiDatasourceForm,
   AuthorizationCode,

app/client/src/pages/Editor/DataSourceEditor/index.tsx

@@ -81,7 +81,7 @@ import {
 } from "components/formControls/utils";
 import type { ControlProps } from "components/formControls/BaseControl";
 import type { ApiDatasourceForm } from "entities/Datasource/RestAPIForm";
-import { formValuesToDatasource } from "../../../PluginActionEditor/transformers/RestAPIDatasourceFormTransformer";
+import { formValuesToDatasource } from "PluginActionEditor/transformers/RestAPIDatasourceFormTransformer";
 import { DSFormHeader } from "./DSFormHeader";
 import type { PluginType } from "entities/Action";
 import { PluginPackageName } from "entities/Action";

app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx

@@ -10,7 +10,7 @@ import {
 import type { DropdownOptions } from "../GeneratePage/components/constants";
 import { DEFAULT_DROPDOWN_OPTION } from "../GeneratePage/components/constants";
 import { isEmpty } from "lodash";
-import Table from "../../../PluginActionEditor/components/PluginActionResponse/components/Table";
+import Table from "PluginActionEditor/components/PluginActionResponse/components/Table";
 import {
   getCurrentApplicationId,
   getPagePermissions,

app/client/src/pages/Editor/EntityNavigation/ActionPane/ApiPaneNavigation.ts

@@ -1,7 +1,7 @@
 import { call, delay, put } from "redux-saga/effects";
 import type { EntityInfo, IApiPaneNavigationConfig } from "../types";
 import { ActionPaneNavigation } from "./exports";
-import { API_EDITOR_TABS } from "../../../../PluginActionEditor/constants/CommonApiConstants";
+import { API_EDITOR_TABS } from "PluginActionEditor/constants/CommonApiConstants";
 import { setPluginActionEditorSelectedTab } from "PluginActionEditor/store";
 import { NAVIGATION_DELAY } from "../costants";
 

app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx

@@ -4,8 +4,10 @@ import { MenuIcons } from "icons/MenuIcons";
 import type { Plugin } from "api/PluginApi";
 import ImageAlt from "assets/images/placeholder-image.svg";
 import styled from "styled-components";
-import type { HTTP_METHOD } from "../../../PluginActionEditor/constants/CommonApiConstants";
-import { HTTP_METHODS_COLOR } from "../../../PluginActionEditor/constants/CommonApiConstants";
+import {
+  HTTP_METHODS_COLOR,
+  type HTTP_METHOD,
+} from "PluginActionEditor/constants/CommonApiConstants";
 import { PRIMARY_KEY, FOREIGN_KEY } from "constants/DatasourceEditorConstants";
 import { Icon } from "@appsmith/ads";
 import { getAssetUrl } from "ee/utils/airgapHelpers";

app/client/src/pages/Editor/FormControl.tsx

@@ -27,8 +27,8 @@ import {
 } from "ee/selectors/entitiesSelector";
 import { get } from "lodash";
 import { SQL_PLUGINS_DEFAULT_TEMPLATE_TYPE } from "constants/Datasource";
-import TemplateMenu from "../../PluginActionEditor/components/PluginActionForm/components/UQIEditor/TemplateMenu";
-import { SQL_DATASOURCES } from "../../constants/QueryEditorConstants";
+import TemplateMenu from "PluginActionEditor/components/PluginActionForm/components/UQIEditor/TemplateMenu";
+import { SQL_DATASOURCES } from "constants/QueryEditorConstants";
 import type { Datasource, DatasourceStructure } from "entities/Datasource";
 import { getCurrentEditingEnvironmentId } from "ee/selectors/environmentSelectors";
 

app/client/src/pages/Editor/__tests__/QueryEditorTable.test.tsx

@@ -1,8 +1,9 @@
 import React from "react";
 import { render, screen } from "test/testUtils";
 import "@testing-library/jest-dom";
-import Table from "../../../PluginActionEditor/components/PluginActionResponse/components/Table";
-import { getScrollBarWidth } from "../../../PluginActionEditor/components/PluginActionResponse/components/Table";
+import Table, {
+  getScrollBarWidth,
+} from "PluginActionEditor/components/PluginActionResponse/components/Table";
 
 function createEle() {
   return {

app/client/src/reducers/uiReducers/datasourcePaneReducer.ts

@@ -3,7 +3,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { Datasource } from "entities/Datasource";
 import _ from "lodash";
-import { ActionExecutionResizerHeight } from "../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 
 const initialState: DatasourcePaneReduxState = {
   drafts: {},

app/client/src/reducers/uiReducers/debuggerReducer.ts

@@ -4,7 +4,7 @@ import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { omit, isUndefined, isEmpty } from "lodash";
 import equal from "fast-deep-equal";
-import { ActionExecutionResizerHeight } from "../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 import { klona } from "klona";
 
 export const DefaultDebuggerContext = {

app/client/src/reducers/uiReducers/jsPaneReducer.ts

@@ -5,7 +5,7 @@ import {
   ReduxActionErrorTypes,
 } from "ee/constants/ReduxActionConstants";
 import type { JSCollection } from "entities/JSCollection";
-import { ActionExecutionResizerHeight } from "../../PluginActionEditor/components/PluginActionResponse/constants";
+import { ActionExecutionResizerHeight } from "PluginActionEditor/components/PluginActionResponse/constants";
 
 export enum JSEditorTab {
   CODE = "CODE",

app/client/src/sagas/ActionSagas.ts

@@ -125,8 +125,8 @@ import {
   API_EDITOR_FORM_NAME,
   QUERY_EDITOR_FORM_NAME,
 } from "ee/constants/forms";
-import { DEFAULT_GRAPHQL_ACTION_CONFIG } from "../PluginActionEditor/constants/GraphQLEditorConstants";
-import { DEFAULT_API_ACTION_CONFIG } from "../PluginActionEditor/constants/ApiEditorConstants";
+import { DEFAULT_GRAPHQL_ACTION_CONFIG } from "PluginActionEditor/constants/GraphQLEditorConstants";
+import { DEFAULT_API_ACTION_CONFIG } from "PluginActionEditor/constants/ApiEditorConstants";
 import { fetchDatasourceStructure } from "actions/datasourceActions";
 import { setAIPromptTriggered } from "utils/storage";
 import { getDefaultTemplateActionConfig } from "utils/editorContextUtils";

app/client/src/sagas/ApiPaneSagas.ts

@@ -25,9 +25,9 @@ import {
   HTTP_METHOD,
   POST_BODY_FORMAT_OPTIONS,
   POST_BODY_FORMAT_OPTIONS_ARRAY,
-} from "../PluginActionEditor/constants/CommonApiConstants";
-import { DEFAULT_CREATE_API_CONFIG } from "../PluginActionEditor/constants/ApiEditorConstants";
-import { DEFAULT_CREATE_GRAPHQL_CONFIG } from "../PluginActionEditor/constants/GraphQLEditorConstants";
+} from "PluginActionEditor/constants/CommonApiConstants";
+import { DEFAULT_CREATE_API_CONFIG } from "PluginActionEditor/constants/ApiEditorConstants";
+import { DEFAULT_CREATE_GRAPHQL_CONFIG } from "PluginActionEditor/constants/GraphQLEditorConstants";
 import history from "utils/history";
 import { autofill, change, initialize, reset } from "redux-form";
 import type { Property } from "api/ActionAPI";
@@ -78,12 +78,12 @@ import {
   getApplicationByIdFromWorkspaces,
   getCurrentApplicationIdForCreateNewApp,
 } from "ee/selectors/applicationSelectors";
-import { DEFAULT_CREATE_APPSMITH_AI_CONFIG } from "../PluginActionEditor/constants/AppsmithAIEditorConstants";
+import { DEFAULT_CREATE_APPSMITH_AI_CONFIG } from "PluginActionEditor/constants/AppsmithAIEditorConstants";
 import { checkAndGetPluginFormConfigsSaga } from "./PluginSagas";
 import { convertToBasePageIdSelector } from "selectors/pageListSelectors";
 import type { ApplicationPayload } from "entities/Application";
 import { klonaLiteWithTelemetry } from "utils/helpers";
-import { POST_BODY_FORM_DATA_KEY } from "../PluginActionEditor/store/constants";
+import { POST_BODY_FORM_DATA_KEY } from "PluginActionEditor/store/constants";
 
 function* syncApiParamsSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string }>,

app/client/src/sagas/ReplaySaga.ts

@@ -55,7 +55,7 @@ import {
   isQueryAction,
   isSaaSAction,
 } from "entities/Action";
-import { API_EDITOR_TABS } from "../PluginActionEditor/constants/CommonApiConstants";
+import { API_EDITOR_TABS } from "PluginActionEditor/constants/CommonApiConstants";
 import { EDITOR_TABS } from "constants/QueryEditorConstants";
 import _, { isEmpty } from "lodash";
 import type { ReplayEditorUpdate } from "entities/Replay/ReplayEntity/ReplayEditor";

app/client/src/utils/ApiPaneUtils.test.ts

@@ -1,4 +1,4 @@
-import { POST_BODY_FORMAT_OPTIONS } from "../PluginActionEditor/constants/CommonApiConstants";
+import { POST_BODY_FORMAT_OPTIONS } from "PluginActionEditor/constants/CommonApiConstants";
 import {
   getContentTypeHeaderValue,
   getIndextoUpdate,