diff --git a/app/client/src/ce/pages/Editor/Explorer/helpers.tsx b/app/client/src/ce/pages/Editor/Explorer/helpers.tsx index 498f9bab63..7c89fac378 100644 --- a/app/client/src/ce/pages/Editor/Explorer/helpers.tsx +++ b/app/client/src/ce/pages/Editor/Explorer/helpers.tsx @@ -17,7 +17,7 @@ import { SAAS_EDITOR_API_ID_PATH, SAAS_EDITOR_DATASOURCE_ID_PATH, } from "pages/Editor/SaaSEditor/constants"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer"; import type { PluginType } from "entities/Action"; import localStorage from "utils/localStorage"; diff --git a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx index 10ed0a73f5..1723a63bfe 100644 --- a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx +++ b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx @@ -710,10 +710,7 @@ function WorkspaceInviteUsersForm(props: any) { {canManage && !disableManageUsers && ( - + )} diff --git a/app/client/src/reducers/entityReducers/actionsReducer.tsx b/app/client/src/ce/reducers/entityReducers/actionsReducer.tsx similarity index 100% rename from app/client/src/reducers/entityReducers/actionsReducer.tsx rename to app/client/src/ce/reducers/entityReducers/actionsReducer.tsx diff --git a/app/client/src/ce/reducers/entityReducers/index.ts b/app/client/src/ce/reducers/entityReducers/index.ts new file mode 100644 index 0000000000..fab414a7f6 --- /dev/null +++ b/app/client/src/ce/reducers/entityReducers/index.ts @@ -0,0 +1,29 @@ +import actionsReducer from "@appsmith/reducers/entityReducers/actionsReducer"; +import appReducer from "reducers/entityReducers/appReducer"; +import canvasWidgetsReducer from "reducers/entityReducers/canvasWidgetsReducer"; +import canvasWidgetsStructureReducer from "reducers/entityReducers/canvasWidgetsStructureReducer"; +import metaWidgetsReducer from "reducers/entityReducers/metaWidgetsReducer"; +import datasourceReducer from "reducers/entityReducers/datasourceReducer"; +import jsActionsReducer from "reducers/entityReducers/jsActionsReducer"; +import jsExecutionsReducer from "reducers/entityReducers/jsExecutionsReducer"; +import metaReducer from "reducers/entityReducers/metaReducer"; +import pageListReducer from "reducers/entityReducers/pageListReducer"; +import pluginsReducer from "reducers/entityReducers/pluginsReducer"; +import autoHeightLayoutTreeReducer from "reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer"; +import canvasLevelsReducer from "reducers/entityReducers/autoHeightReducers/canvasLevelsReducer"; + +export const entityReducerObject = { + canvasWidgets: canvasWidgetsReducer, + canvasWidgetsStructure: canvasWidgetsStructureReducer, + metaWidgets: metaWidgetsReducer, + actions: actionsReducer, + datasources: datasourceReducer, + pageList: pageListReducer, + jsExecutions: jsExecutionsReducer, + plugins: pluginsReducer, + meta: metaReducer, + app: appReducer, + jsActions: jsActionsReducer, + autoHeightLayoutTree: autoHeightLayoutTreeReducer, + canvasLevels: canvasLevelsReducer, +}; diff --git a/app/client/src/ce/reducers/index.tsx b/app/client/src/ce/reducers/index.tsx index e77f995282..f75f8544db 100644 --- a/app/client/src/ce/reducers/index.tsx +++ b/app/client/src/ce/reducers/index.tsx @@ -1,11 +1,11 @@ -import entityReducer from "reducers/entityReducers"; +import entityReducer from "@appsmith/reducers/entityReducers"; import uiReducer from "reducers/uiReducers"; import evaluationsReducer from "reducers/evaluationReducers"; import { reducer as formReducer } from "redux-form"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import type { EditorReduxState } from "reducers/uiReducers/editorReducer"; import type { ErrorReduxState } from "reducers/uiReducers/errorReducer"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { PropertyPaneReduxState } from "reducers/uiReducers/propertyPaneReducer"; import type { TemplatesReduxState } from "reducers/uiReducers/templateReducer"; import type { DatasourceDataState } from "reducers/entityReducers/datasourceReducer"; diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts index 836e5783e1..c7b62c08bc 100644 --- a/app/client/src/ce/selectors/entitiesSelector.ts +++ b/app/client/src/ce/selectors/entitiesSelector.ts @@ -2,7 +2,7 @@ import type { AppState } from "@appsmith/reducers"; import type { ActionData, ActionDataState, -} from "reducers/entityReducers/actionsReducer"; +} from "@appsmith/reducers/entityReducers/actionsReducer"; import type { ActionResponse } from "api/ActionAPI"; import { createSelector } from "reselect"; import type { diff --git a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx index f0390b93f3..5cb4e66d23 100644 --- a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx @@ -20,7 +20,7 @@ import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers"; import { JsFileIconV2 } from "pages/Editor/Explorer/ExplorerIcons"; import { useMemo } from "react"; import { useDispatch, useSelector } from "react-redux"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer"; import { getCurrentPageId } from "selectors/editorSelectors"; import { diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx index edb2067462..95aeacf409 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx @@ -40,7 +40,7 @@ import { getEnvironmentConfiguration, isEnvironmentValid, } from "@appsmith/utils/Environments"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import { getDatatype } from "utils/AppsmithUtils"; import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors"; diff --git a/app/client/src/ee/reducers/entityReducers/actionsReducer.tsx b/app/client/src/ee/reducers/entityReducers/actionsReducer.tsx new file mode 100644 index 0000000000..16ca825ed5 --- /dev/null +++ b/app/client/src/ee/reducers/entityReducers/actionsReducer.tsx @@ -0,0 +1,4 @@ +export * from "ce/reducers/entityReducers/actionsReducer"; +import { default as CE_actionsReducer } from "ce/reducers/entityReducers/actionsReducer"; + +export default CE_actionsReducer; diff --git a/app/client/src/ee/reducers/entityReducers/index.ts b/app/client/src/ee/reducers/entityReducers/index.ts new file mode 100644 index 0000000000..2a113e1e66 --- /dev/null +++ b/app/client/src/ee/reducers/entityReducers/index.ts @@ -0,0 +1,7 @@ +export * from "ce/reducers/entityReducers"; +import { entityReducerObject as CE_entityReducerObject } from "ce/reducers/entityReducers"; +import { combineReducers } from "redux"; + +const entityReducer = combineReducers({ ...CE_entityReducerObject }); + +export default entityReducer; diff --git a/app/client/src/entities/DataTree/dataTreeAction.ts b/app/client/src/entities/DataTree/dataTreeAction.ts index d9f40f2d42..89fd03f4ee 100644 --- a/app/client/src/entities/DataTree/dataTreeAction.ts +++ b/app/client/src/entities/DataTree/dataTreeAction.ts @@ -1,6 +1,6 @@ import type { DependencyMap, DynamicPath } from "utils/DynamicBindingUtils"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import { getBindingAndReactivePathsOfAction, getDataTreeActionConfigPath, diff --git a/app/client/src/entities/DataTree/dataTreeFactory.ts b/app/client/src/entities/DataTree/dataTreeFactory.ts index bd23613279..81005cba3d 100644 --- a/app/client/src/entities/DataTree/dataTreeFactory.ts +++ b/app/client/src/entities/DataTree/dataTreeFactory.ts @@ -1,4 +1,4 @@ -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { WidgetProps } from "widgets/BaseWidget"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import type { MetaState } from "reducers/entityReducers/metaReducer"; diff --git a/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx index ebff48c0f4..825d10d7ff 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx @@ -12,7 +12,6 @@ import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstant import { APPLICATION_INVITE, createMessage, - INVITE_USERS_PLACEHOLDER, SHARE_APP, } from "@appsmith/constants/messages"; import FormDialogComponent from "components/editorComponents/form/FormDialogComponent"; @@ -82,7 +81,6 @@ const ShareButton = (props: ShareButtonProps) => { hideDefaultTrigger isOpen={showModal} onClose={() => setShowModal(false)} - placeholder={createMessage(INVITE_USERS_PLACEHOLDER, cloudHosting)} title={createMessage( APPLICATION_INVITE, currentWorkspace?.name, diff --git a/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx b/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx index 6ffe527c57..9c8f1b6240 100644 --- a/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/CurlImportForm.tsx @@ -6,7 +6,7 @@ import type { RouteComponentProps } from "react-router"; import { withRouter } from "react-router"; import styled from "styled-components"; import type { AppState } from "@appsmith/reducers"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import { CURL_IMPORT_FORM } from "@appsmith/constants/forms"; import type { BuilderRouteParams } from "constants/routes"; import type { curlImportFormValues } from "./helpers"; diff --git a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx b/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx index a5ae22fdff..ec3841c207 100644 --- a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx +++ b/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx @@ -12,7 +12,7 @@ import { getProvidersTemplatesLoadingState, } from "@appsmith/selectors/applicationSelectors"; import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { ProviderTemplateArray } from "constants/providerConstants"; import { DEFAULT_TEMPLATE_TYPE } from "constants/providerConstants"; import type { AddApiToPageRequest } from "api/ProvidersApi"; diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx index ceddf6f196..38806b2518 100644 --- a/app/client/src/pages/Editor/APIEditor/index.tsx +++ b/app/client/src/pages/Editor/APIEditor/index.tsx @@ -10,7 +10,7 @@ import type { RouteComponentProps } from "react-router"; import type { ActionData, ActionDataState, -} from "reducers/entityReducers/actionsReducer"; +} from "@appsmith/reducers/entityReducers/actionsReducer"; import _ from "lodash"; import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors"; import AnalyticsUtil from "utils/AnalyticsUtil"; diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx index eb2b4452f4..549d04ce5b 100644 --- a/app/client/src/pages/Editor/EditorHeader.tsx +++ b/app/client/src/pages/Editor/EditorHeader.tsx @@ -80,7 +80,6 @@ import { DEPLOY_MENU_OPTION, EDITOR_HEADER, INVITE_TAB, - INVITE_USERS_PLACEHOLDER, IN_APP_EMBED_SETTING, LOCK_ENTITY_EXPLORER_MESSAGE, LOGO_TOOLTIP, @@ -565,10 +564,6 @@ export function EditorHeader() { diff --git a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx index 99803ae99a..5587dab081 100644 --- a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx +++ b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx @@ -13,7 +13,7 @@ import type { Plugin } from "api/PluginApi"; import { useSelector } from "react-redux"; import type { AppState } from "@appsmith/reducers"; import { groupBy } from "lodash"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import { getNextEntityName } from "utils/AppsmithUtils"; import { apiEditorIdURL, diff --git a/app/client/src/pages/Editor/Explorer/hooks.ts b/app/client/src/pages/Editor/Explorer/hooks.ts index 635130eaae..c8a8ff5828 100644 --- a/app/client/src/pages/Editor/Explorer/hooks.ts +++ b/app/client/src/pages/Editor/Explorer/hooks.ts @@ -12,7 +12,7 @@ import { getActions, getDatasources, } from "@appsmith/selectors/entitiesSelector"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import { matchPath, useLocation } from "react-router"; import { API_EDITOR_ID_PATH, diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx index c01dbda8fc..3a08512878 100644 --- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx +++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx @@ -44,7 +44,7 @@ import { SIGNPOSTING_TOOLTIP, } from "@appsmith/constants/messages"; import type { Datasource } from "entities/Datasource"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import { SIGNPOSTING_STEP, SignpostingWalkthroughConfig } from "./Utils"; import { builderURL, integrationEditorURL } from "RouteBuilder"; diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx index f02f7e4143..7e5afe81b2 100644 --- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx +++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx @@ -25,7 +25,7 @@ import { getPluginDocumentationLinks, getDatasourceScopeValue, } from "@appsmith/selectors/entitiesSelector"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { JSONtoFormProps } from "../DataSourceEditor/JSONtoForm"; import { JSONtoForm } from "../DataSourceEditor/JSONtoForm"; import { normalizeValues, validate } from "components/formControls/utils"; diff --git a/app/client/src/pages/Editor/SaaSEditor/ListView.tsx b/app/client/src/pages/Editor/SaaSEditor/ListView.tsx index a0dc24850c..78928395b9 100644 --- a/app/client/src/pages/Editor/SaaSEditor/ListView.tsx +++ b/app/client/src/pages/Editor/SaaSEditor/ListView.tsx @@ -13,7 +13,7 @@ import type { SaaSAction } from "entities/Action"; import { createActionRequest } from "actions/pluginActionActions"; import type { Datasource } from "entities/Datasource"; import { createNewApiName } from "utils/AppsmithUtils"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; // Design import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper"; diff --git a/app/client/src/reducers/entityReducers/index.ts b/app/client/src/reducers/entityReducers/index.ts deleted file mode 100644 index 458215cca0..0000000000 --- a/app/client/src/reducers/entityReducers/index.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { combineReducers } from "redux"; -import actionsReducer from "./actionsReducer"; -import appReducer from "./appReducer"; -import canvasWidgetsReducer from "./canvasWidgetsReducer"; -import canvasWidgetsStructureReducer from "./canvasWidgetsStructureReducer"; -import metaWidgetsReducer from "./metaWidgetsReducer"; -import datasourceReducer from "./datasourceReducer"; -import jsActionsReducer from "./jsActionsReducer"; -import jsExecutionsReducer from "./jsExecutionsReducer"; -import metaReducer from "./metaReducer"; -import pageListReducer from "./pageListReducer"; -import pluginsReducer from "reducers/entityReducers/pluginsReducer"; -import autoHeightLayoutTreeReducer from "./autoHeightReducers/autoHeightLayoutTreeReducer"; -import canvasLevelsReducer from "./autoHeightReducers/canvasLevelsReducer"; - -const entityReducer = combineReducers({ - canvasWidgets: canvasWidgetsReducer, - canvasWidgetsStructure: canvasWidgetsStructureReducer, - metaWidgets: metaWidgetsReducer, - actions: actionsReducer, - datasources: datasourceReducer, - pageList: pageListReducer, - jsExecutions: jsExecutionsReducer, - plugins: pluginsReducer, - meta: metaReducer, - app: appReducer, - jsActions: jsActionsReducer, - autoHeightLayoutTree: autoHeightLayoutTreeReducer, - canvasLevels: canvasLevelsReducer, -}); - -export default entityReducer; diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts index a480b0aadb..f117f4adbd 100644 --- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts @@ -148,7 +148,7 @@ import type { TRunDescription } from "workers/Evaluation/fns/actionFns"; import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; import { FILE_SIZE_LIMIT_FOR_BLOBS } from "constants/WidgetConstants"; import { getCurrentActions } from "@appsmith/selectors/entitiesSelector"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import { handleStoreOperations } from "./StoreActionSaga"; import { fetchPage } from "actions/pageActions"; import type { Datasource } from "entities/Datasource"; diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts index a788ff01c8..302b3eabc3 100644 --- a/app/client/src/sagas/ActionSagas.ts +++ b/app/client/src/sagas/ActionSagas.ts @@ -64,7 +64,7 @@ import { import type { ActionData, ActionDataState, -} from "reducers/entityReducers/actionsReducer"; +} from "@appsmith/reducers/entityReducers/actionsReducer"; import { getAction, getActions, diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts index ed6e01a507..35e1bea29a 100644 --- a/app/client/src/sagas/ApiPaneSagas.ts +++ b/app/client/src/sagas/ApiPaneSagas.ts @@ -45,7 +45,7 @@ import { import type { ActionData, ActionDataState, -} from "reducers/entityReducers/actionsReducer"; +} from "@appsmith/reducers/entityReducers/actionsReducer"; import { createActionRequest, setActionProperty, diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts index 4a7896d8ec..c4cc361f3c 100644 --- a/app/client/src/sagas/OnboardingSagas.ts +++ b/app/client/src/sagas/OnboardingSagas.ts @@ -64,7 +64,7 @@ import { } from "@appsmith/actions/applicationActions"; import { setPreviewModeAction } from "actions/editorActions"; import type { FlattenedWidgetProps } from "WidgetProvider/constants"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import { batchUpdateMultipleWidgetProperties } from "actions/controlActions"; import { setExplorerActiveAction, diff --git a/app/client/src/sagas/OneClickBindingSaga.ts b/app/client/src/sagas/OneClickBindingSaga.ts index 77eb5b6c3b..d76dd7731e 100644 --- a/app/client/src/sagas/OneClickBindingSaga.ts +++ b/app/client/src/sagas/OneClickBindingSaga.ts @@ -23,7 +23,7 @@ import { getPulginActionDefaultValues, } from "./ActionSagas"; import "../WidgetQueryGenerators"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import "WidgetQueryGenerators"; import { getWidgetByID } from "./selectors"; import type { diff --git a/app/client/src/sagas/PluginSagas.ts b/app/client/src/sagas/PluginSagas.ts index aca713e55e..d6e6fa6255 100644 --- a/app/client/src/sagas/PluginSagas.ts +++ b/app/client/src/sagas/PluginSagas.ts @@ -38,7 +38,7 @@ import type { FormDependencyConfigs, FormDatasourceButtonConfigs, } from "utils/DynamicBindingUtils"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; function* fetchPluginsSaga( action: ReduxAction<{ workspaceId?: string } | undefined>, diff --git a/app/client/src/sagas/SnipingModeSagas.ts b/app/client/src/sagas/SnipingModeSagas.ts index 9ffcb5905e..fb848b56b7 100644 --- a/app/client/src/sagas/SnipingModeSagas.ts +++ b/app/client/src/sagas/SnipingModeSagas.ts @@ -2,7 +2,7 @@ import { all, call, put, select, takeLeading } from "redux-saga/effects"; import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { snipingModeBindToSelector } from "selectors/editorSelectors"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import { getCanvasWidgets } from "@appsmith/selectors/entitiesSelector"; import { batchUpdateWidgetDynamicProperty, diff --git a/app/client/src/sagas/WidgetLoadingSaga.ts b/app/client/src/sagas/WidgetLoadingSaga.ts index d927d5d43d..bd609bbabf 100644 --- a/app/client/src/sagas/WidgetLoadingSaga.ts +++ b/app/client/src/sagas/WidgetLoadingSaga.ts @@ -9,7 +9,7 @@ import { getActions } from "@appsmith/selectors/entitiesSelector"; import type { ActionData, ActionDataState, -} from "reducers/entityReducers/actionsReducer"; +} from "@appsmith/reducers/entityReducers/actionsReducer"; import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants"; import { ReduxActionErrorTypes, diff --git a/app/client/src/sagas/selectors.tsx b/app/client/src/sagas/selectors.tsx index 08ba5780b0..556101cd2e 100644 --- a/app/client/src/sagas/selectors.tsx +++ b/app/client/src/sagas/selectors.tsx @@ -9,7 +9,7 @@ import type { WidgetProps } from "widgets/BaseWidget"; import _, { defaults, omit } from "lodash"; import type { WidgetType } from "constants/WidgetConstants"; import { WIDGET_PROPS_TO_SKIP_FROM_EVAL } from "constants/WidgetConstants"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { Page } from "@appsmith/constants/ReduxActionConstants"; import { getActions, getPlugins } from "@appsmith/selectors/entitiesSelector"; import type { Plugin } from "api/PluginApi"; diff --git a/app/client/src/selectors/formSelectors.ts b/app/client/src/selectors/formSelectors.ts index 673fefbc0e..16932ac1d0 100644 --- a/app/client/src/selectors/formSelectors.ts +++ b/app/client/src/selectors/formSelectors.ts @@ -1,6 +1,6 @@ import { getFormValues, isValid, getFormInitialValues } from "redux-form"; import type { AppState } from "@appsmith/reducers"; -import type { ActionData } from "reducers/entityReducers/actionsReducer"; +import type { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { DynamicValues, FormEvalOutput, diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx index fa94ae0bad..299583b744 100644 --- a/app/client/src/utils/AppsmithUtils.tsx +++ b/app/client/src/utils/AppsmithUtils.tsx @@ -8,7 +8,7 @@ import { AppIconCollection } from "design-system-old"; import _, { isPlainObject } from "lodash"; import * as log from "loglevel"; import { osName } from "react-device-detect"; -import type { ActionDataState } from "reducers/entityReducers/actionsReducer"; +import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer"; import AnalyticsUtil from "./AnalyticsUtil";