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

changes in evaluation for EE - split (#27144)

Browse Source 
## Description
Evaluation split changes for EE. 
1. RequiresLinting function has moved to common place - on EE extra
checks will be added
2. DataTreeFactory - getActionsForCurrentPage changed to
getCurrentActions -- which will be modified on EE to acomodate package
actions
3. same as above for getJSCollectionsForCurrentPage --> changed to
getCurrentJSCollections

#### PR fixes following issue(s)
Fixes # (issue number)
> if no issue exists, please create an issue and ask the maintainers
about this first
>
>

>
#### Type of change
- Chore (housekeeping or task changes that don't impact user perception)

>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [ ] Manual
- [ ] JUnit
- [ ] Jest
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
This commit is contained in:
Apeksha Bhosale 2023-09-12 17:21:39 +05:30 committed by GitHub
parent de6cce6443
commit 01c90f1df1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
144 changed files with 227 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/client/src/actions/evaluationActions.ts → app/client/src/ce/actions/evaluationActions.ts
View File

@ -8,6 +8,9 @@ import type { DependencyMap } from "utils/DynamicBindingUtils";
import type { QueryActionConfig } from "entities/Action";
import type { DatasourceConfiguration } from "entities/Datasource";
import type { DiffWithReferenceState } from "workers/Evaluation/helpers";
import store from "store";
import { getAppMode } from "@appsmith/selectors/applicationSelectors";
import { APP_MODE } from "entities/App";
export const FIRST_EVAL_REDUX_ACTIONS = [
// Pages
@ -224,3 +227,11 @@ export const EVAL_AND_LINT_REDUX_ACTIONS = union(
EVALUATE_REDUX_ACTIONS,
Object.keys(LINT_REDUX_ACTIONS),
);
export function getRequiresLinting(action: ReduxAction<unknown>) {
const appMode: ReturnType<typeof getAppMode> = getAppMode(store.getState());
const requiresLinting =
appMode === APP_MODE.EDIT && shouldTriggerLinting(action);
return requiresLinting;
}

5
app/client/src/ce/sagas/ApplicationSagas.tsx
View File

@ -104,7 +104,10 @@ import { getDefaultPageId as selectDefaultPageId } from "sagas/selectors";
import PageApi from "api/PageApi";
import { identity, isEmpty, merge, pickBy } from "lodash";
import { checkAndGetPluginFormConfigsSaga } from "sagas/PluginSagas";
import { getPageList, getPluginForm } from "selectors/entitiesSelector";
import {
getPageList,
getPluginForm,
} from "@appsmith/selectors/entitiesSelector";
import { getConfigInitialValues } from "components/formControls/utils";
import DatasourcesApi from "api/DatasourcesApi";
import { resetApplicationWidgets } from "actions/pageActions";

5
app/client/src/ce/sagas/analyticsSaga.ts
View File

@ -13,7 +13,10 @@ import { TriggerKind } from "constants/AppsmithActionConstants/ActionConstants";
import { isArray } from "lodash";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils";
import { getAppMode, getJSActionFromName } from "selectors/entitiesSelector";
import {
getAppMode,
getJSActionFromName,
} from "@appsmith/selectors/entitiesSelector";
import type { AppState } from "@appsmith/reducers";
import { getWidget } from "sagas/selectors";

24
app/client/src/selectors/entitiesSelector.ts → app/client/src/ce/selectors/entitiesSelector.ts
View File

@ -398,7 +398,7 @@ export const getQueryName = (state: AppState, actionId: string): string => {
return action?.config.name ?? "";
};
const getCurrentPageId = (state: AppState) =>
export const getCurrentPageId = (state: AppState) =>
state.entities.pageList.currentPageId;
export const getDatasourcePlugins = createSelector(getPlugins, (plugins) => {
@ -480,7 +480,7 @@ export const getPluginIdPackageNamesMap = createSelector(
},
);
export const getActionsForCurrentPage = createSelector(
export const getCurrentActions = createSelector(
getCurrentPageId,
getActions,
(pageId, actions) => {
@ -493,7 +493,7 @@ export const getCanvasWidgets = (state: AppState): CanvasWidgetsReduxState =>
state.entities.canvasWidgets;
export const actionsExistInCurrentPage = createSelector(
getActionsForCurrentPage,
getCurrentActions,
(actions) => {
return !!actions.length;
},
@ -506,8 +506,8 @@ export const widgetsExistCurrentPage = createSelector(
},
);
// Note: getJSCollectionsForCurrentPage (returns a new object everytime)
export const getJSCollectionsForCurrentPage = createSelector(
// Note: getCurrentJSCollections (returns a new object everytime)
export const getCurrentJSCollections = createSelector(
getCurrentPageId,
getJSCollections,
(pageId, actions) => {
@ -518,7 +518,7 @@ export const getJSCollectionsForCurrentPage = createSelector(
export const getJSCollectionFromName = createSelector(
[
getJSCollectionsForCurrentPage,
getCurrentJSCollections,
(_state: AppState, JSObjectName: string) => JSObjectName,
],
(jsCollections, JSObjectName) => {
@ -870,8 +870,8 @@ export const getDatasourceLoading = (state: AppState) => {
};
export const selectFilesForExplorer = createSelector(
getActionsForCurrentPage,
getJSCollectionsForCurrentPage,
getCurrentActions,
getCurrentJSCollections,
selectDatasourceIdToNameMap,
(actions, jsActions, datasourceIdToNameMap) => {
const files = [...actions, ...jsActions].reduce((acc, file) => {
@ -1029,8 +1029,8 @@ export const getJSCollectionParseErrors = (
export const getNumberOfEntitiesInCurrentPage = createSelector(
getCanvasWidgets,
getActionsForCurrentPage,
getJSCollectionsForCurrentPage,
getCurrentActions,
getCurrentJSCollections,
(widgets, actions, jsCollections) => {
return (
Object.keys(widgets).length - 1 + actions.length + jsCollections.length
@ -1106,12 +1106,12 @@ export const getAllJSActionsData = (state: AppState) => {
};
export const selectActionByName = (actionName: string) =>
createSelector(getActionsForCurrentPage, (actions) => {
createSelector(getCurrentActions, (actions) => {
return actions.find((action) => action.config.name === actionName);
});
export const selectJSCollectionByName = (collectionName: string) =>
createSelector(getJSCollectionsForCurrentPage, (collections) => {
createSelector(getCurrentJSCollections, (collections) => {
return collections.find(
(collection) => collection.config.name === collectionName,
);

2
app/client/src/components/editorComponents/ActionCreator/Field/FieldConfig.ts
View File

@ -32,7 +32,7 @@ import {
genericSetter,
} from "../utils";
import store from "store";
import { getPageList } from "selectors/entitiesSelector";
import { getPageList } from "@appsmith/selectors/entitiesSelector";
import type { TreeDropdownOption } from "design-system-old";
import { FIELD_GROUP_CONFIG } from "../FieldGroup/FieldGroupConfig";
import { getFunctionName, checkIfArgumentExistAtPosition } from "@shared/ast";

10
app/client/src/components/editorComponents/ActionCreator/helpers.tsx
View File

@ -24,10 +24,10 @@ import type { ActionDataState } from "reducers/entityReducers/actionsReducer";
import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
import { getCurrentPageId } from "selectors/editorSelectors";
import {
getActionsForCurrentPage,
getCurrentActions,
getJSCollectionFromName,
getJSCollectionsForCurrentPage,
} from "selectors/entitiesSelector";
getCurrentJSCollections,
} from "@appsmith/selectors/entitiesSelector";
import {
getModalDropdownList,
getNextModalName,
@ -543,8 +543,8 @@ export function useApisQueriesAndJsActionOptions(handleClose: () => void) {
return state.entities.plugins.list;
});
const pluginGroups: any = useMemo(() => keyBy(plugins, "id"), [plugins]);
const actions = useSelector(getActionsForCurrentPage);
const jsActions = useSelector(getJSCollectionsForCurrentPage);
const actions = useSelector(getCurrentActions);
const jsActions = useSelector(getCurrentJSCollections);
// this function gets all the Queries/API's/JS Objects and attaches it to actionList
return getApiQueriesAndJSActionOptionsWithChildren(

2
app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx
View File

@ -5,7 +5,7 @@ import { Text, Button } from "design-system";
import React, { useCallback, useRef } from "react";
import { useSelector } from "react-redux";
import { getWidgetOptionsTree } from "sagas/selectors";
import { getPageListAsOptions } from "selectors/entitiesSelector";
import { getPageListAsOptions } from "@appsmith/selectors/entitiesSelector";
import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator";
import { ActionCreatorContext } from "../..";
import { AppsmithFunction } from "../../constants";

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

@ -7,7 +7,7 @@ import { getFunctionName, getFunctionArguments } from "@shared/ast";
import { FIELD_CONFIG } from "../../Field/FieldConfig";
import { getCodeFromMoustache, getEvaluationVersion } from "../../utils";
import { ApiMethodIcon } from "pages/Editor/Explorer/ExplorerIcons";
import { getActionsForCurrentPage } from "selectors/entitiesSelector";
import { getCurrentActions } from "@appsmith/selectors/entitiesSelector";
import { useSelector } from "react-redux";
import type { HTTP_METHOD } from "constants/ApiEditorConstants/CommonApiConstants";
@ -15,7 +15,7 @@ function GetIconForAction(
actionType: ActionTree["actionType"],
code: string,
): React.FunctionComponent {
const actions = useSelector(getActionsForCurrentPage);
const actions = useSelector(getCurrentActions);
switch (actionType) {
case AppsmithFunction.none:

2
app/client/src/components/editorComponents/ActionNameEditor.tsx
View File

@ -13,7 +13,7 @@ import type { Action } from "entities/Action";
import { saveActionName } from "actions/pluginActionActions";
import { Spinner } from "design-system";
import { Classes } from "@blueprintjs/core";
import { getAction, getPlugin } from "selectors/entitiesSelector";
import { getAction, getPlugin } from "@appsmith/selectors/entitiesSelector";
import type { Plugin } from "api/PluginApi";
import NameEditorComponent from "components/utils/NameEditorComponent";
import {

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

@ -42,7 +42,7 @@ import {
getDatasourceStructureById,
getPluginDatasourceComponentFromId,
getPluginNameFromId,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { DatasourceComponentTypes } from "api/PluginApi";
import { fetchDatasourceStructure } from "actions/datasourceActions";
import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";

2
app/client/src/components/editorComponents/ApiResponseView.tsx
View File

@ -13,7 +13,7 @@ import type { SourceEntity } from "entities/AppsmithConsole";
import LOG_TYPE from "entities/AppsmithConsole/logtype";
import { ENTITY_TYPE } from "entities/AppsmithConsole";
import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor";
import { getActionResponses } from "selectors/entitiesSelector";
import { getActionResponses } from "@appsmith/selectors/entitiesSelector";
import { isArray, isEmpty, isString } from "lodash";
import {
CHECK_REQUEST_BODY,

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

@ -11,7 +11,7 @@ import { Divider } from "design-system";
import { useSelector } from "react-redux";
import { getConfigTree, getDataTree } from "selectors/dataTreeSelectors";
import { filterInternalProperties } from "utils/FilterInternalProperties";
import { getJSCollections } from "selectors/entitiesSelector";
import { getJSCollections } from "@appsmith/selectors/entitiesSelector";
export type PeekOverlayStateProps = {
objectName: string;

2
app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts
View File

@ -10,7 +10,7 @@ import {
} from "components/editorComponents/CodeEditor/codeEditorUtils";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import { isEmpty, isString } from "lodash";
import type { getAllDatasourceTableKeys } from "selectors/entitiesSelector";
import type { getAllDatasourceTableKeys } from "@appsmith/selectors/entitiesSelector";
import {
filterCompletions,
getHintDetailsFromClassName,

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

@ -152,7 +152,7 @@ import {
import {
getAllDatasourceTableKeys,
selectInstalledLibraries,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { debug } from "loglevel";
import { PeekOverlayExpressionIdentifier, SourceType } from "@shared/ast";
import type { MultiplexingModeConfig } from "components/editorComponents/CodeEditor/modes";

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

@ -5,7 +5,7 @@ import React, { useCallback } from "react";
import { useDispatch, useSelector } from "react-redux";
import type { AppState } from "@appsmith/reducers";
import { getCurrentPageId } from "selectors/editorSelectors";
import { getAction, getDatasource } from "selectors/entitiesSelector";
import { getAction, getDatasource } from "@appsmith/selectors/entitiesSelector";
import AnalyticsUtil from "utils/AnalyticsUtil";
import history from "utils/history";
import { getQueryParams } from "utils/URLUtils";

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

@ -12,7 +12,7 @@ import {
} from "pages/Editor/Explorer/ExplorerIcons";
import { ENTITY_TYPE } from "entities/AppsmithConsole";
import { PluginType } from "entities/Action";
import { getPlugins } from "selectors/entitiesSelector";
import { getPlugins } from "@appsmith/selectors/entitiesSelector";
import EntityLink, { DebuggerLinkUI } from "../../EntityLink";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers";

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

@ -9,7 +9,7 @@ import {
getCurrentApplicationId,
getCurrentPageId,
} from "selectors/editorSelectors";
import { getAction, getPlugins } from "selectors/entitiesSelector";
import { getAction, getPlugins } from "@appsmith/selectors/entitiesSelector";
import { onApiEditor, onCanvas, onQueryEditor } from "../helpers";
import { getLastSelectedWidget } from "selectors/ui";
import { getConfigTree, getDataTree } from "selectors/dataTreeSelectors";

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

@ -6,7 +6,7 @@ import { getPluginIcon, jsIcon } from "pages/Editor/Explorer/ExplorerIcons";
import { useMemo, useCallback } from "react";
import type { AppState } from "@appsmith/reducers";
import { getFilteredErrors } from "selectors/debuggerSelectors";
import { getAction, getDatasource } from "selectors/entitiesSelector";
import { getAction, getDatasource } from "@appsmith/selectors/entitiesSelector";
import { useSelector } from "react-redux";
import {
isAction,

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

@ -11,7 +11,7 @@ import {
getJSCollections,
getPlugins,
getRecentDatasourceIds,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { useSelector } from "react-redux";
import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
import history from "utils/history";

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

@ -60,7 +60,7 @@ import {
datasourcesEditorIdURL,
jsCollectionIdURL,
} from "RouteBuilder";
import { getPlugins } from "selectors/entitiesSelector";
import { getPlugins } from "@appsmith/selectors/entitiesSelector";
import {
DatasourceCreateEntryPoints,
TEMP_DATASOURCE_ID,

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

@ -5,7 +5,7 @@ import {
getActions,
getAllWidgetsMap,
getJSCollections,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { SEARCH_ITEM_TYPES } from "./utils";
import { get } from "lodash";
import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";

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

@ -9,7 +9,7 @@ import type { Datasource } from "entities/Datasource";
import { PluginPackageName, PluginType } from "entities/Action";
import type { WidgetType } from "constants/WidgetConstants";
import type { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import { getPluginByPackageName } from "selectors/entitiesSelector";
import { getPluginByPackageName } from "@appsmith/selectors/entitiesSelector";
import type { AppState } from "@appsmith/reducers";
import WidgetFactory from "WidgetProvider/factory";
import {

2
app/client/src/components/editorComponents/Sidebar.tsx
View File

@ -31,7 +31,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { SIDEBAR_ID } from "constants/Explorer";
import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
import { EntityClassNames } from "pages/Editor/Explorer/Entity";
import { getEditingEntityName } from "selectors/entitiesSelector";
import { getEditingEntityName } from "@appsmith/selectors/entitiesSelector";
import styled from "styled-components";
import moment from "moment";
import AnalyticsUtil from "../../utils/AnalyticsUtil";

6
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx
View File

@ -14,14 +14,14 @@ import { useDispatch, useSelector } from "react-redux";
import { useParams } from "react-router";
import { integrationEditorURL } from "RouteBuilder";
import {
getActionsForCurrentPage,
getCurrentActions,
getDatasourceLoading,
getDatasources,
getMockDatasources,
getPluginIdPackageNamesMap,
getPluginImages,
getPlugins,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import history from "utils/history";
import WidgetQueryGeneratorRegistry from "utils/WidgetQueryGeneratorRegistry";
import { WidgetQueryGeneratorFormContext } from "../..";
@ -382,7 +382,7 @@ export function useDatasource(searchText: string) {
return options;
}, [currentPageId, history, propertyName, sampleData, addBinding]);
const queries = useSelector(getActionsForCurrentPage);
const queries = useSelector(getCurrentActions);
const queryOptions = useMemo(() => {
return sortQueries(queries, expectedType).map((query) => ({

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx
View File

@ -8,7 +8,7 @@ import {
getDatasourceStructureById,
getIsFetchingDatasourceStructure,
getPluginPackageFromDatasourceId,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { WidgetQueryGeneratorFormContext } from "../..";
import { Bold, Label } from "../../styles";
import { PluginFormInputFieldMap } from "../../constants";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts
View File

@ -4,7 +4,7 @@ import { PluginPackageName } from "entities/Action";
import { useContext, useMemo } from "react";
import { useDispatch, useSelector } from "react-redux";
import { getWidget } from "sagas/selectors";
import { getPluginPackageFromDatasourceId } from "selectors/entitiesSelector";
import { getPluginPackageFromDatasourceId } from "@appsmith/selectors/entitiesSelector";
import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { WidgetQueryGeneratorFormContext } from "..";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx
View File

@ -10,7 +10,7 @@ import {
getGsheetsSheets,
getisFetchingGsheetsSheets,
} from "selectors/datasourceSelectors";
import { getDatasource } from "selectors/entitiesSelector";
import { getDatasource } from "@appsmith/selectors/entitiesSelector";
import type { AppState } from "@appsmith/reducers";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { getWidget } from "sagas/selectors";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/TableHeaderIndex/useTableHeader.ts
View File

@ -4,7 +4,7 @@ import { WidgetQueryGeneratorFormContext } from "components/editorComponents/Wid
import { isNumber } from "lodash";
import { useCallback, useContext } from "react";
import { useDispatch, useSelector } from "react-redux";
import { getDatasource } from "selectors/entitiesSelector";
import { getDatasource } from "@appsmith/selectors/entitiesSelector";
import { isValidGsheetConfig } from "components/editorComponents/WidgetQueryGeneratorForm/utils";
export function useTableHeaderIndex() {

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

@ -2,7 +2,7 @@ import type { AppState } from "@appsmith/reducers";
import { PluginPackageName } from "entities/Action";
import React, { useContext } from "react";
import { useSelector } from "react-redux";
import { getPluginPackageFromDatasourceId } from "selectors/entitiesSelector";
import { getPluginPackageFromDatasourceId } from "@appsmith/selectors/entitiesSelector";
import { WidgetQueryGeneratorFormContext } from "..";
import { Section } from "../styles";
import { GoogleSheetControls } from "./GoogleSheetControls";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumns.tsx
View File

@ -13,7 +13,7 @@ import {
getDatasourceTableColumns,
getDatasourceTablePrimaryColumn,
getPluginPackageFromDatasourceId,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { WidgetQueryGeneratorFormContext } from "../..";
import { DropdownOption as Option } from "../../CommonControls/DatasourceDropdown/DropdownOption";
import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors";

2
app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
View File

@ -42,7 +42,7 @@ import equal from "fast-deep-equal/es6";
import {
getDatasource,
getDatasourcesByPluginId,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { extractApiUrlPath } from "transformers/RestActionTransformer";
import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
import {

2
app/client/src/components/formControls/DynamicTextFieldControl.tsx
View File

@ -16,7 +16,7 @@ import styled from "styled-components";
import {
getPluginResponseTypes,
getPluginNameFromId,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { actionPathFromName } from "components/formControls/utils";
import type { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
import { getSqlEditorModeFromPluginName } from "components/editorComponents/CodeEditor/sql/config";

2
app/client/src/components/propertyControls/ActionSelectorControl.tsx
View File

@ -18,7 +18,7 @@ import {
getActions,
getJSCollections,
getPlugins,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import store from "store";
import keyBy from "lodash/keyBy";
import { getCurrentPageId } from "selectors/editorSelectors";

1
app/client/src/ee/actions/evaluationActions.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/actions/evaluationActions";

1
app/client/src/ee/selectors/entitiesSelector.ts Normal file
View File

@ -0,0 +1 @@
export * from "ce/selectors/entitiesSelector";

2
app/client/src/layoutSystems/autolayout/common/flexCanvas/FlexBoxComponent.tsx
View File

@ -10,7 +10,7 @@ import {
} from "layoutSystems/autolayout/utils/constants";
import { APP_MODE } from "entities/App";
import { useSelector } from "react-redux";
import { getAppMode } from "selectors/entitiesSelector";
import { getAppMode } from "@appsmith/selectors/entitiesSelector";
import AutoLayoutLayer from "./AutoLayoutLayer";
import { FLEXBOX_PADDING, GridDefaults } from "constants/WidgetConstants";
import type {

2
app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
View File

@ -17,7 +17,7 @@ import {
PERMISSION_TYPE,
} from "@appsmith/utils/permissionHelpers";
import { builderURL } from "RouteBuilder";
import { getCanvasWidgetsStructure } from "selectors/entitiesSelector";
import { getCanvasWidgetsStructure } from "@appsmith/selectors/entitiesSelector";
import equal from "fast-deep-equal/es6";
const Section = styled.section`

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

@ -47,7 +47,7 @@ import equal from "fast-deep-equal/es6";
import ApiAuthentication from "./ApiAuthentication";
import { replayHighlightClass } from "globalStyles/portals";
import { getPlugin } from "selectors/entitiesSelector";
import { getPlugin } from "@appsmith/selectors/entitiesSelector";
import {
hasDeleteActionPermission,
hasExecuteActionPermission,

5
app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
View File

@ -13,10 +13,7 @@ import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig
import useHorizontalResize from "utils/hooks/useHorizontalResize";
import get from "lodash/get";
import type { Datasource } from "entities/Datasource";
import {
getAction,
getActionData,
} from "../../../../selectors/entitiesSelector";
import { getAction, getActionData } from "@appsmith/selectors/entitiesSelector";
import { isEmpty } from "lodash";
import type { CommonFormProps } from "../CommonEditorForm";
import CommonEditorForm from "../CommonEditorForm";

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

@ -18,7 +18,7 @@ import type { PaginationType, Action } from "entities/Action";
import ActionNameEditor from "components/editorComponents/ActionNameEditor";
import { NameWrapper } from "./CommonEditorForm";
import { BaseButton } from "components/designSystems/appsmith/BaseButton";
import { getActionData } from "../../../selectors/entitiesSelector";
import { getActionData } from "@appsmith/selectors/entitiesSelector";
import type { AppState } from "@appsmith/reducers";
import { Icon } from "design-system";
import { showDebuggerFlag } from "selectors/debuggerSelectors";

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

@ -18,7 +18,7 @@ import {
getAction,
getActionData,
getActionResponses,
} from "../../../selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { isEmpty } from "lodash";
import type { CommonFormProps } from "./CommonEditorForm";
import CommonEditorForm from "./CommonEditorForm";

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

@ -39,7 +39,7 @@ import {
getPageList,
getPlugins,
getPluginSettingConfigs,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import history from "utils/history";
import { saasEditorApiIdURL } from "RouteBuilder";
import GraphQLEditorForm from "./GraphQL/GraphQLEditorForm";

2
app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
View File

@ -2,7 +2,7 @@ import type { Page } from "@appsmith/constants/ReduxActionConstants";
import { ThemePropertyPane } from "pages/Editor/ThemePropertyPane";
import React, { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { selectAllPages } from "selectors/entitiesSelector";
import { selectAllPages } from "@appsmith/selectors/entitiesSelector";
import styled from "styled-components";
import GeneralSettings from "./GeneralSettings";
import type { SectionHeaderProps } from "./SectionHeader";

2
app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
View File

@ -8,8 +8,8 @@ import { ComparisonOperationsEnum } from "components/formControls/BaseControl";
import type { AppState } from "@appsmith/reducers";
import { connect } from "react-redux";
import { datasourceEnvEnabled } from "@appsmith/selectors/featureFlagsSelectors";
import { getPlugin } from "@appsmith/selectors/entitiesSelector";
import { DB_NOT_SUPPORTED } from "@appsmith/utils/Environments";
import { getPlugin } from "selectors/entitiesSelector";
import type { PluginType } from "entities/Action";
import { getDefaultEnvId } from "@appsmith/api/ApiUtils";
import { EnvConfigSection } from "@appsmith/components/EnvConfigSection";

2
app/client/src/pages/Editor/DataSourceEditor/DatasourceViewModeSchema.tsx
View File

@ -9,7 +9,7 @@ import {
getDatasourceStructureById,
getIsFetchingDatasourceStructure,
getNumberOfEntitiesInCurrentPage,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import DatasourceStructureHeader from "../Explorer/Datasources/DatasourceStructureHeader";
import { MessageWrapper, TableWrapper } from "../SaaSEditor/GoogleSheetSchema";
import { Spinner, Text, Button } from "design-system";

6
app/client/src/pages/Editor/DataSourceEditor/FormTitle.tsx
View File

@ -4,9 +4,11 @@ import { useParams } from "react-router-dom";
import EditableText, {
EditInteractionKind,
} from "components/editorComponents/EditableText";
import type { AppState } from "@appsmith/reducers";
import { getDatasource, getDatasources } from "selectors/entitiesSelector";
import {
getDatasource,
getDatasources,
} from "@appsmith/selectors/entitiesSelector";
import { useSelector, useDispatch } from "react-redux";
import type { Datasource } from "entities/Datasource";
import { isNameValid } from "utils/helpers";

2
app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
View File

@ -19,7 +19,7 @@ import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelecto
import { getFeatureWalkthroughShown } from "utils/storage";
import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants";
import { adaptiveSignpostingEnabled } from "@appsmith/selectors/featureFlagsSelectors";
import { actionsExistInCurrentPage } from "selectors/entitiesSelector";
import { actionsExistInCurrentPage } from "@appsmith/selectors/entitiesSelector";
import { SignpostingWalkthroughConfig } from "../FirstTimeUserOnboarding/Utils";
type NewActionButtonProps = {

2
app/client/src/pages/Editor/DataSourceEditor/index.tsx
View File

@ -14,7 +14,7 @@ import {
getDatasource,
getPlugin,
getDatasourceFormButtonConfig,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import {
switchDatasource,
setDatasourceViewMode,

2
app/client/src/pages/Editor/EntityNavigation/ActionPane/ActionPaneNavigation.ts
View File

@ -4,7 +4,7 @@ import {
getAction,
getPlugin,
getSettingConfig,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { call, delay, put, select } from "redux-saga/effects";
import PaneNavigation from "../PaneNavigation";
import type { Plugin } from "api/PluginApi";

2
app/client/src/pages/Editor/EntityNavigation/ActionPane/QueryPaneNavigation.ts
View File

@ -8,7 +8,7 @@ import { getFormEvaluationState } from "selectors/formSelectors";
import type { FormEvaluationState } from "reducers/evaluationReducers/formEvaluationReducer";
import { isEmpty } from "lodash";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { isActionSaving } from "selectors/entitiesSelector";
import { isActionSaving } from "@appsmith/selectors/entitiesSelector";
export default class QueryPaneNavigation extends ActionPaneNavigation {
constructor(entityInfo: EntityInfo) {

2
app/client/src/pages/Editor/EntityNavigation/ActionPane/index.ts
View File

@ -1,6 +1,6 @@
import { PluginType, type Action } from "entities/Action";
import type { EntityInfo } from "../types";
import { getAction } from "selectors/entitiesSelector";
import { getAction } from "@appsmith/selectors/entitiesSelector";
import { select } from "redux-saga/effects";
import {
ActionPaneNavigation,

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

@ -12,7 +12,7 @@ import {
getAction,
getDatasource,
getPlugins,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import type { Action, StoredDatasource } from "entities/Action";
import { PluginType } from "entities/Action";
import { keyBy } from "lodash";

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

@ -7,7 +7,7 @@ import { initExplorerEntityNameEdit } from "actions/explorerActions";
import { noop } from "lodash";
import React, { useCallback, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { getPageListAsOptions } from "selectors/entitiesSelector";
import { getPageListAsOptions } from "@appsmith/selectors/entitiesSelector";
import history from "utils/history";
import { useNewActionName } from "./helpers";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";

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

@ -10,7 +10,7 @@ import {
getCurrentApplicationId,
getCurrentPageId,
} from "selectors/editorSelectors";
import { getPlugins } from "selectors/entitiesSelector";
import { getPlugins } from "@appsmith/selectors/entitiesSelector";
import { keyBy } from "lodash";
import Entity from "./Entity";
import history from "utils/history";

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

@ -18,7 +18,7 @@ import {
hasManageDatasourcePermission,
} from "@appsmith/utils/permissionHelpers";
import { getDatasource } from "selectors/entitiesSelector";
import { getDatasource } from "@appsmith/selectors/entitiesSelector";
import type { TreeDropdownOption } from "pages/Editor/Explorer/ContextMenu";
import ContextMenu from "pages/Editor/Explorer/ContextMenu";
import { DatasourceStructureContext } from "./DatasourceStructureContainer";

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

@ -22,7 +22,7 @@ import {
getAction,
getDatasourceStructureById,
getIsFetchingDatasourceStructure,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import {
datasourcesEditorIdURL,
saasEditorDatasourceIdURL,

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

@ -9,7 +9,7 @@ import { SIDEBAR_ID } from "constants/Explorer";
import { hasCreateDatasourceActionPermission } from "@appsmith/utils/permissionHelpers";
import { useSelector } from "react-redux";
import type { AppState } from "@appsmith/reducers";
import { getDatasource, getPlugin } from "selectors/entitiesSelector";
import { getDatasource, getPlugin } from "@appsmith/selectors/entitiesSelector";
import { getPagePermissions } from "selectors/editorSelectors";
import { Menu, MenuTrigger, Button, Tooltip, MenuContent } from "design-system";
import { SHOW_TEMPLATES, createMessage } from "@appsmith/constants/messages";

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

@ -14,7 +14,7 @@ import EntityPlaceholder from "../Entity/Placeholder";
import DatasourceStructure from "./DatasourceStructure";
import { SearchInput, Text } from "design-system";
import styled from "styled-components";
import { getIsFetchingDatasourceStructure } from "selectors/entitiesSelector";
import { getIsFetchingDatasourceStructure } from "@appsmith/selectors/entitiesSelector";
import { useSelector } from "react-redux";
import type { AppState } from "@appsmith/reducers";
import DatasourceStructureLoadingContainer from "./DatasourceStructureLoadingContainer";

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

@ -15,7 +15,7 @@ import {
getAction,
getDatasource,
getPlugin,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { integrationEditorURL } from "RouteBuilder";
import { MenuItem } from "design-system";
import type { Plugin } from "api/PluginApi";

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

@ -15,7 +15,7 @@ import {
} from "selectors/editorSelectors";
import { ExplorerActionEntity } from "../Actions/ActionEntity";
import ExplorerJSCollectionEntity from "../JSActions/JSActionEntity";
import { selectFilesForExplorer } from "selectors/entitiesSelector";
import { selectFilesForExplorer } from "@appsmith/selectors/entitiesSelector";
import {
getExplorerStatus,
saveExplorerStatus,

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

@ -20,7 +20,7 @@ import {
CONTEXT_SHOW_BINDING,
createMessage,
} from "@appsmith/constants/messages";
import { getPageListAsOptions } from "selectors/entitiesSelector";
import { getPageListAsOptions } from "@appsmith/selectors/entitiesSelector";
import ContextMenu from "pages/Editor/Explorer/ContextMenu";
import type { TreeDropdownOption } from "pages/Editor/Explorer/ContextMenu";

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

@ -5,7 +5,7 @@ import JSCollectionEntityContextMenu from "./JSActionContextMenu";
import { saveJSObjectName } from "actions/jsActionActions";
import { useSelector } from "react-redux";
import { getCurrentPageId } from "selectors/editorSelectors";
import { getJSCollection } from "selectors/entitiesSelector";
import { getJSCollection } from "@appsmith/selectors/entitiesSelector";
import type { AppState } from "@appsmith/reducers";
import type { JSCollection } from "entities/JSCollection";
import { JsFileIconV2 } from "../ExplorerIcons";

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

@ -14,7 +14,7 @@ import {
CONTEXT_MOVE,
createMessage,
} from "@appsmith/constants/messages";
import { getPageListAsOptions } from "selectors/entitiesSelector";
import { getPageListAsOptions } from "@appsmith/selectors/entitiesSelector";
import {
autoIndentCode,
getAutoIndentShortcutKeyText,

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

@ -30,7 +30,7 @@ import {
selectIsLibraryInstalled,
selectQueuedLibraries,
selectStatusForURL,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { InstallState } from "reducers/uiReducers/libraryReducer";
import recommendedLibraries from "pages/Editor/Explorer/Libraries/recommendedLibraries";
import type { AppState } from "@appsmith/reducers";

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

@ -23,7 +23,7 @@ import {
selectInstallationStatus,
selectIsInstallerOpen,
selectLibrariesForExplorer,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { InstallState } from "reducers/uiReducers/libraryReducer";
import { Collapse } from "@blueprintjs/core";
import useClipboard from "utils/hooks/useClipboard";

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

@ -23,7 +23,7 @@ import PageContextMenu from "./PageContextMenu";
import { resolveAsSpaceChar } from "utils/helpers";
import { getExplorerPinned } from "selectors/explorerSelector";
import { setExplorerPinnedAction } from "actions/explorerActions";
import { selectAllPages } from "selectors/entitiesSelector";
import { selectAllPages } from "@appsmith/selectors/entitiesSelector";
import { builderURL } from "RouteBuilder";
import {
getExplorerStatus,

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

@ -14,7 +14,7 @@ import {
EMPTY_WIDGET_BUTTON_TEXT,
EMPTY_WIDGET_MAIN_TEXT,
} from "@appsmith/constants/messages";
import { selectWidgetsForCurrentPage } from "selectors/entitiesSelector";
import { selectWidgetsForCurrentPage } from "@appsmith/selectors/entitiesSelector";
import { inGuidedTour } from "selectors/onboardingSelectors";
import {
getExplorerStatus,

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

@ -4,7 +4,7 @@ import { useParams } from "react-router";
import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
import { useDispatch } from "react-redux";
import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
import { getCurrentPageWidgets } from "selectors/entitiesSelector";
import { getCurrentPageWidgets } from "@appsmith/selectors/entitiesSelector";
import store from "store";
import type { NavigationMethod } from "utils/history";
import { SelectionRequestType } from "sagas/WidgetSelectUtils";

5
app/client/src/pages/Editor/Explorer/hooks.ts
View File

@ -8,7 +8,10 @@ import type { WidgetProps } from "widgets/BaseWidget";
import log from "loglevel";
import produce from "immer";
import type { CanvasStructure } from "reducers/uiReducers/pageCanvasStructureReducer";
import { getActions, getDatasources } from "selectors/entitiesSelector";
import {
getActions,
getDatasources,
} from "@appsmith/selectors/entitiesSelector";
import type { ActionData } from "reducers/entityReducers/actionsReducer";
import { matchPath, useLocation } from "react-router";
import {

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

@ -27,7 +27,7 @@ import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants";
import {
actionsExistInCurrentPage,
widgetsExistCurrentPage,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { SignpostingWalkthroughConfig } from "../FirstTimeUserOnboarding/Utils";
const selectForceOpenWidgetPanel = (state: AppState) =>

2
app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
View File

@ -6,7 +6,7 @@ import {
getCanvasWidgets,
getPageActions,
getSavedDatasources,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { INTEGRATION_TABS } from "constants/routes";
import {
getApplicationLastDeployedAt,

2
app/client/src/pages/Editor/FirstTimeUserOnboarding/Statusbar.tsx
View File

@ -8,7 +8,7 @@ import {
getCanvasWidgets,
getPageActions,
getSavedDatasources,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { SIGNPOSTING_STEP } from "./Utils";
import {
getFirstTimeUserOnboardingComplete,

2
app/client/src/pages/Editor/FirstTimeUserOnboarding/TooltipContent.tsx
View File

@ -15,7 +15,7 @@ import {
getPageActions,
getCanvasWidgets,
getSavedDatasources,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { showSignpostingTooltip } from "actions/onboardingActions";
import { SIGNPOSTING_STEP } from "./Utils";
import { isWidgetActionConnectionPresent } from "selectors/onboardingSelectors";

2
app/client/src/pages/Editor/FormControl.tsx
View File

@ -24,7 +24,7 @@ import {
getDatasourceStructureById,
getPluginNameFromId,
getPluginTemplates,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { get } from "lodash";
import { SQL_PLUGINS_DEFAULT_TEMPLATE_TYPE } from "constants/Datasource";
import TemplateMenu from "./QueryEditor/TemplateMenu";

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

@ -1,7 +1,7 @@
import React from "react";
import styled from "styled-components";
import { useSelector } from "react-redux";
import { getPluginImages } from "selectors/entitiesSelector";
import { getPluginImages } from "@appsmith/selectors/entitiesSelector";
import type {
DropdownOption,
RenderDropdownOptionType,

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

@ -8,7 +8,7 @@ import {
getIsFetchingSinglePluginForm,
getDatasourcesStructure,
getNumberOfEntitiesInCurrentPage,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import type { Datasource } from "entities/Datasource";
import { fetchDatasourceStructure } from "actions/datasourceActions";
@ -60,7 +60,7 @@ import { datasourcesEditorIdURL, integrationEditorURL } from "RouteBuilder";
import { PluginPackageName } from "entities/Action";
import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
import { hasCreateDatasourcePermission } from "@appsmith/utils/permissionHelpers";
import { getPluginImages } from "selectors/entitiesSelector";
import { getPluginImages } from "@appsmith/selectors/entitiesSelector";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
import { DatasourceCreateEntryPoints } from "constants/Datasource";
import { isGoogleSheetPluginDS } from "utils/editorContextUtils";

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

@ -1,7 +1,7 @@
import type { ReactElement } from "react";
import React, { useState, useEffect, useCallback } from "react";
import { useSelector, useDispatch } from "react-redux";
import { getEditorConfig } from "selectors/entitiesSelector";
import { getEditorConfig } from "@appsmith/selectors/entitiesSelector";
import type { AppState } from "@appsmith/reducers";
import { fetchPluginFormConfig } from "actions/pluginActions";
import { DROPDOWN_DIMENSION, DEFAULT_DROPDOWN_OPTION } from "../constants";

8
app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
View File

@ -6,8 +6,8 @@ import { useDispatch, useSelector } from "react-redux";
import CollapseComponent from "components/utils/CollapseComponent";
import {
getPluginImages,
getActionsForCurrentPage,
} from "selectors/entitiesSelector";
getCurrentActions,
} from "@appsmith/selectors/entitiesSelector";
import styled from "styled-components";
import type { AppState } from "@appsmith/reducers";
import history from "utils/history";
@ -15,7 +15,7 @@ import RenderDatasourceInformation from "pages/Editor/DataSourceEditor/Datasourc
import { getQueryParams } from "utils/URLUtils";
import { Button, MenuContent, MenuItem, MenuTrigger } from "design-system";
import { deleteDatasource } from "actions/datasourceActions";
import { getGenerateCRUDEnabledPluginMap } from "selectors/entitiesSelector";
import { getGenerateCRUDEnabledPluginMap } from "@appsmith/selectors/entitiesSelector";
import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi";
import AnalyticsUtil from "utils/AnalyticsUtil";
import NewActionButton from "../DataSourceEditor/NewActionButton";
@ -153,7 +153,7 @@ function DatasourceCard(props: DatasourceCardProps) {
const datasourceFormConfigs = useSelector(
(state: AppState) => state.entities.plugins.formConfigs,
);
const queryActions = useSelector(getActionsForCurrentPage);
const queryActions = useSelector(getCurrentActions);
const queriesWithThisDatasource = queryActions.filter(
(action) =>
isStoredDatasource(action.config.datasource) &&

7
app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
View File

@ -2,7 +2,10 @@ import React from "react";
import styled from "styled-components";
import { connect } from "react-redux";
import { initialize } from "redux-form";
import { getDBPlugins, getPluginImages } from "selectors/entitiesSelector";
import {
getDBPlugins,
getPluginImages,
} from "@appsmith/selectors/entitiesSelector";
import type { Plugin } from "api/PluginApi";
import { DATASOURCE_DB_FORM } from "@appsmith/constants/forms";
import {
@ -14,7 +17,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
import { getQueryParams } from "utils/URLUtils";
import { getGenerateCRUDEnabledPluginMap } from "selectors/entitiesSelector";
import { getGenerateCRUDEnabledPluginMap } from "@appsmith/selectors/entitiesSelector";
import type { GenerateCRUDEnabledPluginMap } from "api/PluginApi";
import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers";

5
app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
View File

@ -10,7 +10,10 @@ import NewQueryScreen from "./NewQuery";
import ActiveDataSources from "./ActiveDataSources";
import MockDataSources from "./MockDataSources";
import AddDatasourceSecurely from "./AddDatasourceSecurely";
import { getDatasources, getMockDatasources } from "selectors/entitiesSelector";
import {
getDatasources,
getMockDatasources,
} from "@appsmith/selectors/entitiesSelector";
import type { Datasource, MockDatasource } from "entities/Datasource";
import type { TabProp } from "design-system-old";
import { IconSize, Text, TextType } from "design-system-old";

2
app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
View File

@ -2,7 +2,7 @@ import React from "react";
import styled from "styled-components";
import { useDispatch, useSelector } from "react-redux";
import type { MockDatasource } from "entities/Datasource";
import { getPluginImages } from "selectors/entitiesSelector";
import { getPluginImages } from "@appsmith/selectors/entitiesSelector";
import { addMockDatasourceToWorkspace } from "actions/datasourceActions";
import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import { getQueryParams } from "utils/URLUtils";

2
app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
View File

@ -15,7 +15,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
import { CURL } from "constants/AppsmithActionConstants/ActionConstants";
import { PluginPackageName, PluginType } from "entities/Action";
import { getQueryParams } from "utils/URLUtils";
import { getGenerateCRUDEnabledPluginMap } from "selectors/entitiesSelector";
import { getGenerateCRUDEnabledPluginMap } from "@appsmith/selectors/entitiesSelector";
import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
import { curlImportPageURL } from "RouteBuilder";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers";

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

@ -31,7 +31,7 @@ import {
getIsExecutingJSAction,
getJSActions,
getJSCollectionParseErrors,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import type { JSActionDropdownOption } from "./utils";
import {
convertJSActionsToDropdownOptions,

5
app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
View File

@ -8,7 +8,10 @@ import type { AppState } from "@appsmith/reducers";
import type { JSCollection } from "entities/JSCollection";
import { Classes } from "@blueprintjs/core";
import { saveJSObjectName } from "actions/jsActionActions";
import { getJSCollection, getPlugin } from "selectors/entitiesSelector";
import {
getJSCollection,
getPlugin,
} from "@appsmith/selectors/entitiesSelector";
import NameEditorComponent from "components/utils/NameEditorComponent";
import {
ACTION_NAME_PLACEHOLDER,

2
app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx
View File

@ -6,7 +6,7 @@ import {
} from "@appsmith/constants/messages";
import { Text, Button } from "design-system";
import { useSelector } from "react-redux";
import { getCanvasWidgets } from "selectors/entitiesSelector";
import { getCanvasWidgets } from "@appsmith/selectors/entitiesSelector";
import { getSelectedWidgets } from "selectors/ui";
import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
import { SelectionRequestType } from "sagas/WidgetSelectUtils";

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

@ -7,7 +7,7 @@ import type { Datasource } from "entities/Datasource";
import {
getPluginImages,
getPluginNameFromId,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import FormControl from "../FormControl";
import {
PluginName,

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

@ -8,7 +8,7 @@ import {
getPluginDocumentationLinks,
getPlugin,
getActionData,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import type { EditorJSONtoFormProps } from "./EditorJSONtoForm";
import { EditorJSONtoForm } from "./EditorJSONtoForm";
import { getFormEvaluationState } from "selectors/formSelectors";

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

@ -2,7 +2,7 @@ import React from "react";
import styled from "styled-components";
import { connect } from "react-redux";
import type { AppState } from "@appsmith/reducers";
import { getPluginTemplates } from "selectors/entitiesSelector";
import { getPluginTemplates } from "@appsmith/selectors/entitiesSelector";
import AnalyticsUtil from "utils/AnalyticsUtil";
const Container = styled.div`

4
app/client/src/pages/Editor/QueryEditor/index.tsx
View File

@ -30,7 +30,7 @@ import {
getActionResponses,
getDatasourceByPluginId,
getDBAndRemoteDatasources,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { PLUGIN_PACKAGE_DBS } from "constants/QueryEditorConstants";
import type { QueryAction, SaaSAction } from "entities/Action";
import Spinner from "components/editorComponents/Spinner";
@ -40,7 +40,7 @@ import PerformanceTracker, {
PerformanceTransactionName,
} from "utils/PerformanceTracker";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { initFormEvaluations } from "actions/evaluationActions";
import { initFormEvaluations } from "@appsmith/actions/evaluationActions";
import { getUIComponent } from "./helpers";
import type { Diff } from "deep-diff";
import { diff } from "deep-diff";

6
app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx
View File

@ -7,9 +7,9 @@ import { Colors } from "constants/Colors";
import { useParams } from "react-router";
import {
getActionsForCurrentPage,
getCurrentActions,
getPluginImages,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import styled from "styled-components";
import type { AppState } from "@appsmith/reducers";
import history from "utils/history";
@ -98,7 +98,7 @@ function DatasourceCard(props: DatasourceCardProps) {
const datasourceFormConfigs = useSelector(
(state: AppState) => state.entities.plugins.formConfigs,
);
const queryActions = useSelector(getActionsForCurrentPage);
const queryActions = useSelector(getCurrentActions);
const queriesWithThisDatasource = queryActions.filter(
(action) =>
isStoredDatasource(action.config.datasource) &&

2
app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
View File

@ -24,7 +24,7 @@ import {
getPlugin,
getPluginDocumentationLinks,
getDatasourceScopeValue,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import type { ActionDataState } from "reducers/entityReducers/actionsReducer";
import type { JSONtoFormProps } from "../DataSourceEditor/JSONtoForm";
import { JSONtoForm } from "../DataSourceEditor/JSONtoForm";

2
app/client/src/pages/Editor/SaaSEditor/GoogleSheetSchema.tsx
View File

@ -38,7 +38,7 @@ import {
} from "@appsmith/utils/permissionHelpers";
import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
import type { AppState } from "@appsmith/reducers";
import { getDatasource } from "selectors/entitiesSelector";
import { getDatasource } from "@appsmith/selectors/entitiesSelector";
export const MessageWrapper = styled.div`
display: flex;

2
app/client/src/pages/Editor/SaaSEditor/ListView.tsx
View File

@ -5,7 +5,7 @@ import type { Plugin } from "api/PluginApi";
import {
getDatasourcesByPluginId,
getPluginByPackageName,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import NotFound from "pages/common/NotFound";
import type { AppState } from "@appsmith/reducers";
import { createDatasourceFromForm } from "actions/datasourceActions";

2
app/client/src/pages/Editor/SaaSEditor/__tests__/ActionForm.test.js
View File

@ -1,7 +1,7 @@
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { diff } from "deep-diff";
import { merge } from "lodash";
import { getAction } from "selectors/entitiesSelector";
import { getAction } from "@appsmith/selectors/entitiesSelector";
import { getConfigInitialValues } from "components/formControls/utils";
import { getPathAndValueFromActionDiffObject } from "utils/getPathAndValueFromActionDiffObject";
import configureStore from "redux-mock-store";

2
app/client/src/pages/Editor/WidgetSidebar.tsx
View File

@ -19,7 +19,7 @@ import { adaptiveSignpostingEnabled } from "@appsmith/selectors/featureFlagsSele
import {
actionsExistInCurrentPage,
widgetsExistCurrentPage,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
import { SignpostingWalkthroughConfig } from "./FirstTimeUserOnboarding/Utils";

2
app/client/src/pages/Editor/WidgetSidebarWithTags.tsx
View File

@ -27,7 +27,7 @@ import { adaptiveSignpostingEnabled } from "@appsmith/selectors/featureFlagsSele
import {
actionsExistInCurrentPage,
widgetsExistCurrentPage,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import { getFeatureWalkthroughShown } from "utils/storage";
import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants";
import { SignpostingWalkthroughConfig } from "./FirstTimeUserOnboarding/Utils";

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

@ -26,7 +26,7 @@ import {
} from "selectors/appThemingSelectors";
import { getIsAutoLayout } from "selectors/canvasSelectors";
import { getCurrentThemeDetails } from "selectors/themeSelectors";
import { getCanvasWidgetsStructure } from "selectors/entitiesSelector";
import { getCanvasWidgetsStructure } from "@appsmith/selectors/entitiesSelector";
import {
AUTOLAYOUT_RESIZER_WIDTH_BUFFER,
useDynamicAppLayout,

2
app/client/src/pages/Editor/WidgetsMultiSelectBox.tsx
View File

@ -15,7 +15,7 @@ import { TooltipComponent as Tooltip } from "design-system-old";
import { getSelectedWidgets } from "selectors/ui";
import { stopEventPropagation } from "utils/AppsmithUtils";
import { getCanvasWidgets } from "selectors/entitiesSelector";
import { getCanvasWidgets } from "@appsmith/selectors/entitiesSelector";
import type { IPopoverSharedProps } from "@blueprintjs/core";
import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
import WidgetFactory from "WidgetProvider/factory";

2
app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
View File

@ -33,7 +33,7 @@ import {
getIsListing,
getIsReconnectingDatasourcesModalOpen,
getUnconfiguredDatasources,
} from "selectors/entitiesSelector";
} from "@appsmith/selectors/entitiesSelector";
import {
initDatasourceConnectionDuringImportRequest,
resetDatasourceConfigForImportFetchedFlag,

2
app/client/src/pages/Templates/DatasourceChip.tsx
View File

@ -1,7 +1,7 @@
import React from "react";
import { useSelector } from "react-redux";
import type { AppState } from "@appsmith/reducers";
import { getDefaultPlugin } from "selectors/entitiesSelector";
import { getDefaultPlugin } from "@appsmith/selectors/entitiesSelector";
import styled from "styled-components";
import { Tag } from "design-system";

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