From db38a64e71785f0fa6352a51321cf2102dd0f42f Mon Sep 17 00:00:00 2001 From: Anand Srinivasan <66776129+eco-monk@users.noreply.github.com> Date: Thu, 22 Dec 2022 12:04:28 +0530 Subject: [PATCH] chore: update imports for code split (#19085) * move actionTriggers.ts * update imports Explorer/helpers.tsx * update imports EntityDefinitions.ts * update imports Evaluation/Actions.ts * update imports for ActionExecutionSagas * missed worker types * missed imports * update imports for dataTreeUtils * missed imports Co-authored-by: Aishwarya UR --- app/client/src/actions/metaActions.ts | 2 +- app/client/src/actions/pageActions.tsx | 2 +- .../src/{ => ce}/entities/DataTree/actionTriggers.ts | 0 .../{ => ce}/pages/Editor/Explorer/helpers.test.ts | 2 +- .../src/{ => ce}/pages/Editor/Explorer/helpers.tsx | 0 .../sagas/ActionExecution/ActionExecutionSagas.ts | 4 ++-- app/client/src/ce/sagas/index.tsx | 2 +- .../utils/autocomplete/EntityDefinitions.test.ts | 2 +- .../{ => ce}/utils/autocomplete/EntityDefinitions.ts | 0 app/client/src/{ => ce}/workers/Evaluation/Actions.ts | 2 +- .../Evaluation/__tests__/dataTreeUtils.test.ts | 2 +- .../src/{ => ce}/workers/Evaluation/dataTreeUtils.ts | 2 +- .../workers/Evaluation}/evaluationUtils.test.ts | 11 +++++++---- .../{ => ce}/workers/Evaluation/evaluationUtils.ts | 2 +- .../workers/common/DataTreeEvaluator/types.ts | 0 app/client/src/{ => ce}/workers/common/types.ts | 0 .../editorComponents/ActionCreator/index.tsx | 2 +- .../components/editorComponents/CodeEditor/index.tsx | 2 +- .../components/editorComponents/Debugger/helpers.tsx | 2 +- .../editorComponents/Debugger/hooks/debuggerHooks.ts | 2 +- .../Debugger/hooks/useGetEntityInfo.tsx | 2 +- .../editorComponents/GlobalSearch/index.tsx | 2 +- app/client/src/ee/entities/DataTree/actionTriggers.ts | 1 + app/client/src/ee/pages/Editor/Explorer/helpers.tsx | 1 + .../ee/sagas/ActionExecution/ActionExecutionSagas.ts | 1 + .../src/ee/utils/autocomplete/EntityDefinitions.ts | 1 + app/client/src/ee/workers/Evaluation/Actions.ts | 1 + app/client/src/ee/workers/Evaluation/dataTreeUtils.ts | 1 + .../src/ee/workers/Evaluation/evaluationUtils.ts | 1 + .../src/ee/workers/common/DataTreeEvaluator/types.ts | 1 + app/client/src/ee/workers/common/types.ts | 1 + app/client/src/entities/DataTree/types.ts | 2 +- .../src/pages/Editor/APIEditor/CommonEditorForm.tsx | 2 +- .../Explorer/Actions/ActionEntityContextMenu.tsx | 2 +- .../pages/Editor/Explorer/Actions/MoreActionsMenu.tsx | 2 +- app/client/src/pages/Editor/Explorer/Datasources.tsx | 2 +- .../Explorer/Datasources/DataSourceContextMenu.tsx | 2 +- .../Editor/Explorer/Datasources/DatasourceEntity.tsx | 2 +- .../Explorer/Entity/CurrentPageEntityProperties.tsx | 2 +- .../pages/Editor/Explorer/Entity/EntityProperties.tsx | 4 ++-- .../src/pages/Editor/Explorer/EntityExplorer.test.tsx | 7 ++++++- app/client/src/pages/Editor/Explorer/Files/index.tsx | 5 ++++- .../Editor/Explorer/JSActions/JSActionContextMenu.tsx | 2 +- .../Editor/Explorer/JSActions/MoreJSActionsMenu.tsx | 2 +- .../Editor/Explorer/Pages/AddPageContextMenu.tsx | 2 +- .../pages/Editor/Explorer/Pages/PageContextMenu.tsx | 2 +- app/client/src/pages/Editor/Explorer/Pages/index.tsx | 5 ++++- .../Editor/Explorer/Widgets/WidgetContextMenu.tsx | 2 +- .../src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx | 5 ++++- .../Editor/Explorer/Widgets/useNavigateToWidget.ts | 2 +- .../components/GeneratePageForm/GeneratePageForm.tsx | 2 +- app/client/src/pages/Editor/JSEditor/Form.tsx | 2 +- .../Editor/PropertyPane/PropertyPaneConnections.tsx | 5 ++++- .../src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx | 2 +- .../pages/Editor/WidgetsEditor/EmptyCanvasSection.tsx | 2 +- app/client/src/pages/common/datasourceAuth/index.tsx | 2 +- .../src/reducers/entityReducers/metaReducer/index.ts | 2 +- .../src/sagas/ActionExecution/CopyActionSaga.ts | 2 +- .../src/sagas/ActionExecution/DownloadActionSaga.ts | 2 +- .../ActionExecution/GetCurrentLocationSaga.test.ts | 2 +- .../sagas/ActionExecution/GetCurrentLocationSaga.ts | 4 ++-- app/client/src/sagas/ActionExecution/ModalSagas.ts | 2 +- .../src/sagas/ActionExecution/NavigateActionSaga.ts | 2 +- .../src/sagas/ActionExecution/PluginActionSaga.ts | 11 +++++++---- .../src/sagas/ActionExecution/PostMessageSaga.ts | 4 ++-- .../sagas/ActionExecution/ResetWidgetActionSaga.ts | 4 ++-- .../src/sagas/ActionExecution/SetIntervalSaga.ts | 4 ++-- .../src/sagas/ActionExecution/ShowAlertActionSaga.ts | 2 +- .../src/sagas/ActionExecution/StoreActionSaga.ts | 2 +- app/client/src/sagas/ActionExecution/errorUtils.ts | 2 +- app/client/src/sagas/DebuggerSagas.ts | 4 ++-- app/client/src/sagas/EvaluationsSaga.ts | 4 ++-- app/client/src/sagas/JSPaneSagas.ts | 2 +- app/client/src/sagas/PostEvaluationSagas.ts | 2 +- app/client/src/sagas/PostLintingSagas.ts | 2 +- app/client/src/sagas/RecentEntitiesSagas.ts | 2 +- app/client/src/sagas/WidgetOperationSagas.tsx | 2 +- app/client/src/sagas/WidgetOperationUtils.ts | 2 +- app/client/src/selectors/debuggerSelectors.tsx | 2 +- app/client/src/selectors/entitiesSelector.ts | 2 +- app/client/src/selectors/formSelectors.ts | 2 +- app/client/src/utils/DynamicBindingUtils.ts | 2 +- app/client/src/utils/WidgetLoadingStateUtils.ts | 5 ++++- .../src/utils/autocomplete/CodemirrorTernService.ts | 2 +- .../utils/autocomplete/dataTreeTypeDefCreator.test.ts | 2 +- .../src/utils/autocomplete/dataTreeTypeDefCreator.ts | 4 ++-- app/client/src/widgets/ListWidget/widget/index.tsx | 2 +- app/client/src/workers/Evaluation/JSObject/index.ts | 2 +- app/client/src/workers/Evaluation/JSObject/utils.ts | 2 +- app/client/src/workers/Evaluation/PromisifyAction.ts | 2 +- app/client/src/workers/Evaluation/UserLog.ts | 2 +- .../workers/Evaluation/__tests__/evaluation.test.ts | 2 +- app/client/src/workers/Evaluation/evaluate.ts | 6 +++--- .../src/workers/Evaluation/evaluation.worker.ts | 2 +- app/client/src/workers/Evaluation/formEval.ts | 2 +- .../workers/Evaluation/handlers/evalActionBindings.ts | 2 +- .../src/workers/Evaluation/handlers/evalTree.ts | 6 +++--- .../src/workers/Evaluation/handlers/evalTrigger.ts | 2 +- .../workers/Evaluation/handlers/validateProperty.ts | 2 +- app/client/src/workers/Evaluation/types.ts | 6 +++--- app/client/src/workers/Linting/lint.worker.ts | 2 +- app/client/src/workers/Linting/types.ts | 2 +- app/client/src/workers/Linting/utils.ts | 2 +- .../src/workers/common/DataTreeEvaluator/index.ts | 4 ++-- .../src/workers/common/DataTreeEvaluator/test.ts | 2 +- .../common/DataTreeEvaluator/validationUtils.ts | 2 +- app/client/src/workers/common/DependencyMap/index.ts | 2 +- app/client/src/workers/common/DependencyMap/utils.ts | 2 +- app/client/test/sagas.ts | 2 +- contributions/docs/GlobalFunctions.md | 4 ++-- 110 files changed, 154 insertions(+), 119 deletions(-) rename app/client/src/{ => ce}/entities/DataTree/actionTriggers.ts (100%) rename app/client/src/{ => ce}/pages/Editor/Explorer/helpers.test.ts (96%) rename app/client/src/{ => ce}/pages/Editor/Explorer/helpers.tsx (100%) rename app/client/src/{ => ce}/sagas/ActionExecution/ActionExecutionSagas.ts (98%) rename app/client/src/{ => ce}/utils/autocomplete/EntityDefinitions.test.ts (98%) rename app/client/src/{ => ce}/utils/autocomplete/EntityDefinitions.ts (100%) rename app/client/src/{ => ce}/workers/Evaluation/Actions.ts (99%) rename app/client/src/{ => ce}/workers/Evaluation/__tests__/dataTreeUtils.test.ts (99%) rename app/client/src/{ => ce}/workers/Evaluation/dataTreeUtils.ts (96%) rename app/client/src/{workers/Evaluation/__tests__ => ce/workers/Evaluation}/evaluationUtils.test.ts (98%) rename app/client/src/{ => ce}/workers/Evaluation/evaluationUtils.ts (99%) rename app/client/src/{ => ce}/workers/common/DataTreeEvaluator/types.ts (100%) rename app/client/src/{ => ce}/workers/common/types.ts (100%) create mode 100644 app/client/src/ee/entities/DataTree/actionTriggers.ts create mode 100644 app/client/src/ee/pages/Editor/Explorer/helpers.tsx create mode 100644 app/client/src/ee/sagas/ActionExecution/ActionExecutionSagas.ts create mode 100644 app/client/src/ee/utils/autocomplete/EntityDefinitions.ts create mode 100644 app/client/src/ee/workers/Evaluation/Actions.ts create mode 100644 app/client/src/ee/workers/Evaluation/dataTreeUtils.ts create mode 100644 app/client/src/ee/workers/Evaluation/evaluationUtils.ts create mode 100644 app/client/src/ee/workers/common/DataTreeEvaluator/types.ts create mode 100644 app/client/src/ee/workers/common/types.ts diff --git a/app/client/src/actions/metaActions.ts b/app/client/src/actions/metaActions.ts index 6898e67266..a97a86e0f7 100644 --- a/app/client/src/actions/metaActions.ts +++ b/app/client/src/actions/metaActions.ts @@ -3,7 +3,7 @@ import { ReduxAction, } from "@appsmith/constants/ReduxActionConstants"; import { BatchAction, batchAction } from "actions/batchActions"; -import { EvalMetaUpdates } from "workers/common/DataTreeEvaluator/types"; +import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types"; import { DataTreeWidget } from "../entities/DataTree/dataTreeFactory"; export interface UpdateWidgetMetaPropertyPayload { diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx index f15a5a1fed..77310045ea 100644 --- a/app/client/src/actions/pageActions.tsx +++ b/app/client/src/actions/pageActions.tsx @@ -24,7 +24,7 @@ import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsRe import { GenerateTemplatePageRequest } from "api/PageApi"; import { ENTITY_TYPE } from "entities/AppsmithConsole"; import { Replayable } from "entities/Replay/ReplayEntity/ReplayEditor"; -import { StoreValueActionDescription } from "entities/DataTree/actionTriggers"; +import { StoreValueActionDescription } from "@appsmith/entities/DataTree/actionTriggers"; export interface FetchPageListPayload { applicationId: string; diff --git a/app/client/src/entities/DataTree/actionTriggers.ts b/app/client/src/ce/entities/DataTree/actionTriggers.ts similarity index 100% rename from app/client/src/entities/DataTree/actionTriggers.ts rename to app/client/src/ce/entities/DataTree/actionTriggers.ts diff --git a/app/client/src/pages/Editor/Explorer/helpers.test.ts b/app/client/src/ce/pages/Editor/Explorer/helpers.test.ts similarity index 96% rename from app/client/src/pages/Editor/Explorer/helpers.test.ts rename to app/client/src/ce/pages/Editor/Explorer/helpers.test.ts index 83ad7f0124..52de19da21 100644 --- a/app/client/src/pages/Editor/Explorer/helpers.test.ts +++ b/app/client/src/ce/pages/Editor/Explorer/helpers.test.ts @@ -1,7 +1,7 @@ import { getActionIdFromURL, getJSCollectionIdFromURL, -} from "pages/Editor/Explorer/helpers"; +} from "@appsmith/pages/Editor/Explorer/helpers"; describe("getActionIdFromUrl", () => { it("getsApiId", () => { diff --git a/app/client/src/pages/Editor/Explorer/helpers.tsx b/app/client/src/ce/pages/Editor/Explorer/helpers.tsx similarity index 100% rename from app/client/src/pages/Editor/Explorer/helpers.tsx rename to app/client/src/ce/pages/Editor/Explorer/helpers.tsx diff --git a/app/client/src/sagas/ActionExecution/ActionExecutionSagas.ts b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts similarity index 98% rename from app/client/src/sagas/ActionExecution/ActionExecutionSagas.ts rename to app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts index ebff28437f..31e5c50222 100644 --- a/app/client/src/sagas/ActionExecution/ActionExecutionSagas.ts +++ b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts @@ -28,7 +28,7 @@ import executePluginActionTriggerSaga from "sagas/ActionExecution/PluginActionSa import { ActionDescription, ActionTriggerType, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { clearActionResponse } from "actions/pluginActionActions"; import { closeModalSaga, @@ -52,7 +52,7 @@ import { } from "sagas/ActionExecution/GetCurrentLocationSaga"; import { requestModalConfirmationSaga } from "sagas/UtilSagas"; import { ModalType } from "reducers/uiReducers/modalActionReducer"; -import { postMessageSaga } from "./PostMessageSaga"; +import { postMessageSaga } from "sagas/ActionExecution/PostMessageSaga"; export type TriggerMeta = { source?: TriggerSource; diff --git a/app/client/src/ce/sagas/index.tsx b/app/client/src/ce/sagas/index.tsx index d0bb8dd798..68d6213f42 100644 --- a/app/client/src/ce/sagas/index.tsx +++ b/app/client/src/ce/sagas/index.tsx @@ -1,7 +1,7 @@ import pageSagas from "sagas/PageSagas"; import { watchActionSagas } from "sagas/ActionSagas"; import { watchJSActionSagas } from "sagas/JSActionSagas"; -import { watchActionExecutionSagas } from "sagas/ActionExecution/ActionExecutionSagas"; +import { watchActionExecutionSagas } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { watchPluginActionExecutionSagas } from "sagas/ActionExecution/PluginActionSaga"; import templateSagas from "sagas/TemplatesSagas"; import widgetOperationSagas from "sagas/WidgetOperationSagas"; diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.test.ts b/app/client/src/ce/utils/autocomplete/EntityDefinitions.test.ts similarity index 98% rename from app/client/src/utils/autocomplete/EntityDefinitions.test.ts rename to app/client/src/ce/utils/autocomplete/EntityDefinitions.test.ts index 2eeb555780..805521d830 100644 --- a/app/client/src/utils/autocomplete/EntityDefinitions.test.ts +++ b/app/client/src/ce/utils/autocomplete/EntityDefinitions.test.ts @@ -3,7 +3,7 @@ import { JSCollectionData } from "reducers/entityReducers/jsActionsReducer"; import { entityDefinitions, getPropsForJSActionEntity, -} from "utils/autocomplete/EntityDefinitions"; +} from "@appsmith/utils/autocomplete/EntityDefinitions"; describe("EntityDefinitions", () => { it("it tests list widget selectRow", () => { diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.ts b/app/client/src/ce/utils/autocomplete/EntityDefinitions.ts similarity index 100% rename from app/client/src/utils/autocomplete/EntityDefinitions.ts rename to app/client/src/ce/utils/autocomplete/EntityDefinitions.ts diff --git a/app/client/src/workers/Evaluation/Actions.ts b/app/client/src/ce/workers/Evaluation/Actions.ts similarity index 99% rename from app/client/src/workers/Evaluation/Actions.ts rename to app/client/src/ce/workers/Evaluation/Actions.ts index eb80c10a21..ac7b06f713 100644 --- a/app/client/src/workers/Evaluation/Actions.ts +++ b/app/client/src/ce/workers/Evaluation/Actions.ts @@ -4,7 +4,7 @@ import _ from "lodash"; import { ActionDescription, ActionTriggerType, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { NavigationTargetType } from "sagas/ActionExecution/NavigateActionSaga"; import { promisifyAction } from "workers/Evaluation/PromisifyAction"; import { klona } from "klona/full"; diff --git a/app/client/src/workers/Evaluation/__tests__/dataTreeUtils.test.ts b/app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts similarity index 99% rename from app/client/src/workers/Evaluation/__tests__/dataTreeUtils.test.ts rename to app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts index 00b91ba47d..8ef916daec 100644 --- a/app/client/src/workers/Evaluation/__tests__/dataTreeUtils.test.ts +++ b/app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts @@ -6,7 +6,7 @@ import { createNewEntity, createUnEvalTreeForEval, makeEntityConfigsAsObjProperties, -} from "../dataTreeUtils"; +} from "@appsmith/workers/Evaluation/dataTreeUtils"; const unevalTreeFromMainThread = { Api2: { diff --git a/app/client/src/workers/Evaluation/dataTreeUtils.ts b/app/client/src/ce/workers/Evaluation/dataTreeUtils.ts similarity index 96% rename from app/client/src/workers/Evaluation/dataTreeUtils.ts rename to app/client/src/ce/workers/Evaluation/dataTreeUtils.ts index 09952d0837..d64a5d4975 100644 --- a/app/client/src/workers/Evaluation/dataTreeUtils.ts +++ b/app/client/src/ce/workers/Evaluation/dataTreeUtils.ts @@ -6,7 +6,7 @@ import { } from "entities/DataTree/dataTreeFactory"; import { set } from "lodash"; import { EvalProps } from "workers/common/DataTreeEvaluator"; -import { removeFunctions } from "./evaluationUtils"; +import { removeFunctions } from "@appsmith/workers/Evaluation/evaluationUtils"; /** * This method accept an entity object as input and if it has __config__ property than it moves the __config__ to object's prototype diff --git a/app/client/src/workers/Evaluation/__tests__/evaluationUtils.test.ts b/app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts similarity index 98% rename from app/client/src/workers/Evaluation/__tests__/evaluationUtils.test.ts rename to app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts index 6d0b9f340f..0d16abac7b 100644 --- a/app/client/src/workers/Evaluation/__tests__/evaluationUtils.test.ts +++ b/app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts @@ -22,13 +22,16 @@ import { isPrivateEntityPath, makeParentsDependOnChildren, translateDiffEventToDataTreeDiffEvent, -} from "../evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { warn as logWarn } from "loglevel"; import { Diff } from "deep-diff"; import _, { flatten } from "lodash"; -import { overrideWidgetProperties, findDatatype } from "../evaluationUtils"; +import { + overrideWidgetProperties, + findDatatype, +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { DataTree } from "entities/DataTree/dataTreeFactory"; -import { EvalMetaUpdates } from "../../common/DataTreeEvaluator/types"; +import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types"; import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget"; import TableWidget, { CONFIG as TableWidgetConfig } from "widgets/TableWidget"; import InputWidget, { @@ -36,7 +39,7 @@ import InputWidget, { } from "widgets/InputWidgetV2"; import { registerWidget } from "utils/WidgetRegisterHelpers"; import { WidgetConfiguration } from "widgets/constants"; -import { createNewEntity } from "../dataTreeUtils"; +import { createNewEntity } from "@appsmith/workers/Evaluation/dataTreeUtils"; import DataTreeEvaluator from "workers/common/DataTreeEvaluator"; import { Severity } from "entities/AppsmithConsole"; diff --git a/app/client/src/workers/Evaluation/evaluationUtils.ts b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts similarity index 99% rename from app/client/src/workers/Evaluation/evaluationUtils.ts rename to app/client/src/ce/workers/Evaluation/evaluationUtils.ts index db4f905ae4..165e4f6ead 100644 --- a/app/client/src/workers/Evaluation/evaluationUtils.ts +++ b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts @@ -23,7 +23,7 @@ import { WidgetTypeConfigMap } from "utils/WidgetFactory"; import { PluginType } from "entities/Action"; import { klona } from "klona/full"; import { warn as logWarn } from "loglevel"; -import { EvalMetaUpdates } from "../common/DataTreeEvaluator/types"; +import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types"; import { isObject } from "lodash"; import { DataTreeObjectEntity } from "entities/DataTree/dataTreeFactory"; import { validateWidgetProperty } from "workers/common/DataTreeEvaluator/validationUtils"; diff --git a/app/client/src/workers/common/DataTreeEvaluator/types.ts b/app/client/src/ce/workers/common/DataTreeEvaluator/types.ts similarity index 100% rename from app/client/src/workers/common/DataTreeEvaluator/types.ts rename to app/client/src/ce/workers/common/DataTreeEvaluator/types.ts diff --git a/app/client/src/workers/common/types.ts b/app/client/src/ce/workers/common/types.ts similarity index 100% rename from app/client/src/workers/common/types.ts rename to app/client/src/ce/workers/common/types.ts diff --git a/app/client/src/components/editorComponents/ActionCreator/index.tsx b/app/client/src/components/editorComponents/ActionCreator/index.tsx index bc9152e144..48a855b6db 100644 --- a/app/client/src/components/editorComponents/ActionCreator/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/index.tsx @@ -30,7 +30,7 @@ import { } from "selectors/widgetSelectors"; import Fields from "./Fields"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; -import { getEntityNameAndPropertyPath } from "workers/Evaluation/evaluationUtils"; +import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils"; import { JSCollectionData } from "reducers/entityReducers/jsActionsReducer"; import { createNewJSCollection } from "actions/jsPaneActions"; import { JSAction, Variable } from "entities/JSCollection"; diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx index 3ee64784be..f403e695fb 100644 --- a/app/client/src/components/editorComponents/CodeEditor/index.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx @@ -79,7 +79,7 @@ import { removeNewLineChars, } from "./codeEditorUtils"; import { commandsHelper } from "./commandsHelper"; -import { getEntityNameAndPropertyPath } from "workers/Evaluation/evaluationUtils"; +import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils"; import { getPluginIdToImageLocation } from "sagas/selectors"; import { ExpectedValueExample } from "utils/validation/common"; import { getRecentEntityIds } from "selectors/globalSearchSelectors"; diff --git a/app/client/src/components/editorComponents/Debugger/helpers.tsx b/app/client/src/components/editorComponents/Debugger/helpers.tsx index a954647947..3daac4f141 100644 --- a/app/client/src/components/editorComponents/Debugger/helpers.tsx +++ b/app/client/src/components/editorComponents/Debugger/helpers.tsx @@ -13,7 +13,7 @@ import { matchApiPath, matchQueryPath, } from "constants/routes"; -import { getEntityNameAndPropertyPath } from "workers/Evaluation/evaluationUtils"; +import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils"; import { modText } from "utils/helpers"; import { union } from "lodash"; diff --git a/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts b/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts index 7c38b01c5d..2b77660378 100644 --- a/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts +++ b/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts @@ -18,7 +18,7 @@ import { isAction, isJSAction, isWidget, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import history, { NavigationMethod } from "utils/history"; import { jsCollectionIdURL } from "RouteBuilder"; import store from "store"; diff --git a/app/client/src/components/editorComponents/Debugger/hooks/useGetEntityInfo.tsx b/app/client/src/components/editorComponents/Debugger/hooks/useGetEntityInfo.tsx index 18ce4130d5..166102138a 100644 --- a/app/client/src/components/editorComponents/Debugger/hooks/useGetEntityInfo.tsx +++ b/app/client/src/components/editorComponents/Debugger/hooks/useGetEntityInfo.tsx @@ -12,7 +12,7 @@ import { isAction, isJSAction, isWidget, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { doesEntityHaveErrors } from "../helpers"; import React from "react"; import WidgetIcon from "pages/Editor/Explorer/Widgets/WidgetIcon"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx index adf38234e3..7da55734b0 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx @@ -51,7 +51,7 @@ import { } from "./utils"; import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers"; import { HelpBaseURL } from "constants/HelpConstants"; -import { ExplorerURLParams } from "pages/Editor/Explorer/helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import { getLastSelectedWidget } from "selectors/ui"; import AnalyticsUtil from "utils/AnalyticsUtil"; import useRecentEntities from "./useRecentEntities"; diff --git a/app/client/src/ee/entities/DataTree/actionTriggers.ts b/app/client/src/ee/entities/DataTree/actionTriggers.ts new file mode 100644 index 0000000000..ab8d4cf883 --- /dev/null +++ b/app/client/src/ee/entities/DataTree/actionTriggers.ts @@ -0,0 +1 @@ +export * from "ce/entities/DataTree/actionTriggers"; diff --git a/app/client/src/ee/pages/Editor/Explorer/helpers.tsx b/app/client/src/ee/pages/Editor/Explorer/helpers.tsx new file mode 100644 index 0000000000..9ffb107134 --- /dev/null +++ b/app/client/src/ee/pages/Editor/Explorer/helpers.tsx @@ -0,0 +1 @@ +export * from "ce/pages/Editor/Explorer/helpers"; diff --git a/app/client/src/ee/sagas/ActionExecution/ActionExecutionSagas.ts b/app/client/src/ee/sagas/ActionExecution/ActionExecutionSagas.ts new file mode 100644 index 0000000000..5d05b81ec7 --- /dev/null +++ b/app/client/src/ee/sagas/ActionExecution/ActionExecutionSagas.ts @@ -0,0 +1 @@ +export * from "ce/sagas/ActionExecution/ActionExecutionSagas"; diff --git a/app/client/src/ee/utils/autocomplete/EntityDefinitions.ts b/app/client/src/ee/utils/autocomplete/EntityDefinitions.ts new file mode 100644 index 0000000000..f58ae5d739 --- /dev/null +++ b/app/client/src/ee/utils/autocomplete/EntityDefinitions.ts @@ -0,0 +1 @@ +export * from "ce/utils/autocomplete/EntityDefinitions"; diff --git a/app/client/src/ee/workers/Evaluation/Actions.ts b/app/client/src/ee/workers/Evaluation/Actions.ts new file mode 100644 index 0000000000..096bbe55e8 --- /dev/null +++ b/app/client/src/ee/workers/Evaluation/Actions.ts @@ -0,0 +1 @@ +export * from "ce/workers/Evaluation/Actions"; diff --git a/app/client/src/ee/workers/Evaluation/dataTreeUtils.ts b/app/client/src/ee/workers/Evaluation/dataTreeUtils.ts new file mode 100644 index 0000000000..d92506b876 --- /dev/null +++ b/app/client/src/ee/workers/Evaluation/dataTreeUtils.ts @@ -0,0 +1 @@ +export * from "ce/workers/Evaluation/dataTreeUtils"; diff --git a/app/client/src/ee/workers/Evaluation/evaluationUtils.ts b/app/client/src/ee/workers/Evaluation/evaluationUtils.ts new file mode 100644 index 0000000000..c154097da5 --- /dev/null +++ b/app/client/src/ee/workers/Evaluation/evaluationUtils.ts @@ -0,0 +1 @@ +export * from "ce/workers/Evaluation/evaluationUtils"; diff --git a/app/client/src/ee/workers/common/DataTreeEvaluator/types.ts b/app/client/src/ee/workers/common/DataTreeEvaluator/types.ts new file mode 100644 index 0000000000..e0f020c8fc --- /dev/null +++ b/app/client/src/ee/workers/common/DataTreeEvaluator/types.ts @@ -0,0 +1 @@ +export * from "ce/workers/common/DataTreeEvaluator/types"; diff --git a/app/client/src/ee/workers/common/types.ts b/app/client/src/ee/workers/common/types.ts new file mode 100644 index 0000000000..6472bc2b65 --- /dev/null +++ b/app/client/src/ee/workers/common/types.ts @@ -0,0 +1 @@ +export * from "ce/workers/common/types"; diff --git a/app/client/src/entities/DataTree/types.ts b/app/client/src/entities/DataTree/types.ts index d613d4ef9a..18ff257a11 100644 --- a/app/client/src/entities/DataTree/types.ts +++ b/app/client/src/entities/DataTree/types.ts @@ -6,7 +6,7 @@ import { ActionDescription, ClearPluginActionDescription, RunPluginActionDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { Variable } from "entities/JSCollection"; import { DependencyMap, DynamicPath } from "utils/DynamicBindingUtils"; diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx index c9ed1bcee3..c733a41ccf 100644 --- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx @@ -26,7 +26,7 @@ import { AppState } from "@appsmith/reducers"; import ActionNameEditor from "components/editorComponents/ActionNameEditor"; import ActionSettings from "pages/Editor/ActionSettings"; import RequestDropdownField from "components/editorComponents/form/fields/RequestDropdownField"; -import { ExplorerURLParams } from "../Explorer/helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu"; import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; import { diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx index 1fe1a1b044..d193258065 100644 --- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx @@ -11,7 +11,7 @@ import { useDispatch, useSelector } from "react-redux"; import { getPageListAsOptions } from "selectors/entitiesSelector"; import history from "utils/history"; import ContextMenuTrigger from "../ContextMenuTrigger"; -import { ContextMenuPopoverModifiers } from "../helpers"; +import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers"; import { useNewActionName } from "./helpers"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; diff --git a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx index 4fce689691..2159bb89e3 100644 --- a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx @@ -9,7 +9,7 @@ import { deleteAction, } from "actions/pluginActionActions"; -import { ContextMenuPopoverModifiers } from "../helpers"; +import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers"; import { noop } from "lodash"; import TreeDropdown from "pages/Editor/Explorer/TreeDropdown"; import { useNewActionName } from "./helpers"; diff --git a/app/client/src/pages/Editor/Explorer/Datasources.tsx b/app/client/src/pages/Editor/Explorer/Datasources.tsx index 5544d19c48..e508102dfe 100644 --- a/app/client/src/pages/Editor/Explorer/Datasources.tsx +++ b/app/client/src/pages/Editor/Explorer/Datasources.tsx @@ -29,7 +29,7 @@ import { useDatasourceIdFromURL, getExplorerStatus, saveExplorerStatus, -} from "./helpers"; +} from "@appsmith/pages/Editor/Explorer/helpers"; import { Icon } from "design-system"; import { AddEntity, EmptyComponent } from "./common"; import { integrationEditorURL } from "RouteBuilder"; diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DataSourceContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DataSourceContextMenu.tsx index c833975409..ad29b44c07 100644 --- a/app/client/src/pages/Editor/Explorer/Datasources/DataSourceContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Datasources/DataSourceContextMenu.tsx @@ -7,7 +7,7 @@ import { import TreeDropdown from "pages/Editor/Explorer/TreeDropdown"; import ContextMenuTrigger from "../ContextMenuTrigger"; import { noop } from "lodash"; -import { ContextMenuPopoverModifiers } from "../helpers"; +import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers"; import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { CONTEXT_EDIT_NAME, diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx index b34e9d1511..f387fbc6da 100644 --- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx +++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx @@ -3,7 +3,7 @@ import { Datasource } from "entities/Datasource"; import { Plugin } from "api/PluginApi"; import DataSourceContextMenu from "./DataSourceContextMenu"; import { getPluginIcon } from "../ExplorerIcons"; -import { getQueryIdFromURL } from "../helpers"; +import { getQueryIdFromURL } from "@appsmith/pages/Editor/Explorer/helpers"; import Entity, { EntityClassNames } from "../Entity"; import history, { NavigationMethod } from "utils/history"; import { diff --git a/app/client/src/pages/Editor/Explorer/Entity/CurrentPageEntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/CurrentPageEntityProperties.tsx index 842a8c04f2..c14ea81ce1 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/CurrentPageEntityProperties.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/CurrentPageEntityProperties.tsx @@ -4,7 +4,7 @@ import { isFunction } from "lodash"; import { entityDefinitions, EntityDefinitionsOptions, -} from "utils/autocomplete/EntityDefinitions"; +} from "@appsmith/utils/autocomplete/EntityDefinitions"; import { ENTITY_TYPE, DataTreeAction, diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx index ee51e3ac89..0d777ffa06 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx @@ -4,7 +4,8 @@ import { isFunction } from "lodash"; import { entityDefinitions, EntityDefinitionsOptions, -} from "utils/autocomplete/EntityDefinitions"; + getPropsForJSActionEntity, +} from "@appsmith/utils/autocomplete/EntityDefinitions"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { useDispatch, useSelector } from "react-redux"; import PerformanceTracker, { @@ -12,7 +13,6 @@ import PerformanceTracker, { } from "utils/PerformanceTracker"; import * as Sentry from "@sentry/react"; import { AppState } from "@appsmith/reducers"; -import { getPropsForJSActionEntity } from "utils/autocomplete/EntityDefinitions"; import { isEmpty } from "lodash"; import { getCurrentPageId } from "selectors/editorSelectors"; import classNames from "classnames"; diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx index 864c55f6ca..9ff8abebbf 100644 --- a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx +++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx @@ -14,7 +14,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { mockDatasources } from "./mockTestData"; import { updateCurrentPage } from "actions/pageActions"; import urlBuilder from "entities/URLRedirect/URLAssembly"; -import * as helpers from "./helpers"; +import * as helpers from "@appsmith/pages/Editor/Explorer/helpers"; import * as permissionUtils from "@appsmith/utils/permissionHelpers"; import userEvent from "@testing-library/user-event"; @@ -32,6 +32,11 @@ jest.mock("@appsmith/utils/permissionHelpers", () => { }; }); +jest.mock("@appsmith/pages/Editor/Explorer/helpers", () => ({ + __esModule: true, + ...jest.requireActual("@appsmith/pages/Editor/Explorer/helpers"), +})); + describe("Entity Explorer tests", () => { beforeAll(() => { runSagaMiddleware(); diff --git a/app/client/src/pages/Editor/Explorer/Files/index.tsx b/app/client/src/pages/Editor/Explorer/Files/index.tsx index 337501bfed..59c6f6d947 100644 --- a/app/client/src/pages/Editor/Explorer/Files/index.tsx +++ b/app/client/src/pages/Editor/Explorer/Files/index.tsx @@ -17,7 +17,10 @@ import { ExplorerActionEntity } from "../Actions/ActionEntity"; import ExplorerJSCollectionEntity from "../JSActions/JSActionEntity"; import { Colors } from "constants/Colors"; import { selectFilesForExplorer } from "selectors/entitiesSelector"; -import { getExplorerStatus, saveExplorerStatus } from "../helpers"; +import { + getExplorerStatus, + saveExplorerStatus, +} from "@appsmith/pages/Editor/Explorer/helpers"; import { Icon } from "design-system"; import { AddEntity, EmptyComponent } from "../common"; import ExplorerSubMenu from "./Submenu"; diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx index 4786b5cbe7..0701076e61 100644 --- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx @@ -7,7 +7,7 @@ import { copyJSCollectionRequest, deleteJSCollection, } from "actions/jsActionActions"; -import { ContextMenuPopoverModifiers } from "../helpers"; +import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers"; import noop from "lodash/noop"; import { getJSEntityName } from "./helpers"; import { initExplorerEntityNameEdit } from "actions/explorerActions"; diff --git a/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx b/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx index 95f8258042..d82f8a8c11 100644 --- a/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx @@ -5,7 +5,7 @@ import { copyJSCollectionRequest, deleteJSCollection, } from "actions/jsActionActions"; -import { ContextMenuPopoverModifiers } from "../helpers"; +import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers"; import noop from "lodash/noop"; import TreeDropdown from "pages/Editor/Explorer/TreeDropdown"; import { getJSEntityName } from "./helpers"; diff --git a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx index 7abbc495ee..e5d4faa1ca 100644 --- a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx @@ -19,7 +19,7 @@ import history from "utils/history"; import { generateTemplateFormURL } from "RouteBuilder"; import { useParams } from "react-router"; import { useDispatch, useSelector } from "react-redux"; -import { ExplorerURLParams } from "../helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import { showTemplatesModal } from "actions/templateActions"; import { Colors } from "constants/Colors"; import { diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx index ea1bc3e3ed..723d2aaa1e 100644 --- a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx @@ -6,7 +6,7 @@ import TreeDropdown, { import { noop } from "lodash"; import ContextMenuTrigger from "../ContextMenuTrigger"; import AnalyticsUtil from "utils/AnalyticsUtil"; -import { ContextMenuPopoverModifiers } from "../helpers"; +import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers"; import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { clonePageInit, diff --git a/app/client/src/pages/Editor/Explorer/Pages/index.tsx b/app/client/src/pages/Editor/Explorer/Pages/index.tsx index 2b5861f5fe..89d5606f18 100644 --- a/app/client/src/pages/Editor/Explorer/Pages/index.tsx +++ b/app/client/src/pages/Editor/Explorer/Pages/index.tsx @@ -31,7 +31,10 @@ import { getExplorerPinned } from "selectors/explorerSelector"; import { setExplorerPinnedAction } from "actions/explorerActions"; import { selectAllPages } from "selectors/entitiesSelector"; import { builderURL } from "RouteBuilder"; -import { getExplorerStatus, saveExplorerStatus } from "../helpers"; +import { + getExplorerStatus, + saveExplorerStatus, +} from "@appsmith/pages/Editor/Explorer/helpers"; import { tailwindLayers } from "constants/Layers"; import useResize, { CallbackResponseType, diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx index 79299f322e..dea58bad99 100644 --- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx @@ -4,7 +4,7 @@ import TreeDropdown, { TreeDropdownOption, } from "pages/Editor/Explorer/TreeDropdown"; import ContextMenuTrigger from "../ContextMenuTrigger"; -import { ContextMenuPopoverModifiers } from "../helpers"; +import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers"; import { noop } from "lodash"; import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { AppState } from "@appsmith/reducers"; diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx index abb1f216ee..86a29eafec 100644 --- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx +++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx @@ -16,7 +16,10 @@ import { } from "@appsmith/constants/messages"; import { selectWidgetsForCurrentPage } from "selectors/entitiesSelector"; import { inGuidedTour } from "selectors/onboardingSelectors"; -import { getExplorerStatus, saveExplorerStatus } from "../helpers"; +import { + getExplorerStatus, + saveExplorerStatus, +} from "@appsmith/pages/Editor/Explorer/helpers"; import { Icon } from "design-system"; import { AddEntity, EmptyComponent } from "../common"; import { noop } from "lodash"; diff --git a/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts b/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts index 098f13699c..857b0b7e8a 100644 --- a/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts +++ b/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts @@ -1,7 +1,7 @@ import { useCallback } from "react"; import { WidgetType } from "constants/WidgetConstants"; import { useParams } from "react-router"; -import { ExplorerURLParams } from "../helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import { flashElementsById, quickScrollToWidget } from "utils/helpers"; import { useDispatch, useSelector } from "react-redux"; import { useWidgetSelection } from "utils/hooks/useWidgetSelection"; diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx index 31462ab431..bcd8500831 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx @@ -15,7 +15,7 @@ import { Datasource } from "entities/Datasource"; import { fetchDatasourceStructure } from "actions/datasourceActions"; import { generateTemplateToUpdatePage } from "actions/pageActions"; import { useParams, useLocation } from "react-router"; -import { ExplorerURLParams } from "../../../Explorer/helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import { INTEGRATION_TABS } from "constants/routes"; import history from "utils/history"; import { getQueryParams } from "utils/URLUtils"; diff --git a/app/client/src/pages/Editor/JSEditor/Form.tsx b/app/client/src/pages/Editor/JSEditor/Form.tsx index 306b7b53c5..b15ca110f3 100644 --- a/app/client/src/pages/Editor/JSEditor/Form.tsx +++ b/app/client/src/pages/Editor/JSEditor/Form.tsx @@ -25,7 +25,7 @@ import { } from "actions/jsPaneActions"; import { useDispatch, useSelector } from "react-redux"; import { useParams } from "react-router"; -import { ExplorerURLParams } from "../Explorer/helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import JSResponseView from "components/editorComponents/JSResponseView"; import { isEmpty } from "lodash"; import equal from "fast-deep-equal/es6"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx index a2130ed580..02b36e066c 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx @@ -3,7 +3,10 @@ import styled from "styled-components"; import { AppState } from "@appsmith/reducers"; import { useDispatch, useSelector } from "react-redux"; import { getDataTree } from "selectors/dataTreeSelectors"; -import { isAction, isWidget } from "workers/Evaluation/evaluationUtils"; +import { + isAction, + isWidget, +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { Classes, Dropdown, diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx index 46da42fada..10081b946c 100644 --- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx +++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx @@ -78,7 +78,7 @@ import { } from "@appsmith/constants/messages"; import { useParams } from "react-router"; import { AppState } from "@appsmith/reducers"; -import { ExplorerURLParams } from "../Explorer/helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu"; import { thinScrollbar } from "constants/DefaultTheme"; import ActionRightPane, { diff --git a/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasSection.tsx b/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasSection.tsx index b898148732..5a52ed4e7b 100644 --- a/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasSection.tsx +++ b/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasSection.tsx @@ -14,7 +14,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil"; import history from "utils/history"; import { generateTemplateFormURL } from "RouteBuilder"; import { useParams } from "react-router"; -import { ExplorerURLParams } from "../Explorer/helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import { showTemplatesModal as showTemplatesModalAction } from "actions/templateActions"; import { createMessage, diff --git a/app/client/src/pages/common/datasourceAuth/index.tsx b/app/client/src/pages/common/datasourceAuth/index.tsx index b073a875d4..33508e6887 100644 --- a/app/client/src/pages/common/datasourceAuth/index.tsx +++ b/app/client/src/pages/common/datasourceAuth/index.tsx @@ -19,7 +19,7 @@ import { import AnalyticsUtil from "utils/AnalyticsUtil"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import { useParams, useLocation } from "react-router"; -import { ExplorerURLParams } from "pages/Editor/Explorer/helpers"; +import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import { AppState } from "@appsmith/reducers"; import { AuthType, diff --git a/app/client/src/reducers/entityReducers/metaReducer/index.ts b/app/client/src/reducers/entityReducers/metaReducer/index.ts index 03e3c68e5b..018fac23b0 100644 --- a/app/client/src/reducers/entityReducers/metaReducer/index.ts +++ b/app/client/src/reducers/entityReducers/metaReducer/index.ts @@ -11,7 +11,7 @@ import { WidgetReduxActionTypes, } from "@appsmith/constants/ReduxActionConstants"; import produce from "immer"; -import { EvalMetaUpdates } from "workers/common/DataTreeEvaluator/types"; +import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types"; import { getMetaWidgetResetObj } from "./metaReducerUtils"; export type WidgetMetaState = Record; diff --git a/app/client/src/sagas/ActionExecution/CopyActionSaga.ts b/app/client/src/sagas/ActionExecution/CopyActionSaga.ts index 3ab4d1bc03..372d8e0a9d 100644 --- a/app/client/src/sagas/ActionExecution/CopyActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/CopyActionSaga.ts @@ -3,7 +3,7 @@ import AppsmithConsole from "utils/AppsmithConsole"; import { ActionTriggerType, CopyToClipboardDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { ActionValidationError } from "sagas/ActionExecution/errorUtils"; import { getType, Types } from "utils/TypeHelpers"; diff --git a/app/client/src/sagas/ActionExecution/DownloadActionSaga.ts b/app/client/src/sagas/ActionExecution/DownloadActionSaga.ts index 7a45941645..ff07399d76 100644 --- a/app/client/src/sagas/ActionExecution/DownloadActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/DownloadActionSaga.ts @@ -5,7 +5,7 @@ import Axios from "axios"; import { ActionTriggerType, DownloadActionDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { ActionValidationError } from "sagas/ActionExecution/errorUtils"; import { isBase64String, isUrlString } from "./downloadActionUtils"; import { isBlobUrl } from "utils/AppsmithUtils"; diff --git a/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.test.ts b/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.test.ts index 78df4d74fc..e58c21b36b 100644 --- a/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.test.ts +++ b/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.test.ts @@ -1,6 +1,6 @@ import { call } from "redux-saga/effects"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; -import { executeAppAction } from "./ActionExecutionSagas"; +import { executeAppAction } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { extractGeoLocation, getCurrentLocationSaga, diff --git a/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.ts b/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.ts index 39cc6922c8..d5f9f3e138 100644 --- a/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.ts +++ b/app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.ts @@ -1,12 +1,12 @@ import { GetCurrentLocationDescription, WatchCurrentLocationDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { executeAppAction, TriggerMeta, -} from "sagas/ActionExecution/ActionExecutionSagas"; +} from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { call, put, spawn, take } from "redux-saga/effects"; import { logActionExecutionError, diff --git a/app/client/src/sagas/ActionExecution/ModalSagas.ts b/app/client/src/sagas/ActionExecution/ModalSagas.ts index 281403b664..a519da4c51 100644 --- a/app/client/src/sagas/ActionExecution/ModalSagas.ts +++ b/app/client/src/sagas/ActionExecution/ModalSagas.ts @@ -2,7 +2,7 @@ import { ActionTriggerType, CloseModalActionDescription, ShowModalActionDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { put } from "redux-saga/effects"; import AppsmithConsole from "utils/AppsmithConsole"; import { ActionValidationError } from "sagas/ActionExecution/errorUtils"; diff --git a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts index 24fe9e9fc4..0e32780474 100644 --- a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts @@ -9,7 +9,7 @@ import { getQueryStringfromObject } from "RouteBuilder"; import history from "utils/history"; import { setDataUrl } from "sagas/PageSagas"; import AppsmithConsole from "utils/AppsmithConsole"; -import { NavigateActionDescription } from "entities/DataTree/actionTriggers"; +import { NavigateActionDescription } from "@appsmith/entities/DataTree/actionTriggers"; import { builderURL, viewerURL } from "RouteBuilder"; import { TriggerFailureError } from "./errorUtils"; import { isValidURL } from "utils/URLUtils"; diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts index f6eb50ae7a..07289228b3 100644 --- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts @@ -83,7 +83,7 @@ import { SAAS_EDITOR_API_ID_PATH } from "pages/Editor/SaaSEditor/constants"; import { ActionTriggerType, RunPluginActionDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { APP_MODE } from "entities/App"; import { FileDataTypes } from "widgets/constants"; import { hideDebuggerErrors } from "actions/debuggerActions"; @@ -99,15 +99,18 @@ import { JSCollection } from "entities/JSCollection"; import { executeAppAction, TriggerMeta, -} from "sagas/ActionExecution/ActionExecutionSagas"; +} from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { requestModalConfirmationSaga } from "sagas/UtilSagas"; import { ModalType } from "reducers/uiReducers/modalActionReducer"; import { getFormNames, getFormValues } from "redux-form"; import { CURL_IMPORT_FORM } from "@appsmith/constants/forms"; import { submitCurlImportForm } from "actions/importActions"; import { curlImportFormValues } from "pages/Editor/APIEditor/helpers"; -import { matchBasePath } from "pages/Editor/Explorer/helpers"; -import { isTrueObject, findDatatype } from "workers/Evaluation/evaluationUtils"; +import { matchBasePath } from "@appsmith/pages/Editor/Explorer/helpers"; +import { + isTrueObject, + findDatatype, +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { handleExecuteJSFunctionSaga } from "sagas/JSPaneSagas"; import { Plugin } from "api/PluginApi"; import { setDefaultActionDisplayFormat } from "./PluginActionSagaUtils"; diff --git a/app/client/src/sagas/ActionExecution/PostMessageSaga.ts b/app/client/src/sagas/ActionExecution/PostMessageSaga.ts index ca83e379b7..c47f8e11f1 100644 --- a/app/client/src/sagas/ActionExecution/PostMessageSaga.ts +++ b/app/client/src/sagas/ActionExecution/PostMessageSaga.ts @@ -1,10 +1,10 @@ import { spawn } from "redux-saga/effects"; -import { PostMessageDescription } from "../../entities/DataTree/actionTriggers"; +import { PostMessageDescription } from "@appsmith/entities/DataTree/actionTriggers"; import { logActionExecutionError, TriggerFailureError, } from "sagas/ActionExecution/errorUtils"; -import { TriggerMeta } from "./ActionExecutionSagas"; +import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { isEmpty } from "lodash"; export function* postMessageSaga( diff --git a/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts b/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts index b5794fdae8..a18776a123 100644 --- a/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts @@ -8,7 +8,7 @@ import AppsmithConsole from "utils/AppsmithConsole"; import { ActionTriggerType, ResetWidgetDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { ActionValidationError, TriggerFailureError, @@ -18,7 +18,7 @@ import { FlattenedWidgetProps } from "widgets/constants"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { getDataTree } from "selectors/dataTreeSelectors"; import { DataTree } from "entities/DataTree/dataTreeFactory"; -import { isWidget } from "workers/Evaluation/evaluationUtils"; +import { isWidget } from "@appsmith/workers/Evaluation/evaluationUtils"; export default function* resetWidgetActionSaga( payload: ResetWidgetDescription["payload"], diff --git a/app/client/src/sagas/ActionExecution/SetIntervalSaga.ts b/app/client/src/sagas/ActionExecution/SetIntervalSaga.ts index 32f5e29ecd..ec12138ee5 100644 --- a/app/client/src/sagas/ActionExecution/SetIntervalSaga.ts +++ b/app/client/src/sagas/ActionExecution/SetIntervalSaga.ts @@ -1,11 +1,11 @@ import { ClearIntervalDescription, SetIntervalDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { executeAppAction, TriggerMeta, -} from "sagas/ActionExecution/ActionExecutionSagas"; +} from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { call, delay, spawn } from "redux-saga/effects"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { diff --git a/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts b/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts index a07b5d8caa..37773acf51 100644 --- a/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts @@ -3,7 +3,7 @@ import AppsmithConsole from "utils/AppsmithConsole"; import { ActionTriggerType, ShowAlertActionDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { ActionValidationError, TriggerFailureError, diff --git a/app/client/src/sagas/ActionExecution/StoreActionSaga.ts b/app/client/src/sagas/ActionExecution/StoreActionSaga.ts index 7045dbbef9..d898a5b688 100644 --- a/app/client/src/sagas/ActionExecution/StoreActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/StoreActionSaga.ts @@ -10,7 +10,7 @@ import { getAppStoreData } from "selectors/entitiesSelector"; import { RemoveValueActionDescription, StoreValueActionDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import { AppStoreState } from "reducers/entityReducers/appReducer"; diff --git a/app/client/src/sagas/ActionExecution/errorUtils.ts b/app/client/src/sagas/ActionExecution/errorUtils.ts index c6c4127ccd..62224ba0fd 100644 --- a/app/client/src/sagas/ActionExecution/errorUtils.ts +++ b/app/client/src/sagas/ActionExecution/errorUtils.ts @@ -15,7 +15,7 @@ import { Types } from "utils/TypeHelpers"; import { ActionTriggerFunctionNames, ActionTriggerType, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import DebugButton from "components/editorComponents/Debugger/DebugCTA"; /* diff --git a/app/client/src/sagas/DebuggerSagas.ts b/app/client/src/sagas/DebuggerSagas.ts index 996150267c..e1688479ce 100644 --- a/app/client/src/sagas/DebuggerSagas.ts +++ b/app/client/src/sagas/DebuggerSagas.ts @@ -57,12 +57,12 @@ import { getCurrentPageId } from "selectors/editorSelectors"; import { WidgetProps } from "widgets/BaseWidget"; import * as log from "loglevel"; import { DependencyMap } from "utils/DynamicBindingUtils"; -import { TriggerMeta } from "./ActionExecution/ActionExecutionSagas"; +import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { getEntityNameAndPropertyPath, isAction, isWidget, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; // Saga to format action request values to be shown in the debugger function* formatActionRequestSaga( diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts index 78f2aac097..34da0cda6d 100644 --- a/app/client/src/sagas/EvaluationsSaga.ts +++ b/app/client/src/sagas/EvaluationsSaga.ts @@ -67,7 +67,7 @@ import { import { executeActionTriggers, TriggerMeta, -} from "./ActionExecution/ActionExecutionSagas"; +} from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { Toaster, Variant } from "design-system"; import { @@ -91,7 +91,7 @@ import { UncaughtPromiseError, } from "sagas/ActionExecution/errorUtils"; import { Channel } from "redux-saga"; -import { ActionDescription } from "entities/DataTree/actionTriggers"; +import { ActionDescription } from "@appsmith/entities/DataTree/actionTriggers"; import { FormEvaluationState } from "reducers/evaluationReducers/formEvaluationReducer"; import { FormEvalActionPayload } from "./FormEvaluationSaga"; import { getSelectedAppTheme } from "selectors/appThemingSelectors"; diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts index e5d3e63422..2018fb657b 100644 --- a/app/client/src/sagas/JSPaneSagas.ts +++ b/app/client/src/sagas/JSPaneSagas.ts @@ -29,7 +29,7 @@ import { JSCollection, JSAction } from "entities/JSCollection"; import { createJSCollectionRequest } from "actions/jsActionActions"; import history from "utils/history"; import { executeFunction } from "./EvaluationsSaga"; -import { getJSCollectionIdFromURL } from "pages/Editor/Explorer/helpers"; +import { getJSCollectionIdFromURL } from "@appsmith/pages/Editor/Explorer/helpers"; import { getDifferenceInJSCollection, JSUpdate, diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts index c404237ba6..a9e7081669 100644 --- a/app/client/src/sagas/PostEvaluationSagas.ts +++ b/app/client/src/sagas/PostEvaluationSagas.ts @@ -13,7 +13,7 @@ import { isAction, isJSAction, isWidget, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { EvalError, EvalErrorTypes, diff --git a/app/client/src/sagas/PostLintingSagas.ts b/app/client/src/sagas/PostLintingSagas.ts index 716dd91515..ae9f64ee3e 100644 --- a/app/client/src/sagas/PostLintingSagas.ts +++ b/app/client/src/sagas/PostLintingSagas.ts @@ -11,7 +11,7 @@ import AppsmithConsole from "utils/AppsmithConsole"; import { getEntityNameAndPropertyPath, isJSAction, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; // We currently only log lint errors in JSObjects export function* logLatestLintPropertyErrors({ diff --git a/app/client/src/sagas/RecentEntitiesSagas.ts b/app/client/src/sagas/RecentEntitiesSagas.ts index 2181401b38..f2027981d7 100644 --- a/app/client/src/sagas/RecentEntitiesSagas.ts +++ b/app/client/src/sagas/RecentEntitiesSagas.ts @@ -1,5 +1,5 @@ import { matchPath } from "react-router"; -import { matchBasePath } from "pages/Editor/Explorer/helpers"; +import { matchBasePath } from "@appsmith/pages/Editor/Explorer/helpers"; import { API_EDITOR_ID_PATH, QUERIES_EDITOR_ID_PATH, diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx index 6acbc303f3..442e9dcb67 100644 --- a/app/client/src/sagas/WidgetOperationSagas.tsx +++ b/app/client/src/sagas/WidgetOperationSagas.tsx @@ -70,7 +70,7 @@ import { getAllPathsFromPropertyConfig, nextAvailableRowInContainer, } from "entities/Widget/utils"; -import { getAllPaths } from "workers/Evaluation/evaluationUtils"; +import { getAllPaths } from "@appsmith/workers/Evaluation/evaluationUtils"; import { createMessage, ERROR_WIDGET_COPY_NO_WIDGET_SELECTED, diff --git a/app/client/src/sagas/WidgetOperationUtils.ts b/app/client/src/sagas/WidgetOperationUtils.ts index bc59421b49..736aeb4b53 100644 --- a/app/client/src/sagas/WidgetOperationUtils.ts +++ b/app/client/src/sagas/WidgetOperationUtils.ts @@ -52,7 +52,7 @@ import { getContainerWidgetSpacesSelector } from "selectors/editorSelectors"; import { reflow } from "reflow"; import { getBottomRowAfterReflow } from "utils/reflowHookUtils"; import { DataTreeWidget } from "entities/DataTree/dataTreeFactory"; -import { isWidget } from "workers/Evaluation/evaluationUtils"; +import { isWidget } from "@appsmith/workers/Evaluation/evaluationUtils"; import { CANVAS_DEFAULT_MIN_HEIGHT_PX } from "constants/AppConstants"; import { MetaState } from "reducers/entityReducers/metaReducer"; diff --git a/app/client/src/selectors/debuggerSelectors.tsx b/app/client/src/selectors/debuggerSelectors.tsx index 04204afdaf..459ea0509e 100644 --- a/app/client/src/selectors/debuggerSelectors.tsx +++ b/app/client/src/selectors/debuggerSelectors.tsx @@ -6,7 +6,7 @@ import { AppState } from "@appsmith/reducers"; import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import { createSelector } from "reselect"; import { getWidgets } from "sagas/selectors"; -import { isWidget } from "workers/Evaluation/evaluationUtils"; +import { isWidget } from "@appsmith/workers/Evaluation/evaluationUtils"; import { getDataTree } from "./dataTreeSelectors"; type ErrorObejct = { diff --git a/app/client/src/selectors/entitiesSelector.ts b/app/client/src/selectors/entitiesSelector.ts index d2091de81a..11ff753f38 100644 --- a/app/client/src/selectors/entitiesSelector.ts +++ b/app/client/src/selectors/entitiesSelector.ts @@ -21,7 +21,7 @@ import { JSCollectionDataState } from "reducers/entityReducers/jsActionsReducer" import { DefaultPlugin, GenerateCRUDEnabledPluginMap } from "api/PluginApi"; import { JSAction, JSCollection } from "entities/JSCollection"; import { APP_MODE } from "entities/App"; -import { ExplorerFileEntity } from "pages/Editor/Explorer/helpers"; +import { ExplorerFileEntity } from "@appsmith/pages/Editor/Explorer/helpers"; import { ActionValidationConfigMap } from "constants/PropertyControlConstants"; import { selectFeatureFlags } from "./usersSelectors"; import { diff --git a/app/client/src/selectors/formSelectors.ts b/app/client/src/selectors/formSelectors.ts index c82b6d5918..e0eee29b56 100644 --- a/app/client/src/selectors/formSelectors.ts +++ b/app/client/src/selectors/formSelectors.ts @@ -12,7 +12,7 @@ import { getDataTree } from "./dataTreeSelectors"; import { DataTree } from "entities/DataTree/dataTreeFactory"; import { Action } from "entities/Action"; import { EvaluationError } from "utils/DynamicBindingUtils"; -import { getActionIdFromURL } from "pages/Editor/Explorer/helpers"; +import { getActionIdFromURL } from "@appsmith/pages/Editor/Explorer/helpers"; import { extractConditionalOutput } from "components/formControls/utils"; export type GetFormData = { diff --git a/app/client/src/utils/DynamicBindingUtils.ts b/app/client/src/utils/DynamicBindingUtils.ts index 4d769e713f..ebbad82928 100644 --- a/app/client/src/utils/DynamicBindingUtils.ts +++ b/app/client/src/utils/DynamicBindingUtils.ts @@ -7,7 +7,7 @@ import { getEntityNameAndPropertyPath, isJSAction, isTrueObject, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { DataTreeEntity } from "entities/DataTree/dataTreeFactory"; import { getType, Types } from "./TypeHelpers"; import { ViewTypes } from "components/formControls/utils"; diff --git a/app/client/src/utils/WidgetLoadingStateUtils.ts b/app/client/src/utils/WidgetLoadingStateUtils.ts index fdd27882ad..92a8442653 100644 --- a/app/client/src/utils/WidgetLoadingStateUtils.ts +++ b/app/client/src/utils/WidgetLoadingStateUtils.ts @@ -1,6 +1,9 @@ import { DataTree } from "entities/DataTree/dataTreeFactory"; import { get, set } from "lodash"; -import { isJSObject, isWidget } from "workers/Evaluation/evaluationUtils"; +import { + isJSObject, + isWidget, +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { DependencyMap } from "./DynamicBindingUtils"; import WidgetFactory from "./WidgetFactory"; diff --git a/app/client/src/utils/autocomplete/CodemirrorTernService.ts b/app/client/src/utils/autocomplete/CodemirrorTernService.ts index 0cc6be630d..1558e284be 100644 --- a/app/client/src/utils/autocomplete/CodemirrorTernService.ts +++ b/app/client/src/utils/autocomplete/CodemirrorTernService.ts @@ -16,7 +16,7 @@ import { import { GLOBAL_DEFS, GLOBAL_FUNCTIONS, -} from "utils/autocomplete/EntityDefinitions"; +} from "@appsmith/utils/autocomplete/EntityDefinitions"; import { FieldEntityInformation } from "components/editorComponents/CodeEditor/EditorConfig"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { AutocompleteSorter } from "./AutocompleteSortRules"; diff --git a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts index ae9169fa4c..053c353495 100644 --- a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts +++ b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts @@ -9,7 +9,7 @@ import { ENTITY_TYPE, EvaluationSubstitutionType, } from "entities/DataTree/dataTreeFactory"; -import { entityDefinitions } from "utils/autocomplete/EntityDefinitions"; +import { entityDefinitions } from "@appsmith/utils/autocomplete/EntityDefinitions"; describe("dataTreeTypeDefCreator", () => { it("creates the right def for a widget", () => { diff --git a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts index c4000cf01d..f98e9cf834 100644 --- a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts +++ b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts @@ -1,6 +1,6 @@ import { DataTree, ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { uniqueId, get, isFunction, isObject } from "lodash"; -import { entityDefinitions } from "utils/autocomplete/EntityDefinitions"; +import { entityDefinitions } from "@appsmith/utils/autocomplete/EntityDefinitions"; import { getType, Types } from "utils/TypeHelpers"; import { Def } from "tern"; import { @@ -9,7 +9,7 @@ import { isJSAction, isTrueObject, isWidget, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { DataTreeDefEntityInformation } from "utils/autocomplete/CodemirrorTernService"; export type ExtraDef = Record; diff --git a/app/client/src/widgets/ListWidget/widget/index.tsx b/app/client/src/widgets/ListWidget/widget/index.tsx index e5dd0cc009..7a3a2f0333 100644 --- a/app/client/src/widgets/ListWidget/widget/index.tsx +++ b/app/client/src/widgets/ListWidget/widget/index.tsx @@ -38,7 +38,7 @@ import ListPagination, { import { ValidationTypes } from "constants/WidgetValidation"; import derivedProperties from "./parseDerivedProperties"; import { DSLWidget } from "widgets/constants"; -import { entityDefinitions } from "utils/autocomplete/EntityDefinitions"; +import { entityDefinitions } from "@appsmith/utils/autocomplete/EntityDefinitions"; import { PrivateWidgets } from "entities/DataTree/types"; import equal from "fast-deep-equal/es6"; import { klona } from "klona/lite"; diff --git a/app/client/src/workers/Evaluation/JSObject/index.ts b/app/client/src/workers/Evaluation/JSObject/index.ts index e402817b13..dd4d745dec 100644 --- a/app/client/src/workers/Evaluation/JSObject/index.ts +++ b/app/client/src/workers/Evaluation/JSObject/index.ts @@ -10,7 +10,7 @@ import { DataTreeDiffEvent, getEntityNameAndPropertyPath, isJSAction, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { removeFunctionsAndVariableJSCollection, updateJSCollectionInUnEvalTree, diff --git a/app/client/src/workers/Evaluation/JSObject/utils.ts b/app/client/src/workers/Evaluation/JSObject/utils.ts index c0068d96d1..0dcb27a601 100644 --- a/app/client/src/workers/Evaluation/JSObject/utils.ts +++ b/app/client/src/workers/Evaluation/JSObject/utils.ts @@ -5,7 +5,7 @@ import { } from "entities/DataTree/dataTreeFactory"; import { ParsedBody, ParsedJSSubAction } from "utils/JSPaneUtils"; import { unset, set, get } from "lodash"; -import { isJSAction } from "workers/Evaluation/evaluationUtils"; +import { isJSAction } from "@appsmith/workers/Evaluation/evaluationUtils"; /** * here we add/remove the properties (variables and actions) which got added/removed from the JSObject parsedBody. diff --git a/app/client/src/workers/Evaluation/PromisifyAction.ts b/app/client/src/workers/Evaluation/PromisifyAction.ts index 3127547837..ff3a70214a 100644 --- a/app/client/src/workers/Evaluation/PromisifyAction.ts +++ b/app/client/src/workers/Evaluation/PromisifyAction.ts @@ -8,7 +8,7 @@ const ctx: Worker = self as any; * * needs a REQUEST_ID to be passed in to know which request is going on right now */ -import { ActionDescription } from "entities/DataTree/actionTriggers"; +import { ActionDescription } from "@appsmith/entities/DataTree/actionTriggers"; import _ from "lodash"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { dataTreeEvaluator } from "./handlers/evalTree"; diff --git a/app/client/src/workers/Evaluation/UserLog.ts b/app/client/src/workers/Evaluation/UserLog.ts index a37cb98ece..8330ff552a 100644 --- a/app/client/src/workers/Evaluation/UserLog.ts +++ b/app/client/src/workers/Evaluation/UserLog.ts @@ -3,7 +3,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { LogObject, Methods, Severity } from "entities/AppsmithConsole"; import { klona } from "klona/lite"; import moment from "moment"; -import { TriggerMeta } from "sagas/ActionExecution/ActionExecutionSagas"; +import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { sendMessage, MessageType } from "utils/MessageUtil"; import { MAIN_THREAD_ACTION } from "./evalWorkerActions"; import { _internalClearTimeout, _internalSetTimeout } from "./TimeoutOverride"; diff --git a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts index 5e98f07600..aed6242a87 100644 --- a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts +++ b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts @@ -13,7 +13,7 @@ import { ValidationTypes } from "constants/WidgetValidation"; import WidgetFactory from "utils/WidgetFactory"; import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget"; import { sortObjectWithArray } from "../../../utils/treeUtils"; -import { createUnEvalTreeForEval } from "../dataTreeUtils"; +import { createUnEvalTreeForEval } from "@appsmith/workers/Evaluation/dataTreeUtils"; const WIDGET_CONFIG_MAP: WidgetTypeConfigMap = { CONTAINER_WIDGET: { diff --git a/app/client/src/workers/Evaluation/evaluate.ts b/app/client/src/workers/Evaluation/evaluate.ts index affc355bb4..6e67922ae2 100644 --- a/app/client/src/workers/Evaluation/evaluate.ts +++ b/app/client/src/workers/Evaluation/evaluate.ts @@ -6,12 +6,12 @@ import { } from "utils/DynamicBindingUtils"; import unescapeJS from "unescape-js"; import { LogObject, Severity } from "entities/AppsmithConsole"; -import { enhanceDataTreeWithFunctions } from "./Actions"; +import { enhanceDataTreeWithFunctions } from "@appsmith/workers/Evaluation/Actions"; import { isEmpty } from "lodash"; -import { ActionDescription } from "entities/DataTree/actionTriggers"; +import { ActionDescription } from "@appsmith/entities/DataTree/actionTriggers"; import userLogs from "./UserLog"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; -import { TriggerMeta } from "sagas/ActionExecution/ActionExecutionSagas"; +import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import indirectEval from "./indirectEval"; import { DOM_APIS } from "./SetupDOM"; import { JSLibraries, libraryReservedIdentifiers } from "../common/JSLibrary"; diff --git a/app/client/src/workers/Evaluation/evaluation.worker.ts b/app/client/src/workers/Evaluation/evaluation.worker.ts index 9d4006cfbf..3566003700 100644 --- a/app/client/src/workers/Evaluation/evaluation.worker.ts +++ b/app/client/src/workers/Evaluation/evaluation.worker.ts @@ -1,6 +1,6 @@ // Workers do not have access to log.error /* eslint-disable no-console */ -import { WorkerErrorTypes } from "workers/common/types"; +import { WorkerErrorTypes } from "@appsmith/workers/common/types"; import { EvalWorkerASyncRequest, EvalWorkerSyncRequest } from "./types"; import { syncHandlerMap, asyncHandlerMap } from "./handlers"; import { TMessage, sendMessage, MessageType } from "utils/MessageUtil"; diff --git a/app/client/src/workers/Evaluation/formEval.ts b/app/client/src/workers/Evaluation/formEval.ts index ff49dc4eeb..d67f0aabf1 100644 --- a/app/client/src/workers/Evaluation/formEval.ts +++ b/app/client/src/workers/Evaluation/formEval.ts @@ -13,7 +13,7 @@ import { FormConfigType } from "components/formControls/BaseControl"; import { isArray, isEmpty, isString, merge, uniq } from "lodash"; import { extractEvalConfigFromFormConfig } from "components/formControls/utils"; import { isDynamicValue } from "utils/DynamicBindingUtils"; -import { isTrueObject } from "./evaluationUtils"; +import { isTrueObject } from "@appsmith/workers/Evaluation/evaluationUtils"; export enum ConditionType { HIDE = "hide", // When set, the component will be shown until condition is true diff --git a/app/client/src/workers/Evaluation/handlers/evalActionBindings.ts b/app/client/src/workers/Evaluation/handlers/evalActionBindings.ts index bb2aa7c1f7..721ffdf4ce 100644 --- a/app/client/src/workers/Evaluation/handlers/evalActionBindings.ts +++ b/app/client/src/workers/Evaluation/handlers/evalActionBindings.ts @@ -1,5 +1,5 @@ import { dataTreeEvaluator } from "./evalTree"; -import { removeFunctions } from "../evaluationUtils"; +import { removeFunctions } from "@appsmith/workers/Evaluation/evaluationUtils"; import { EvalWorkerSyncRequest } from "../types"; export default function(request: EvalWorkerSyncRequest) { diff --git a/app/client/src/workers/Evaluation/handlers/evalTree.ts b/app/client/src/workers/Evaluation/handlers/evalTree.ts index 75a53c0525..53837ee208 100644 --- a/app/client/src/workers/Evaluation/handlers/evalTree.ts +++ b/app/client/src/workers/Evaluation/handlers/evalTree.ts @@ -10,17 +10,17 @@ import { } from "utils/DynamicBindingUtils"; import { JSUpdate } from "utils/JSPaneUtils"; import DataTreeEvaluator from "workers/common/DataTreeEvaluator"; -import { EvalMetaUpdates } from "workers/common/DataTreeEvaluator/types"; +import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types"; import { initiateLinting } from "workers/Linting/utils"; import { createUnEvalTreeForEval, makeEntityConfigsAsObjProperties, -} from "../dataTreeUtils"; +} from "@appsmith/workers/Evaluation/dataTreeUtils"; import { CrashingError, DataTreeDiff, getSafeToRenderDataTree, -} from "../evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { EvalTreeRequestData, EvalTreeResponseData, diff --git a/app/client/src/workers/Evaluation/handlers/evalTrigger.ts b/app/client/src/workers/Evaluation/handlers/evalTrigger.ts index 72316c83e9..7d49f0345a 100644 --- a/app/client/src/workers/Evaluation/handlers/evalTrigger.ts +++ b/app/client/src/workers/Evaluation/handlers/evalTrigger.ts @@ -1,6 +1,6 @@ import { dataTreeEvaluator } from "./evalTree"; import { EvalWorkerASyncRequest } from "../types"; -import { createUnEvalTreeForEval } from "../dataTreeUtils"; +import { createUnEvalTreeForEval } from "@appsmith/workers/Evaluation/dataTreeUtils"; export default async function(request: EvalWorkerASyncRequest) { const { data } = request; diff --git a/app/client/src/workers/Evaluation/handlers/validateProperty.ts b/app/client/src/workers/Evaluation/handlers/validateProperty.ts index b6d66318d8..05c6b4c9d6 100644 --- a/app/client/src/workers/Evaluation/handlers/validateProperty.ts +++ b/app/client/src/workers/Evaluation/handlers/validateProperty.ts @@ -1,5 +1,5 @@ import { validateWidgetProperty } from "workers/common/DataTreeEvaluator/validationUtils"; -import { removeFunctions } from "../evaluationUtils"; +import { removeFunctions } from "@appsmith/workers/Evaluation/evaluationUtils"; import { EvalWorkerSyncRequest } from "../types"; export default function(request: EvalWorkerSyncRequest) { diff --git a/app/client/src/workers/Evaluation/types.ts b/app/client/src/workers/Evaluation/types.ts index 13b869505d..421100460b 100644 --- a/app/client/src/workers/Evaluation/types.ts +++ b/app/client/src/workers/Evaluation/types.ts @@ -11,9 +11,9 @@ import { } from "workers/Evaluation/evalWorkerActions"; import { JSUpdate } from "utils/JSPaneUtils"; import { WidgetTypeConfigMap } from "utils/WidgetFactory"; -import { EvalMetaUpdates } from "workers/common/DataTreeEvaluator/types"; -import { WorkerRequest } from "workers/common/types"; -import { DataTreeDiff } from "./evaluationUtils"; +import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types"; +import { WorkerRequest } from "@appsmith/workers/common/types"; +import { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils"; export type EvalWorkerSyncRequest = WorkerRequest; export type EvalWorkerASyncRequest = WorkerRequest< diff --git a/app/client/src/workers/Linting/lint.worker.ts b/app/client/src/workers/Linting/lint.worker.ts index ed0d5814e8..2540eea51b 100644 --- a/app/client/src/workers/Linting/lint.worker.ts +++ b/app/client/src/workers/Linting/lint.worker.ts @@ -1,5 +1,5 @@ import { isEqual } from "lodash"; -import { WorkerErrorTypes } from "workers/common/types"; +import { WorkerErrorTypes } from "@appsmith/workers/common/types"; import { JSLibraries, resetJSLibraries } from "workers/common/JSLibrary"; import { LintWorkerRequest, diff --git a/app/client/src/workers/Linting/types.ts b/app/client/src/workers/Linting/types.ts index 4a7b070d6d..c7a27c2b66 100644 --- a/app/client/src/workers/Linting/types.ts +++ b/app/client/src/workers/Linting/types.ts @@ -1,6 +1,6 @@ import { DataTree } from "entities/DataTree/dataTreeFactory"; import { LintErrors } from "reducers/lintingReducers/lintErrorsReducers"; -import { WorkerRequest } from "workers/common/types"; +import { WorkerRequest } from "@appsmith/workers/common/types"; export enum LINT_WORKER_ACTIONS { LINT_TREE = "LINT_TREE", diff --git a/app/client/src/workers/Linting/utils.ts b/app/client/src/workers/Linting/utils.ts index 9bd0be7294..836bbf0abe 100644 --- a/app/client/src/workers/Linting/utils.ts +++ b/app/client/src/workers/Linting/utils.ts @@ -48,7 +48,7 @@ import { isATriggerPath, isJSAction, isWidget, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { LintErrors } from "reducers/lintingReducers/lintErrorsReducers"; import { Severity } from "entities/AppsmithConsole"; import { JSLibraries } from "workers/common/JSLibrary"; diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts index 3a2e8a1817..4cbe5420ed 100644 --- a/app/client/src/workers/common/DataTreeEvaluator/index.ts +++ b/app/client/src/workers/common/DataTreeEvaluator/index.ts @@ -40,7 +40,7 @@ import { overrideWidgetProperties, getAllPaths, isValidEntity, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { difference, flatten, @@ -81,7 +81,7 @@ import { ValidationConfig, } from "constants/PropertyControlConstants"; import { klona } from "klona/full"; -import { EvalMetaUpdates } from "./types"; +import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types"; import { updateDependencyMap, createDependencyMap, diff --git a/app/client/src/workers/common/DataTreeEvaluator/test.ts b/app/client/src/workers/common/DataTreeEvaluator/test.ts index 284b280ae5..a2de526969 100644 --- a/app/client/src/workers/common/DataTreeEvaluator/test.ts +++ b/app/client/src/workers/common/DataTreeEvaluator/test.ts @@ -5,7 +5,7 @@ import { unEvalTree, } from "./mockData/mockUnEvalTree"; import { DataTree } from "entities/DataTree/dataTreeFactory"; -import { DataTreeDiff } from "workers/Evaluation/evaluationUtils"; +import { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils"; import { ALL_WIDGETS_AND_CONFIG } from "utils/WidgetRegistry"; import { arrayAccessorCyclicDependency } from "./mockData/ArrayAccessorTree"; import { nestedArrayAccessorCyclicDependency } from "./mockData/NestedArrayAccessorTree"; diff --git a/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts b/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts index 2b1ca3d2e4..c7d70db09f 100644 --- a/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts +++ b/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts @@ -14,7 +14,7 @@ import { getEntityNameAndPropertyPath, isWidget, resetValidationErrorsForEntityProperty, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { validate } from "workers/Evaluation/validations"; import { EvalProps } from "."; diff --git a/app/client/src/workers/common/DependencyMap/index.ts b/app/client/src/workers/common/DependencyMap/index.ts index 0deb4c206b..0727e759c7 100644 --- a/app/client/src/workers/common/DependencyMap/index.ts +++ b/app/client/src/workers/common/DependencyMap/index.ts @@ -9,7 +9,7 @@ import { isDynamicLeaf, isValidEntity, getEntityNameAndPropertyPath, -} from "workers/Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { DataTree, DataTreeAction, diff --git a/app/client/src/workers/common/DependencyMap/utils.ts b/app/client/src/workers/common/DependencyMap/utils.ts index 041f9d3824..46edfee5c3 100644 --- a/app/client/src/workers/common/DependencyMap/utils.ts +++ b/app/client/src/workers/common/DependencyMap/utils.ts @@ -14,7 +14,7 @@ import { isAction, isJSAction, isWidget, -} from "../../Evaluation/evaluationUtils"; +} from "@appsmith/workers/Evaluation/evaluationUtils"; import { DataTreeAction, DataTreeJSAction, diff --git a/app/client/test/sagas.ts b/app/client/test/sagas.ts index 29fec1d9c3..6aadcbf774 100644 --- a/app/client/test/sagas.ts +++ b/app/client/test/sagas.ts @@ -20,7 +20,7 @@ import recentEntitiesSagas from "../src/sagas/RecentEntitiesSagas"; import websocketSagas from "../src/sagas/WebsocketSagas/WebsocketSagas"; import debuggerSagas from "../src/sagas/DebuggerSagas"; import { watchActionSagas } from "sagas/ActionSagas"; -import { watchActionExecutionSagas } from "sagas/ActionExecution/ActionExecutionSagas"; +import { watchActionExecutionSagas } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import widgetOperationSagas from "../src/sagas/WidgetOperationSagas"; import applicationSagas from "../src/sagas/ApplicationSagas"; import { watchDatasourcesSagas } from "sagas/DatasourcesSagas"; diff --git a/contributions/docs/GlobalFunctions.md b/contributions/docs/GlobalFunctions.md index a9b1788c87..756d907945 100644 --- a/contributions/docs/GlobalFunctions.md +++ b/contributions/docs/GlobalFunctions.md @@ -68,11 +68,11 @@ export type SetIntervalDescription = { import { ClearIntervalDescription, SetIntervalDescription, -} from "entities/DataTree/actionTriggers"; +} from "@appsmith/entities/DataTree/actionTriggers"; import { executeAppAction, TriggerMeta, -} from "sagas/ActionExecution/ActionExecutionSagas"; +} from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { call, delay, spawn } from "redux-saga/effects"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import {