Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: update imports for code split (#19085)

Browse Source 
* 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 <aishwarya@appsmith.com>
This commit is contained in:
Anand Srinivasan 2022-12-22 12:04:28 +05:30 committed by GitHub
parent c2a7face0c
commit db38a64e71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
110 changed files with 154 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/actions/metaActions.ts
View File

@ -3,7 +3,7 @@ import {
ReduxAction, ReduxAction,
} from "@appsmith/constants/ReduxActionConstants"; } from "@appsmith/constants/ReduxActionConstants";
import { BatchAction, batchAction } from "actions/batchActions"; 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"; import { DataTreeWidget } from "../entities/DataTree/dataTreeFactory";
export interface UpdateWidgetMetaPropertyPayload { export interface UpdateWidgetMetaPropertyPayload {

2
app/client/src/actions/pageActions.tsx
View File

@ -24,7 +24,7 @@ import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsRe
import { GenerateTemplatePageRequest } from "api/PageApi"; import { GenerateTemplatePageRequest } from "api/PageApi";
import { ENTITY_TYPE } from "entities/AppsmithConsole"; import { ENTITY_TYPE } from "entities/AppsmithConsole";
import { Replayable } from "entities/Replay/ReplayEntity/ReplayEditor"; import { Replayable } from "entities/Replay/ReplayEntity/ReplayEditor";
import { StoreValueActionDescription } from "entities/DataTree/actionTriggers"; import { StoreValueActionDescription } from "@appsmith/entities/DataTree/actionTriggers";
export interface FetchPageListPayload { export interface FetchPageListPayload {
applicationId: string; applicationId: string;

0
app/client/src/entities/DataTree/actionTriggers.ts → app/client/src/ce/entities/DataTree/actionTriggers.ts
View File

2
app/client/src/pages/Editor/Explorer/helpers.test.ts → app/client/src/ce/pages/Editor/Explorer/helpers.test.ts
View File

@ -1,7 +1,7 @@
import { import {
getActionIdFromURL, getActionIdFromURL,
getJSCollectionIdFromURL, getJSCollectionIdFromURL,
} from "pages/Editor/Explorer/helpers"; } from "@appsmith/pages/Editor/Explorer/helpers";
describe("getActionIdFromUrl", () => { describe("getActionIdFromUrl", () => {
it("getsApiId", () => { it("getsApiId", () => {

0
app/client/src/pages/Editor/Explorer/helpers.tsx → app/client/src/ce/pages/Editor/Explorer/helpers.tsx
View File

4
app/client/src/sagas/ActionExecution/ActionExecutionSagas.ts → app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
View File

@ -28,7 +28,7 @@ import executePluginActionTriggerSaga from "sagas/ActionExecution/PluginActionSa
import { import {
ActionDescription, ActionDescription,
ActionTriggerType, ActionTriggerType,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { clearActionResponse } from "actions/pluginActionActions"; import { clearActionResponse } from "actions/pluginActionActions";
import { import {
closeModalSaga, closeModalSaga,
@ -52,7 +52,7 @@ import {
} from "sagas/ActionExecution/GetCurrentLocationSaga"; } from "sagas/ActionExecution/GetCurrentLocationSaga";
import { requestModalConfirmationSaga } from "sagas/UtilSagas"; import { requestModalConfirmationSaga } from "sagas/UtilSagas";
import { ModalType } from "reducers/uiReducers/modalActionReducer"; import { ModalType } from "reducers/uiReducers/modalActionReducer";
import { postMessageSaga } from "./PostMessageSaga"; import { postMessageSaga } from "sagas/ActionExecution/PostMessageSaga";
export type TriggerMeta = { export type TriggerMeta = {
source?: TriggerSource; source?: TriggerSource;

2
app/client/src/ce/sagas/index.tsx
View File

@ -1,7 +1,7 @@
import pageSagas from "sagas/PageSagas"; import pageSagas from "sagas/PageSagas";
import { watchActionSagas } from "sagas/ActionSagas"; import { watchActionSagas } from "sagas/ActionSagas";
import { watchJSActionSagas } from "sagas/JSActionSagas"; 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 { watchPluginActionExecutionSagas } from "sagas/ActionExecution/PluginActionSaga";
import templateSagas from "sagas/TemplatesSagas"; import templateSagas from "sagas/TemplatesSagas";
import widgetOperationSagas from "sagas/WidgetOperationSagas"; import widgetOperationSagas from "sagas/WidgetOperationSagas";

2
app/client/src/utils/autocomplete/EntityDefinitions.test.ts → app/client/src/ce/utils/autocomplete/EntityDefinitions.test.ts
View File

@ -3,7 +3,7 @@ import { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
import { import {
entityDefinitions, entityDefinitions,
getPropsForJSActionEntity, getPropsForJSActionEntity,
} from "utils/autocomplete/EntityDefinitions"; } from "@appsmith/utils/autocomplete/EntityDefinitions";
describe("EntityDefinitions", () => { describe("EntityDefinitions", () => {
it("it tests list widget selectRow", () => { it("it tests list widget selectRow", () => {

0
app/client/src/utils/autocomplete/EntityDefinitions.ts → app/client/src/ce/utils/autocomplete/EntityDefinitions.ts
View File

2
app/client/src/workers/Evaluation/Actions.ts → app/client/src/ce/workers/Evaluation/Actions.ts
View File

@ -4,7 +4,7 @@ import _ from "lodash";
import { import {
ActionDescription, ActionDescription,
ActionTriggerType, ActionTriggerType,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { NavigationTargetType } from "sagas/ActionExecution/NavigateActionSaga"; import { NavigationTargetType } from "sagas/ActionExecution/NavigateActionSaga";
import { promisifyAction } from "workers/Evaluation/PromisifyAction"; import { promisifyAction } from "workers/Evaluation/PromisifyAction";
import { klona } from "klona/full"; import { klona } from "klona/full";

2
app/client/src/workers/Evaluation/__tests__/dataTreeUtils.test.ts → app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts
View File

@ -6,7 +6,7 @@ import {
createNewEntity, createNewEntity,
createUnEvalTreeForEval, createUnEvalTreeForEval,
makeEntityConfigsAsObjProperties, makeEntityConfigsAsObjProperties,
} from "../dataTreeUtils"; } from "@appsmith/workers/Evaluation/dataTreeUtils";
const unevalTreeFromMainThread = { const unevalTreeFromMainThread = {
Api2: { Api2: {

2
app/client/src/workers/Evaluation/dataTreeUtils.ts → app/client/src/ce/workers/Evaluation/dataTreeUtils.ts
View File

@ -6,7 +6,7 @@ import {
} from "entities/DataTree/dataTreeFactory"; } from "entities/DataTree/dataTreeFactory";
import { set } from "lodash"; import { set } from "lodash";
import { EvalProps } from "workers/common/DataTreeEvaluator"; 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 * This method accept an entity object as input and if it has __config__ property than it moves the __config__ to object's prototype

11
app/client/src/workers/Evaluation/__tests__/evaluationUtils.test.ts → app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts
View File

@ -22,13 +22,16 @@ import {
isPrivateEntityPath, isPrivateEntityPath,
makeParentsDependOnChildren, makeParentsDependOnChildren,
translateDiffEventToDataTreeDiffEvent, translateDiffEventToDataTreeDiffEvent,
} from "../evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import { warn as logWarn } from "loglevel"; import { warn as logWarn } from "loglevel";
import { Diff } from "deep-diff"; import { Diff } from "deep-diff";
import _, { flatten } from "lodash"; import _, { flatten } from "lodash";
import { overrideWidgetProperties, findDatatype } from "../evaluationUtils"; import {
overrideWidgetProperties,
findDatatype,
} from "@appsmith/workers/Evaluation/evaluationUtils";
import { DataTree } from "entities/DataTree/dataTreeFactory"; 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 { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
import TableWidget, { CONFIG as TableWidgetConfig } from "widgets/TableWidget"; import TableWidget, { CONFIG as TableWidgetConfig } from "widgets/TableWidget";
import InputWidget, { import InputWidget, {
@ -36,7 +39,7 @@ import InputWidget, {
} from "widgets/InputWidgetV2"; } from "widgets/InputWidgetV2";
import { registerWidget } from "utils/WidgetRegisterHelpers"; import { registerWidget } from "utils/WidgetRegisterHelpers";
import { WidgetConfiguration } from "widgets/constants"; import { WidgetConfiguration } from "widgets/constants";
import { createNewEntity } from "../dataTreeUtils"; import { createNewEntity } from "@appsmith/workers/Evaluation/dataTreeUtils";
import DataTreeEvaluator from "workers/common/DataTreeEvaluator"; import DataTreeEvaluator from "workers/common/DataTreeEvaluator";
import { Severity } from "entities/AppsmithConsole"; import { Severity } from "entities/AppsmithConsole";

2
app/client/src/workers/Evaluation/evaluationUtils.ts → app/client/src/ce/workers/Evaluation/evaluationUtils.ts
View File

@ -23,7 +23,7 @@ import { WidgetTypeConfigMap } from "utils/WidgetFactory";
import { PluginType } from "entities/Action"; import { PluginType } from "entities/Action";
import { klona } from "klona/full"; import { klona } from "klona/full";
import { warn as logWarn } from "loglevel"; 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 { isObject } from "lodash";
import { DataTreeObjectEntity } from "entities/DataTree/dataTreeFactory"; import { DataTreeObjectEntity } from "entities/DataTree/dataTreeFactory";
import { validateWidgetProperty } from "workers/common/DataTreeEvaluator/validationUtils"; import { validateWidgetProperty } from "workers/common/DataTreeEvaluator/validationUtils";

0
app/client/src/workers/common/DataTreeEvaluator/types.ts → app/client/src/ce/workers/common/DataTreeEvaluator/types.ts
View File

0
app/client/src/workers/common/types.ts → app/client/src/ce/workers/common/types.ts
View File

2
app/client/src/components/editorComponents/ActionCreator/index.tsx
View File

@ -30,7 +30,7 @@ import {
} from "selectors/widgetSelectors"; } from "selectors/widgetSelectors";
import Fields from "./Fields"; import Fields from "./Fields";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; 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 { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
import { createNewJSCollection } from "actions/jsPaneActions"; import { createNewJSCollection } from "actions/jsPaneActions";
import { JSAction, Variable } from "entities/JSCollection"; import { JSAction, Variable } from "entities/JSCollection";

2
app/client/src/components/editorComponents/CodeEditor/index.tsx
View File

@ -79,7 +79,7 @@ import {
removeNewLineChars, removeNewLineChars,
} from "./codeEditorUtils"; } from "./codeEditorUtils";
import { commandsHelper } from "./commandsHelper"; import { commandsHelper } from "./commandsHelper";
import { getEntityNameAndPropertyPath } from "workers/Evaluation/evaluationUtils"; import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils";
import { getPluginIdToImageLocation } from "sagas/selectors"; import { getPluginIdToImageLocation } from "sagas/selectors";
import { ExpectedValueExample } from "utils/validation/common"; import { ExpectedValueExample } from "utils/validation/common";
import { getRecentEntityIds } from "selectors/globalSearchSelectors"; import { getRecentEntityIds } from "selectors/globalSearchSelectors";

2
app/client/src/components/editorComponents/Debugger/helpers.tsx
View File

@ -13,7 +13,7 @@ import {
matchApiPath, matchApiPath,
matchQueryPath, matchQueryPath,
} from "constants/routes"; } from "constants/routes";
import { getEntityNameAndPropertyPath } from "workers/Evaluation/evaluationUtils"; import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils";
import { modText } from "utils/helpers"; import { modText } from "utils/helpers";
import { union } from "lodash"; import { union } from "lodash";

2
app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts
View File

@ -18,7 +18,7 @@ import {
isAction, isAction,
isJSAction, isJSAction,
isWidget, isWidget,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import history, { NavigationMethod } from "utils/history"; import history, { NavigationMethod } from "utils/history";
import { jsCollectionIdURL } from "RouteBuilder"; import { jsCollectionIdURL } from "RouteBuilder";
import store from "store"; import store from "store";

2
app/client/src/components/editorComponents/Debugger/hooks/useGetEntityInfo.tsx
View File

@ -12,7 +12,7 @@ import {
isAction, isAction,
isJSAction, isJSAction,
isWidget, isWidget,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import { doesEntityHaveErrors } from "../helpers"; import { doesEntityHaveErrors } from "../helpers";
import React from "react"; import React from "react";
import WidgetIcon from "pages/Editor/Explorer/Widgets/WidgetIcon"; import WidgetIcon from "pages/Editor/Explorer/Widgets/WidgetIcon";

2
app/client/src/components/editorComponents/GlobalSearch/index.tsx
View File

@ -51,7 +51,7 @@ import {
} from "./utils"; } from "./utils";
import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers"; import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
import { HelpBaseURL } from "constants/HelpConstants"; 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 { getLastSelectedWidget } from "selectors/ui";
import AnalyticsUtil from "utils/AnalyticsUtil"; import AnalyticsUtil from "utils/AnalyticsUtil";
import useRecentEntities from "./useRecentEntities"; import useRecentEntities from "./useRecentEntities";

1
app/client/src/ee/entities/DataTree/actionTriggers.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/entities/DataTree/actionTriggers";

1
app/client/src/ee/pages/Editor/Explorer/helpers.tsx Normal file
View File

@ -0,0 +1 @@
export * from "ce/pages/Editor/Explorer/helpers";

1
app/client/src/ee/sagas/ActionExecution/ActionExecutionSagas.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/sagas/ActionExecution/ActionExecutionSagas";

1
app/client/src/ee/utils/autocomplete/EntityDefinitions.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/utils/autocomplete/EntityDefinitions";

1
app/client/src/ee/workers/Evaluation/Actions.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/workers/Evaluation/Actions";

1
app/client/src/ee/workers/Evaluation/dataTreeUtils.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/workers/Evaluation/dataTreeUtils";

1
app/client/src/ee/workers/Evaluation/evaluationUtils.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/workers/Evaluation/evaluationUtils";

1
app/client/src/ee/workers/common/DataTreeEvaluator/types.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/workers/common/DataTreeEvaluator/types";

1
app/client/src/ee/workers/common/types.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/workers/common/types";

2
app/client/src/entities/DataTree/types.ts
View File

@ -6,7 +6,7 @@ import {
ActionDescription, ActionDescription,
ClearPluginActionDescription, ClearPluginActionDescription,
RunPluginActionDescription, RunPluginActionDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { Variable } from "entities/JSCollection"; import { Variable } from "entities/JSCollection";
import { DependencyMap, DynamicPath } from "utils/DynamicBindingUtils"; import { DependencyMap, DynamicPath } from "utils/DynamicBindingUtils";

2
app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
View File

@ -26,7 +26,7 @@ import { AppState } from "@appsmith/reducers";
import ActionNameEditor from "components/editorComponents/ActionNameEditor"; import ActionNameEditor from "components/editorComponents/ActionNameEditor";
import ActionSettings from "pages/Editor/ActionSettings"; import ActionSettings from "pages/Editor/ActionSettings";
import RequestDropdownField from "components/editorComponents/form/fields/RequestDropdownField"; 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 MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu";
import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
import { import {

2
app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
View File

@ -11,7 +11,7 @@ import { useDispatch, useSelector } from "react-redux";
import { getPageListAsOptions } from "selectors/entitiesSelector"; import { getPageListAsOptions } from "selectors/entitiesSelector";
import history from "utils/history"; import history from "utils/history";
import ContextMenuTrigger from "../ContextMenuTrigger"; import ContextMenuTrigger from "../ContextMenuTrigger";
import { ContextMenuPopoverModifiers } from "../helpers"; import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers";
import { useNewActionName } from "./helpers"; import { useNewActionName } from "./helpers";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";

2
app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx
View File

@ -9,7 +9,7 @@ import {
deleteAction, deleteAction,
} from "actions/pluginActionActions"; } from "actions/pluginActionActions";
import { ContextMenuPopoverModifiers } from "../helpers"; import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers";
import { noop } from "lodash"; import { noop } from "lodash";
import TreeDropdown from "pages/Editor/Explorer/TreeDropdown"; import TreeDropdown from "pages/Editor/Explorer/TreeDropdown";
import { useNewActionName } from "./helpers"; import { useNewActionName } from "./helpers";

2
app/client/src/pages/Editor/Explorer/Datasources.tsx
View File

@ -29,7 +29,7 @@ import {
useDatasourceIdFromURL, useDatasourceIdFromURL,
getExplorerStatus, getExplorerStatus,
saveExplorerStatus, saveExplorerStatus,
} from "./helpers"; } from "@appsmith/pages/Editor/Explorer/helpers";
import { Icon } from "design-system"; import { Icon } from "design-system";
import { AddEntity, EmptyComponent } from "./common"; import { AddEntity, EmptyComponent } from "./common";
import { integrationEditorURL } from "RouteBuilder"; import { integrationEditorURL } from "RouteBuilder";

2
app/client/src/pages/Editor/Explorer/Datasources/DataSourceContextMenu.tsx
View File

@ -7,7 +7,7 @@ import {
import TreeDropdown from "pages/Editor/Explorer/TreeDropdown"; import TreeDropdown from "pages/Editor/Explorer/TreeDropdown";
import ContextMenuTrigger from "../ContextMenuTrigger"; import ContextMenuTrigger from "../ContextMenuTrigger";
import { noop } from "lodash"; import { noop } from "lodash";
import { ContextMenuPopoverModifiers } from "../helpers"; import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers";
import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { initExplorerEntityNameEdit } from "actions/explorerActions";
import { import {
CONTEXT_EDIT_NAME, CONTEXT_EDIT_NAME,

2
app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
View File

@ -3,7 +3,7 @@ import { Datasource } from "entities/Datasource";
import { Plugin } from "api/PluginApi"; import { Plugin } from "api/PluginApi";
import DataSourceContextMenu from "./DataSourceContextMenu"; import DataSourceContextMenu from "./DataSourceContextMenu";
import { getPluginIcon } from "../ExplorerIcons"; import { getPluginIcon } from "../ExplorerIcons";
import { getQueryIdFromURL } from "../helpers"; import { getQueryIdFromURL } from "@appsmith/pages/Editor/Explorer/helpers";
import Entity, { EntityClassNames } from "../Entity"; import Entity, { EntityClassNames } from "../Entity";
import history, { NavigationMethod } from "utils/history"; import history, { NavigationMethod } from "utils/history";
import { import {

2
app/client/src/pages/Editor/Explorer/Entity/CurrentPageEntityProperties.tsx
View File

@ -4,7 +4,7 @@ import { isFunction } from "lodash";
import { import {
entityDefinitions, entityDefinitions,
EntityDefinitionsOptions, EntityDefinitionsOptions,
} from "utils/autocomplete/EntityDefinitions"; } from "@appsmith/utils/autocomplete/EntityDefinitions";
import { import {
ENTITY_TYPE, ENTITY_TYPE,
DataTreeAction, DataTreeAction,

4
app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
View File

@ -4,7 +4,8 @@ import { isFunction } from "lodash";
import { import {
entityDefinitions, entityDefinitions,
EntityDefinitionsOptions, EntityDefinitionsOptions,
} from "utils/autocomplete/EntityDefinitions"; getPropsForJSActionEntity,
} from "@appsmith/utils/autocomplete/EntityDefinitions";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import PerformanceTracker, { import PerformanceTracker, {
@ -12,7 +13,6 @@ import PerformanceTracker, {
} from "utils/PerformanceTracker"; } from "utils/PerformanceTracker";
import * as Sentry from "@sentry/react"; import * as Sentry from "@sentry/react";
import { AppState } from "@appsmith/reducers"; import { AppState } from "@appsmith/reducers";
import { getPropsForJSActionEntity } from "utils/autocomplete/EntityDefinitions";
import { isEmpty } from "lodash"; import { isEmpty } from "lodash";
import { getCurrentPageId } from "selectors/editorSelectors"; import { getCurrentPageId } from "selectors/editorSelectors";
import classNames from "classnames"; import classNames from "classnames";

7
app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
View File

@ -14,7 +14,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { mockDatasources } from "./mockTestData"; import { mockDatasources } from "./mockTestData";
import { updateCurrentPage } from "actions/pageActions"; import { updateCurrentPage } from "actions/pageActions";
import urlBuilder from "entities/URLRedirect/URLAssembly"; 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 * as permissionUtils from "@appsmith/utils/permissionHelpers";
import userEvent from "@testing-library/user-event"; 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", () => { describe("Entity Explorer tests", () => {
beforeAll(() => { beforeAll(() => {
runSagaMiddleware(); runSagaMiddleware();

5
app/client/src/pages/Editor/Explorer/Files/index.tsx
View File

@ -17,7 +17,10 @@ import { ExplorerActionEntity } from "../Actions/ActionEntity";
import ExplorerJSCollectionEntity from "../JSActions/JSActionEntity"; import ExplorerJSCollectionEntity from "../JSActions/JSActionEntity";
import { Colors } from "constants/Colors"; import { Colors } from "constants/Colors";
import { selectFilesForExplorer } from "selectors/entitiesSelector"; 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 { Icon } from "design-system";
import { AddEntity, EmptyComponent } from "../common"; import { AddEntity, EmptyComponent } from "../common";
import ExplorerSubMenu from "./Submenu"; import ExplorerSubMenu from "./Submenu";

2
app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx
View File

@ -7,7 +7,7 @@ import {
copyJSCollectionRequest, copyJSCollectionRequest,
deleteJSCollection, deleteJSCollection,
} from "actions/jsActionActions"; } from "actions/jsActionActions";
import { ContextMenuPopoverModifiers } from "../helpers"; import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers";
import noop from "lodash/noop"; import noop from "lodash/noop";
import { getJSEntityName } from "./helpers"; import { getJSEntityName } from "./helpers";
import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { initExplorerEntityNameEdit } from "actions/explorerActions";

2
app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx
View File

@ -5,7 +5,7 @@ import {
copyJSCollectionRequest, copyJSCollectionRequest,
deleteJSCollection, deleteJSCollection,
} from "actions/jsActionActions"; } from "actions/jsActionActions";
import { ContextMenuPopoverModifiers } from "../helpers"; import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers";
import noop from "lodash/noop"; import noop from "lodash/noop";
import TreeDropdown from "pages/Editor/Explorer/TreeDropdown"; import TreeDropdown from "pages/Editor/Explorer/TreeDropdown";
import { getJSEntityName } from "./helpers"; import { getJSEntityName } from "./helpers";

2
app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
View File

@ -19,7 +19,7 @@ import history from "utils/history";
import { generateTemplateFormURL } from "RouteBuilder"; import { generateTemplateFormURL } from "RouteBuilder";
import { useParams } from "react-router"; import { useParams } from "react-router";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { ExplorerURLParams } from "../helpers"; import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
import { showTemplatesModal } from "actions/templateActions"; import { showTemplatesModal } from "actions/templateActions";
import { Colors } from "constants/Colors"; import { Colors } from "constants/Colors";
import { import {

2
app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
View File

@ -6,7 +6,7 @@ import TreeDropdown, {
import { noop } from "lodash"; import { noop } from "lodash";
import ContextMenuTrigger from "../ContextMenuTrigger"; import ContextMenuTrigger from "../ContextMenuTrigger";
import AnalyticsUtil from "utils/AnalyticsUtil"; import AnalyticsUtil from "utils/AnalyticsUtil";
import { ContextMenuPopoverModifiers } from "../helpers"; import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers";
import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { initExplorerEntityNameEdit } from "actions/explorerActions";
import { import {
clonePageInit, clonePageInit,

5
app/client/src/pages/Editor/Explorer/Pages/index.tsx
View File

@ -31,7 +31,10 @@ import { getExplorerPinned } from "selectors/explorerSelector";
import { setExplorerPinnedAction } from "actions/explorerActions"; import { setExplorerPinnedAction } from "actions/explorerActions";
import { selectAllPages } from "selectors/entitiesSelector"; import { selectAllPages } from "selectors/entitiesSelector";
import { builderURL } from "RouteBuilder"; import { builderURL } from "RouteBuilder";
import { getExplorerStatus, saveExplorerStatus } from "../helpers"; import {
getExplorerStatus,
saveExplorerStatus,
} from "@appsmith/pages/Editor/Explorer/helpers";
import { tailwindLayers } from "constants/Layers"; import { tailwindLayers } from "constants/Layers";
import useResize, { import useResize, {
CallbackResponseType, CallbackResponseType,

2
app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx
View File

@ -4,7 +4,7 @@ import TreeDropdown, {
TreeDropdownOption, TreeDropdownOption,
} from "pages/Editor/Explorer/TreeDropdown"; } from "pages/Editor/Explorer/TreeDropdown";
import ContextMenuTrigger from "../ContextMenuTrigger"; import ContextMenuTrigger from "../ContextMenuTrigger";
import { ContextMenuPopoverModifiers } from "../helpers"; import { ContextMenuPopoverModifiers } from "@appsmith/pages/Editor/Explorer/helpers";
import { noop } from "lodash"; import { noop } from "lodash";
import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { initExplorerEntityNameEdit } from "actions/explorerActions";
import { AppState } from "@appsmith/reducers"; import { AppState } from "@appsmith/reducers";

5
app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
View File

@ -16,7 +16,10 @@ import {
} from "@appsmith/constants/messages"; } from "@appsmith/constants/messages";
import { selectWidgetsForCurrentPage } from "selectors/entitiesSelector"; import { selectWidgetsForCurrentPage } from "selectors/entitiesSelector";
import { inGuidedTour } from "selectors/onboardingSelectors"; 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 { Icon } from "design-system";
import { AddEntity, EmptyComponent } from "../common"; import { AddEntity, EmptyComponent } from "../common";
import { noop } from "lodash"; import { noop } from "lodash";

2
app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts
View File

@ -1,7 +1,7 @@
import { useCallback } from "react"; import { useCallback } from "react";
import { WidgetType } from "constants/WidgetConstants"; import { WidgetType } from "constants/WidgetConstants";
import { useParams } from "react-router"; import { useParams } from "react-router";
import { ExplorerURLParams } from "../helpers"; import { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
import { flashElementsById, quickScrollToWidget } from "utils/helpers"; import { flashElementsById, quickScrollToWidget } from "utils/helpers";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useWidgetSelection } from "utils/hooks/useWidgetSelection"; import { useWidgetSelection } from "utils/hooks/useWidgetSelection";

2
app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
View File

@ -15,7 +15,7 @@ import { Datasource } from "entities/Datasource";
import { fetchDatasourceStructure } from "actions/datasourceActions"; import { fetchDatasourceStructure } from "actions/datasourceActions";
import { generateTemplateToUpdatePage } from "actions/pageActions"; import { generateTemplateToUpdatePage } from "actions/pageActions";
import { useParams, useLocation } from "react-router"; 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 { INTEGRATION_TABS } from "constants/routes";
import history from "utils/history"; import history from "utils/history";
import { getQueryParams } from "utils/URLUtils"; import { getQueryParams } from "utils/URLUtils";

2
app/client/src/pages/Editor/JSEditor/Form.tsx
View File

@ -25,7 +25,7 @@ import {
} from "actions/jsPaneActions"; } from "actions/jsPaneActions";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useParams } from "react-router"; 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 JSResponseView from "components/editorComponents/JSResponseView";
import { isEmpty } from "lodash"; import { isEmpty } from "lodash";
import equal from "fast-deep-equal/es6"; import equal from "fast-deep-equal/es6";

5
app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
View File

@ -3,7 +3,10 @@ import styled from "styled-components";
import { AppState } from "@appsmith/reducers"; import { AppState } from "@appsmith/reducers";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { getDataTree } from "selectors/dataTreeSelectors"; import { getDataTree } from "selectors/dataTreeSelectors";
import { isAction, isWidget } from "workers/Evaluation/evaluationUtils"; import {
isAction,
isWidget,
} from "@appsmith/workers/Evaluation/evaluationUtils";
import { import {
Classes, Classes,
Dropdown, Dropdown,

2
app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
View File

@ -78,7 +78,7 @@ import {
} from "@appsmith/constants/messages"; } from "@appsmith/constants/messages";
import { useParams } from "react-router"; import { useParams } from "react-router";
import { AppState } from "@appsmith/reducers"; 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 MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu";
import { thinScrollbar } from "constants/DefaultTheme"; import { thinScrollbar } from "constants/DefaultTheme";
import ActionRightPane, { import ActionRightPane, {

2
app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasSection.tsx
View File

@ -14,7 +14,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
import history from "utils/history"; import history from "utils/history";
import { generateTemplateFormURL } from "RouteBuilder"; import { generateTemplateFormURL } from "RouteBuilder";
import { useParams } from "react-router"; 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 { showTemplatesModal as showTemplatesModalAction } from "actions/templateActions";
import { import {
createMessage, createMessage,

2
app/client/src/pages/common/datasourceAuth/index.tsx
View File

@ -19,7 +19,7 @@ import {
import AnalyticsUtil from "utils/AnalyticsUtil"; import AnalyticsUtil from "utils/AnalyticsUtil";
import { getCurrentApplicationId } from "selectors/editorSelectors"; import { getCurrentApplicationId } from "selectors/editorSelectors";
import { useParams, useLocation } from "react-router"; 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 { AppState } from "@appsmith/reducers";
import { import {
AuthType, AuthType,

2
app/client/src/reducers/entityReducers/metaReducer/index.ts
View File

@ -11,7 +11,7 @@ import {
WidgetReduxActionTypes, WidgetReduxActionTypes,
} from "@appsmith/constants/ReduxActionConstants"; } from "@appsmith/constants/ReduxActionConstants";
import produce from "immer"; import produce from "immer";
import { EvalMetaUpdates } from "workers/common/DataTreeEvaluator/types"; import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
import { getMetaWidgetResetObj } from "./metaReducerUtils"; import { getMetaWidgetResetObj } from "./metaReducerUtils";
export type WidgetMetaState = Record<string, unknown>; export type WidgetMetaState = Record<string, unknown>;

2
app/client/src/sagas/ActionExecution/CopyActionSaga.ts
View File

@ -3,7 +3,7 @@ import AppsmithConsole from "utils/AppsmithConsole";
import { import {
ActionTriggerType, ActionTriggerType,
CopyToClipboardDescription, CopyToClipboardDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { ActionValidationError } from "sagas/ActionExecution/errorUtils"; import { ActionValidationError } from "sagas/ActionExecution/errorUtils";
import { getType, Types } from "utils/TypeHelpers"; import { getType, Types } from "utils/TypeHelpers";

2
app/client/src/sagas/ActionExecution/DownloadActionSaga.ts
View File

@ -5,7 +5,7 @@ import Axios from "axios";
import { import {
ActionTriggerType, ActionTriggerType,
DownloadActionDescription, DownloadActionDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { ActionValidationError } from "sagas/ActionExecution/errorUtils"; import { ActionValidationError } from "sagas/ActionExecution/errorUtils";
import { isBase64String, isUrlString } from "./downloadActionUtils"; import { isBase64String, isUrlString } from "./downloadActionUtils";
import { isBlobUrl } from "utils/AppsmithUtils"; import { isBlobUrl } from "utils/AppsmithUtils";

2
app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.test.ts
View File

@ -1,6 +1,6 @@
import { call } from "redux-saga/effects"; import { call } from "redux-saga/effects";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { executeAppAction } from "./ActionExecutionSagas"; import { executeAppAction } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { import {
extractGeoLocation, extractGeoLocation,
getCurrentLocationSaga, getCurrentLocationSaga,

4
app/client/src/sagas/ActionExecution/GetCurrentLocationSaga.ts
View File

@ -1,12 +1,12 @@
import { import {
GetCurrentLocationDescription, GetCurrentLocationDescription,
WatchCurrentLocationDescription, WatchCurrentLocationDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { import {
executeAppAction, executeAppAction,
TriggerMeta, TriggerMeta,
} from "sagas/ActionExecution/ActionExecutionSagas"; } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { call, put, spawn, take } from "redux-saga/effects"; import { call, put, spawn, take } from "redux-saga/effects";
import { import {
logActionExecutionError, logActionExecutionError,

2
app/client/src/sagas/ActionExecution/ModalSagas.ts
View File

@ -2,7 +2,7 @@ import {
ActionTriggerType, ActionTriggerType,
CloseModalActionDescription, CloseModalActionDescription,
ShowModalActionDescription, ShowModalActionDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { put } from "redux-saga/effects"; import { put } from "redux-saga/effects";
import AppsmithConsole from "utils/AppsmithConsole"; import AppsmithConsole from "utils/AppsmithConsole";
import { ActionValidationError } from "sagas/ActionExecution/errorUtils"; import { ActionValidationError } from "sagas/ActionExecution/errorUtils";

2
app/client/src/sagas/ActionExecution/NavigateActionSaga.ts
View File

@ -9,7 +9,7 @@ import { getQueryStringfromObject } from "RouteBuilder";
import history from "utils/history"; import history from "utils/history";
import { setDataUrl } from "sagas/PageSagas"; import { setDataUrl } from "sagas/PageSagas";
import AppsmithConsole from "utils/AppsmithConsole"; import AppsmithConsole from "utils/AppsmithConsole";
import { NavigateActionDescription } from "entities/DataTree/actionTriggers"; import { NavigateActionDescription } from "@appsmith/entities/DataTree/actionTriggers";
import { builderURL, viewerURL } from "RouteBuilder"; import { builderURL, viewerURL } from "RouteBuilder";
import { TriggerFailureError } from "./errorUtils"; import { TriggerFailureError } from "./errorUtils";
import { isValidURL } from "utils/URLUtils"; import { isValidURL } from "utils/URLUtils";

11
app/client/src/sagas/ActionExecution/PluginActionSaga.ts
View File

@ -83,7 +83,7 @@ import { SAAS_EDITOR_API_ID_PATH } from "pages/Editor/SaaSEditor/constants";
import { import {
ActionTriggerType, ActionTriggerType,
RunPluginActionDescription, RunPluginActionDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { APP_MODE } from "entities/App"; import { APP_MODE } from "entities/App";
import { FileDataTypes } from "widgets/constants"; import { FileDataTypes } from "widgets/constants";
import { hideDebuggerErrors } from "actions/debuggerActions"; import { hideDebuggerErrors } from "actions/debuggerActions";
@ -99,15 +99,18 @@ import { JSCollection } from "entities/JSCollection";
import { import {
executeAppAction, executeAppAction,
TriggerMeta, TriggerMeta,
} from "sagas/ActionExecution/ActionExecutionSagas"; } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { requestModalConfirmationSaga } from "sagas/UtilSagas"; import { requestModalConfirmationSaga } from "sagas/UtilSagas";
import { ModalType } from "reducers/uiReducers/modalActionReducer"; import { ModalType } from "reducers/uiReducers/modalActionReducer";
import { getFormNames, getFormValues } from "redux-form"; import { getFormNames, getFormValues } from "redux-form";
import { CURL_IMPORT_FORM } from "@appsmith/constants/forms"; import { CURL_IMPORT_FORM } from "@appsmith/constants/forms";
import { submitCurlImportForm } from "actions/importActions"; import { submitCurlImportForm } from "actions/importActions";
import { curlImportFormValues } from "pages/Editor/APIEditor/helpers"; import { curlImportFormValues } from "pages/Editor/APIEditor/helpers";
import { matchBasePath } from "pages/Editor/Explorer/helpers"; import { matchBasePath } from "@appsmith/pages/Editor/Explorer/helpers";
import { isTrueObject, findDatatype } from "workers/Evaluation/evaluationUtils"; import {
isTrueObject,
findDatatype,
} from "@appsmith/workers/Evaluation/evaluationUtils";
import { handleExecuteJSFunctionSaga } from "sagas/JSPaneSagas"; import { handleExecuteJSFunctionSaga } from "sagas/JSPaneSagas";
import { Plugin } from "api/PluginApi"; import { Plugin } from "api/PluginApi";
import { setDefaultActionDisplayFormat } from "./PluginActionSagaUtils"; import { setDefaultActionDisplayFormat } from "./PluginActionSagaUtils";

4
app/client/src/sagas/ActionExecution/PostMessageSaga.ts
View File

@ -1,10 +1,10 @@
import { spawn } from "redux-saga/effects"; import { spawn } from "redux-saga/effects";
import { PostMessageDescription } from "../../entities/DataTree/actionTriggers"; import { PostMessageDescription } from "@appsmith/entities/DataTree/actionTriggers";
import { import {
logActionExecutionError, logActionExecutionError,
TriggerFailureError, TriggerFailureError,
} from "sagas/ActionExecution/errorUtils"; } from "sagas/ActionExecution/errorUtils";
import { TriggerMeta } from "./ActionExecutionSagas"; import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { isEmpty } from "lodash"; import { isEmpty } from "lodash";
export function* postMessageSaga( export function* postMessageSaga(

4
app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts
View File

@ -8,7 +8,7 @@ import AppsmithConsole from "utils/AppsmithConsole";
import { import {
ActionTriggerType, ActionTriggerType,
ResetWidgetDescription, ResetWidgetDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { import {
ActionValidationError, ActionValidationError,
TriggerFailureError, TriggerFailureError,
@ -18,7 +18,7 @@ import { FlattenedWidgetProps } from "widgets/constants";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { getDataTree } from "selectors/dataTreeSelectors"; import { getDataTree } from "selectors/dataTreeSelectors";
import { DataTree } from "entities/DataTree/dataTreeFactory"; import { DataTree } from "entities/DataTree/dataTreeFactory";
import { isWidget } from "workers/Evaluation/evaluationUtils"; import { isWidget } from "@appsmith/workers/Evaluation/evaluationUtils";
export default function* resetWidgetActionSaga( export default function* resetWidgetActionSaga(
payload: ResetWidgetDescription["payload"], payload: ResetWidgetDescription["payload"],

4
app/client/src/sagas/ActionExecution/SetIntervalSaga.ts
View File

@ -1,11 +1,11 @@
import { import {
ClearIntervalDescription, ClearIntervalDescription,
SetIntervalDescription, SetIntervalDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { import {
executeAppAction, executeAppAction,
TriggerMeta, TriggerMeta,
} from "sagas/ActionExecution/ActionExecutionSagas"; } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { call, delay, spawn } from "redux-saga/effects"; import { call, delay, spawn } from "redux-saga/effects";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { import {

2
app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts
View File

@ -3,7 +3,7 @@ import AppsmithConsole from "utils/AppsmithConsole";
import { import {
ActionTriggerType, ActionTriggerType,
ShowAlertActionDescription, ShowAlertActionDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { import {
ActionValidationError, ActionValidationError,
TriggerFailureError, TriggerFailureError,

2
app/client/src/sagas/ActionExecution/StoreActionSaga.ts
View File

@ -10,7 +10,7 @@ import { getAppStoreData } from "selectors/entitiesSelector";
import { import {
RemoveValueActionDescription, RemoveValueActionDescription,
StoreValueActionDescription, StoreValueActionDescription,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
import { getCurrentApplicationId } from "selectors/editorSelectors"; import { getCurrentApplicationId } from "selectors/editorSelectors";
import { AppStoreState } from "reducers/entityReducers/appReducer"; import { AppStoreState } from "reducers/entityReducers/appReducer";

2
app/client/src/sagas/ActionExecution/errorUtils.ts
View File

@ -15,7 +15,7 @@ import { Types } from "utils/TypeHelpers";
import { import {
ActionTriggerFunctionNames, ActionTriggerFunctionNames,
ActionTriggerType, ActionTriggerType,
} from "entities/DataTree/actionTriggers"; } from "@appsmith/entities/DataTree/actionTriggers";
import DebugButton from "components/editorComponents/Debugger/DebugCTA"; import DebugButton from "components/editorComponents/Debugger/DebugCTA";
/* /*

4
app/client/src/sagas/DebuggerSagas.ts
View File

@ -57,12 +57,12 @@ import { getCurrentPageId } from "selectors/editorSelectors";
import { WidgetProps } from "widgets/BaseWidget"; import { WidgetProps } from "widgets/BaseWidget";
import * as log from "loglevel"; import * as log from "loglevel";
import { DependencyMap } from "utils/DynamicBindingUtils"; import { DependencyMap } from "utils/DynamicBindingUtils";
import { TriggerMeta } from "./ActionExecution/ActionExecutionSagas"; import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { import {
getEntityNameAndPropertyPath, getEntityNameAndPropertyPath,
isAction, isAction,
isWidget, isWidget,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
// Saga to format action request values to be shown in the debugger // Saga to format action request values to be shown in the debugger
function* formatActionRequestSaga( function* formatActionRequestSaga(

4
app/client/src/sagas/EvaluationsSaga.ts
View File

@ -67,7 +67,7 @@ import {
import { import {
executeActionTriggers, executeActionTriggers,
TriggerMeta, TriggerMeta,
} from "./ActionExecution/ActionExecutionSagas"; } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { Toaster, Variant } from "design-system"; import { Toaster, Variant } from "design-system";
import { import {
@ -91,7 +91,7 @@ import {
UncaughtPromiseError, UncaughtPromiseError,
} from "sagas/ActionExecution/errorUtils"; } from "sagas/ActionExecution/errorUtils";
import { Channel } from "redux-saga"; 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 { FormEvaluationState } from "reducers/evaluationReducers/formEvaluationReducer";
import { FormEvalActionPayload } from "./FormEvaluationSaga"; import { FormEvalActionPayload } from "./FormEvaluationSaga";
import { getSelectedAppTheme } from "selectors/appThemingSelectors"; import { getSelectedAppTheme } from "selectors/appThemingSelectors";

2
app/client/src/sagas/JSPaneSagas.ts
View File

@ -29,7 +29,7 @@ import { JSCollection, JSAction } from "entities/JSCollection";
import { createJSCollectionRequest } from "actions/jsActionActions"; import { createJSCollectionRequest } from "actions/jsActionActions";
import history from "utils/history"; import history from "utils/history";
import { executeFunction } from "./EvaluationsSaga"; import { executeFunction } from "./EvaluationsSaga";
import { getJSCollectionIdFromURL } from "pages/Editor/Explorer/helpers"; import { getJSCollectionIdFromURL } from "@appsmith/pages/Editor/Explorer/helpers";
import { import {
getDifferenceInJSCollection, getDifferenceInJSCollection,
JSUpdate, JSUpdate,

2
app/client/src/sagas/PostEvaluationSagas.ts
View File

@ -13,7 +13,7 @@ import {
isAction, isAction,
isJSAction, isJSAction,
isWidget, isWidget,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import { import {
EvalError, EvalError,
EvalErrorTypes, EvalErrorTypes,

2
app/client/src/sagas/PostLintingSagas.ts
View File

@ -11,7 +11,7 @@ import AppsmithConsole from "utils/AppsmithConsole";
import { import {
getEntityNameAndPropertyPath, getEntityNameAndPropertyPath,
isJSAction, isJSAction,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
// We currently only log lint errors in JSObjects // We currently only log lint errors in JSObjects
export function* logLatestLintPropertyErrors({ export function* logLatestLintPropertyErrors({

2
app/client/src/sagas/RecentEntitiesSagas.ts
View File

@ -1,5 +1,5 @@
import { matchPath } from "react-router"; import { matchPath } from "react-router";
import { matchBasePath } from "pages/Editor/Explorer/helpers"; import { matchBasePath } from "@appsmith/pages/Editor/Explorer/helpers";
import { import {
API_EDITOR_ID_PATH, API_EDITOR_ID_PATH,
QUERIES_EDITOR_ID_PATH, QUERIES_EDITOR_ID_PATH,

2
app/client/src/sagas/WidgetOperationSagas.tsx
View File

@ -70,7 +70,7 @@ import {
getAllPathsFromPropertyConfig, getAllPathsFromPropertyConfig,
nextAvailableRowInContainer, nextAvailableRowInContainer,
} from "entities/Widget/utils"; } from "entities/Widget/utils";
import { getAllPaths } from "workers/Evaluation/evaluationUtils"; import { getAllPaths } from "@appsmith/workers/Evaluation/evaluationUtils";
import { import {
createMessage, createMessage,
ERROR_WIDGET_COPY_NO_WIDGET_SELECTED, ERROR_WIDGET_COPY_NO_WIDGET_SELECTED,

2
app/client/src/sagas/WidgetOperationUtils.ts
View File

@ -52,7 +52,7 @@ import { getContainerWidgetSpacesSelector } from "selectors/editorSelectors";
import { reflow } from "reflow"; import { reflow } from "reflow";
import { getBottomRowAfterReflow } from "utils/reflowHookUtils"; import { getBottomRowAfterReflow } from "utils/reflowHookUtils";
import { DataTreeWidget } from "entities/DataTree/dataTreeFactory"; 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 { CANVAS_DEFAULT_MIN_HEIGHT_PX } from "constants/AppConstants";
import { MetaState } from "reducers/entityReducers/metaReducer"; import { MetaState } from "reducers/entityReducers/metaReducer";

2
app/client/src/selectors/debuggerSelectors.tsx
View File

@ -6,7 +6,7 @@ import { AppState } from "@appsmith/reducers";
import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
import { createSelector } from "reselect"; import { createSelector } from "reselect";
import { getWidgets } from "sagas/selectors"; import { getWidgets } from "sagas/selectors";
import { isWidget } from "workers/Evaluation/evaluationUtils"; import { isWidget } from "@appsmith/workers/Evaluation/evaluationUtils";
import { getDataTree } from "./dataTreeSelectors"; import { getDataTree } from "./dataTreeSelectors";
type ErrorObejct = { type ErrorObejct = {

2
app/client/src/selectors/entitiesSelector.ts
View File

@ -21,7 +21,7 @@ import { JSCollectionDataState } from "reducers/entityReducers/jsActionsReducer"
import { DefaultPlugin, GenerateCRUDEnabledPluginMap } from "api/PluginApi"; import { DefaultPlugin, GenerateCRUDEnabledPluginMap } from "api/PluginApi";
import { JSAction, JSCollection } from "entities/JSCollection"; import { JSAction, JSCollection } from "entities/JSCollection";
import { APP_MODE } from "entities/App"; 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 { ActionValidationConfigMap } from "constants/PropertyControlConstants";
import { selectFeatureFlags } from "./usersSelectors"; import { selectFeatureFlags } from "./usersSelectors";
import { import {

2
app/client/src/selectors/formSelectors.ts
View File

@ -12,7 +12,7 @@ import { getDataTree } from "./dataTreeSelectors";
import { DataTree } from "entities/DataTree/dataTreeFactory"; import { DataTree } from "entities/DataTree/dataTreeFactory";
import { Action } from "entities/Action"; import { Action } from "entities/Action";
import { EvaluationError } from "utils/DynamicBindingUtils"; 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"; import { extractConditionalOutput } from "components/formControls/utils";
export type GetFormData = { export type GetFormData = {

2
app/client/src/utils/DynamicBindingUtils.ts
View File

@ -7,7 +7,7 @@ import {
getEntityNameAndPropertyPath, getEntityNameAndPropertyPath,
isJSAction, isJSAction,
isTrueObject, isTrueObject,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import { DataTreeEntity } from "entities/DataTree/dataTreeFactory"; import { DataTreeEntity } from "entities/DataTree/dataTreeFactory";
import { getType, Types } from "./TypeHelpers"; import { getType, Types } from "./TypeHelpers";
import { ViewTypes } from "components/formControls/utils"; import { ViewTypes } from "components/formControls/utils";

5
app/client/src/utils/WidgetLoadingStateUtils.ts
View File

@ -1,6 +1,9 @@
import { DataTree } from "entities/DataTree/dataTreeFactory"; import { DataTree } from "entities/DataTree/dataTreeFactory";
import { get, set } from "lodash"; 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 { DependencyMap } from "./DynamicBindingUtils";
import WidgetFactory from "./WidgetFactory"; import WidgetFactory from "./WidgetFactory";

2
app/client/src/utils/autocomplete/CodemirrorTernService.ts
View File

@ -16,7 +16,7 @@ import {
import { import {
GLOBAL_DEFS, GLOBAL_DEFS,
GLOBAL_FUNCTIONS, GLOBAL_FUNCTIONS,
} from "utils/autocomplete/EntityDefinitions"; } from "@appsmith/utils/autocomplete/EntityDefinitions";
import { FieldEntityInformation } from "components/editorComponents/CodeEditor/EditorConfig"; import { FieldEntityInformation } from "components/editorComponents/CodeEditor/EditorConfig";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import { AutocompleteSorter } from "./AutocompleteSortRules"; import { AutocompleteSorter } from "./AutocompleteSortRules";

2
app/client/src/utils/autocomplete/dataTreeTypeDefCreator.test.ts
View File

@ -9,7 +9,7 @@ import {
ENTITY_TYPE, ENTITY_TYPE,
EvaluationSubstitutionType, EvaluationSubstitutionType,
} from "entities/DataTree/dataTreeFactory"; } from "entities/DataTree/dataTreeFactory";
import { entityDefinitions } from "utils/autocomplete/EntityDefinitions"; import { entityDefinitions } from "@appsmith/utils/autocomplete/EntityDefinitions";
describe("dataTreeTypeDefCreator", () => { describe("dataTreeTypeDefCreator", () => {
it("creates the right def for a widget", () => { it("creates the right def for a widget", () => {

4
app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts
View File

@ -1,6 +1,6 @@
import { DataTree, ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { DataTree, ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import { uniqueId, get, isFunction, isObject } from "lodash"; 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 { getType, Types } from "utils/TypeHelpers";
import { Def } from "tern"; import { Def } from "tern";
import { import {
@ -9,7 +9,7 @@ import {
isJSAction, isJSAction,
isTrueObject, isTrueObject,
isWidget, isWidget,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import { DataTreeDefEntityInformation } from "utils/autocomplete/CodemirrorTernService"; import { DataTreeDefEntityInformation } from "utils/autocomplete/CodemirrorTernService";
export type ExtraDef = Record<string, Def | string>; export type ExtraDef = Record<string, Def | string>;

2
app/client/src/widgets/ListWidget/widget/index.tsx
View File

@ -38,7 +38,7 @@ import ListPagination, {
import { ValidationTypes } from "constants/WidgetValidation"; import { ValidationTypes } from "constants/WidgetValidation";
import derivedProperties from "./parseDerivedProperties"; import derivedProperties from "./parseDerivedProperties";
import { DSLWidget } from "widgets/constants"; 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 { PrivateWidgets } from "entities/DataTree/types";
import equal from "fast-deep-equal/es6"; import equal from "fast-deep-equal/es6";
import { klona } from "klona/lite"; import { klona } from "klona/lite";

2
app/client/src/workers/Evaluation/JSObject/index.ts
View File

@ -10,7 +10,7 @@ import {
DataTreeDiffEvent, DataTreeDiffEvent,
getEntityNameAndPropertyPath, getEntityNameAndPropertyPath,
isJSAction, isJSAction,
} from "workers/Evaluation/evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import { import {
removeFunctionsAndVariableJSCollection, removeFunctionsAndVariableJSCollection,
updateJSCollectionInUnEvalTree, updateJSCollectionInUnEvalTree,

2
app/client/src/workers/Evaluation/JSObject/utils.ts
View File

@ -5,7 +5,7 @@ import {
} from "entities/DataTree/dataTreeFactory"; } from "entities/DataTree/dataTreeFactory";
import { ParsedBody, ParsedJSSubAction } from "utils/JSPaneUtils"; import { ParsedBody, ParsedJSSubAction } from "utils/JSPaneUtils";
import { unset, set, get } from "lodash"; 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. * here we add/remove the properties (variables and actions) which got added/removed from the JSObject parsedBody.

2
app/client/src/workers/Evaluation/PromisifyAction.ts
View File

@ -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 * 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 _ from "lodash";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { dataTreeEvaluator } from "./handlers/evalTree"; import { dataTreeEvaluator } from "./handlers/evalTree";

2
app/client/src/workers/Evaluation/UserLog.ts
View File

@ -3,7 +3,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { LogObject, Methods, Severity } from "entities/AppsmithConsole"; import { LogObject, Methods, Severity } from "entities/AppsmithConsole";
import { klona } from "klona/lite"; import { klona } from "klona/lite";
import moment from "moment"; import moment from "moment";
import { TriggerMeta } from "sagas/ActionExecution/ActionExecutionSagas"; import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import { sendMessage, MessageType } from "utils/MessageUtil"; import { sendMessage, MessageType } from "utils/MessageUtil";
import { MAIN_THREAD_ACTION } from "./evalWorkerActions"; import { MAIN_THREAD_ACTION } from "./evalWorkerActions";
import { _internalClearTimeout, _internalSetTimeout } from "./TimeoutOverride"; import { _internalClearTimeout, _internalSetTimeout } from "./TimeoutOverride";

2
app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
View File

@ -13,7 +13,7 @@ import { ValidationTypes } from "constants/WidgetValidation";
import WidgetFactory from "utils/WidgetFactory"; import WidgetFactory from "utils/WidgetFactory";
import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget"; import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
import { sortObjectWithArray } from "../../../utils/treeUtils"; import { sortObjectWithArray } from "../../../utils/treeUtils";
import { createUnEvalTreeForEval } from "../dataTreeUtils"; import { createUnEvalTreeForEval } from "@appsmith/workers/Evaluation/dataTreeUtils";
const WIDGET_CONFIG_MAP: WidgetTypeConfigMap = { const WIDGET_CONFIG_MAP: WidgetTypeConfigMap = {
CONTAINER_WIDGET: { CONTAINER_WIDGET: {

6
app/client/src/workers/Evaluation/evaluate.ts
View File

@ -6,12 +6,12 @@ import {
} from "utils/DynamicBindingUtils"; } from "utils/DynamicBindingUtils";
import unescapeJS from "unescape-js"; import unescapeJS from "unescape-js";
import { LogObject, Severity } from "entities/AppsmithConsole"; import { LogObject, Severity } from "entities/AppsmithConsole";
import { enhanceDataTreeWithFunctions } from "./Actions"; import { enhanceDataTreeWithFunctions } from "@appsmith/workers/Evaluation/Actions";
import { isEmpty } from "lodash"; import { isEmpty } from "lodash";
import { ActionDescription } from "entities/DataTree/actionTriggers"; import { ActionDescription } from "@appsmith/entities/DataTree/actionTriggers";
import userLogs from "./UserLog"; import userLogs from "./UserLog";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { TriggerMeta } from "sagas/ActionExecution/ActionExecutionSagas"; import { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
import indirectEval from "./indirectEval"; import indirectEval from "./indirectEval";
import { DOM_APIS } from "./SetupDOM"; import { DOM_APIS } from "./SetupDOM";
import { JSLibraries, libraryReservedIdentifiers } from "../common/JSLibrary"; import { JSLibraries, libraryReservedIdentifiers } from "../common/JSLibrary";

2
app/client/src/workers/Evaluation/evaluation.worker.ts
View File

@ -1,6 +1,6 @@
// Workers do not have access to log.error // Workers do not have access to log.error
/* eslint-disable no-console */ /* eslint-disable no-console */
import { WorkerErrorTypes } from "workers/common/types"; import { WorkerErrorTypes } from "@appsmith/workers/common/types";
import { EvalWorkerASyncRequest, EvalWorkerSyncRequest } from "./types"; import { EvalWorkerASyncRequest, EvalWorkerSyncRequest } from "./types";
import { syncHandlerMap, asyncHandlerMap } from "./handlers"; import { syncHandlerMap, asyncHandlerMap } from "./handlers";
import { TMessage, sendMessage, MessageType } from "utils/MessageUtil"; import { TMessage, sendMessage, MessageType } from "utils/MessageUtil";

2
app/client/src/workers/Evaluation/formEval.ts
View File

@ -13,7 +13,7 @@ import { FormConfigType } from "components/formControls/BaseControl";
import { isArray, isEmpty, isString, merge, uniq } from "lodash"; import { isArray, isEmpty, isString, merge, uniq } from "lodash";
import { extractEvalConfigFromFormConfig } from "components/formControls/utils"; import { extractEvalConfigFromFormConfig } from "components/formControls/utils";
import { isDynamicValue } from "utils/DynamicBindingUtils"; import { isDynamicValue } from "utils/DynamicBindingUtils";
import { isTrueObject } from "./evaluationUtils"; import { isTrueObject } from "@appsmith/workers/Evaluation/evaluationUtils";
export enum ConditionType { export enum ConditionType {
HIDE = "hide", // When set, the component will be shown until condition is true HIDE = "hide", // When set, the component will be shown until condition is true

2
app/client/src/workers/Evaluation/handlers/evalActionBindings.ts
View File

@ -1,5 +1,5 @@
import { dataTreeEvaluator } from "./evalTree"; import { dataTreeEvaluator } from "./evalTree";
import { removeFunctions } from "../evaluationUtils"; import { removeFunctions } from "@appsmith/workers/Evaluation/evaluationUtils";
import { EvalWorkerSyncRequest } from "../types"; import { EvalWorkerSyncRequest } from "../types";
export default function(request: EvalWorkerSyncRequest) { export default function(request: EvalWorkerSyncRequest) {

6
app/client/src/workers/Evaluation/handlers/evalTree.ts
View File

@ -10,17 +10,17 @@ import {
} from "utils/DynamicBindingUtils"; } from "utils/DynamicBindingUtils";
import { JSUpdate } from "utils/JSPaneUtils"; import { JSUpdate } from "utils/JSPaneUtils";
import DataTreeEvaluator from "workers/common/DataTreeEvaluator"; 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 { initiateLinting } from "workers/Linting/utils";
import { import {
createUnEvalTreeForEval, createUnEvalTreeForEval,
makeEntityConfigsAsObjProperties, makeEntityConfigsAsObjProperties,
} from "../dataTreeUtils"; } from "@appsmith/workers/Evaluation/dataTreeUtils";
import { import {
CrashingError, CrashingError,
DataTreeDiff, DataTreeDiff,
getSafeToRenderDataTree, getSafeToRenderDataTree,
} from "../evaluationUtils"; } from "@appsmith/workers/Evaluation/evaluationUtils";
import { import {
EvalTreeRequestData, EvalTreeRequestData,
EvalTreeResponseData, EvalTreeResponseData,

2
app/client/src/workers/Evaluation/handlers/evalTrigger.ts
View File

@ -1,6 +1,6 @@
import { dataTreeEvaluator } from "./evalTree"; import { dataTreeEvaluator } from "./evalTree";
import { EvalWorkerASyncRequest } from "../types"; import { EvalWorkerASyncRequest } from "../types";
import { createUnEvalTreeForEval } from "../dataTreeUtils"; import { createUnEvalTreeForEval } from "@appsmith/workers/Evaluation/dataTreeUtils";
export default async function(request: EvalWorkerASyncRequest) { export default async function(request: EvalWorkerASyncRequest) {
const { data } = request; const { data } = request;

2
app/client/src/workers/Evaluation/handlers/validateProperty.ts
View File

@ -1,5 +1,5 @@
import { validateWidgetProperty } from "workers/common/DataTreeEvaluator/validationUtils"; import { validateWidgetProperty } from "workers/common/DataTreeEvaluator/validationUtils";
import { removeFunctions } from "../evaluationUtils"; import { removeFunctions } from "@appsmith/workers/Evaluation/evaluationUtils";
import { EvalWorkerSyncRequest } from "../types"; import { EvalWorkerSyncRequest } from "../types";
export default function(request: EvalWorkerSyncRequest) { export default function(request: EvalWorkerSyncRequest) {

6
app/client/src/workers/Evaluation/types.ts
View File

@ -11,9 +11,9 @@ import {
} from "workers/Evaluation/evalWorkerActions"; } from "workers/Evaluation/evalWorkerActions";
import { JSUpdate } from "utils/JSPaneUtils"; import { JSUpdate } from "utils/JSPaneUtils";
import { WidgetTypeConfigMap } from "utils/WidgetFactory"; import { WidgetTypeConfigMap } from "utils/WidgetFactory";
import { EvalMetaUpdates } from "workers/common/DataTreeEvaluator/types"; import { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
import { WorkerRequest } from "workers/common/types"; import { WorkerRequest } from "@appsmith/workers/common/types";
import { DataTreeDiff } from "./evaluationUtils"; import { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils";
export type EvalWorkerSyncRequest = WorkerRequest<any, EVAL_WORKER_SYNC_ACTION>; export type EvalWorkerSyncRequest = WorkerRequest<any, EVAL_WORKER_SYNC_ACTION>;
export type EvalWorkerASyncRequest = WorkerRequest< export type EvalWorkerASyncRequest = WorkerRequest<

Some files were not shown because too many files have changed in this diff Show More