## 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
128 lines
4.3 KiB
TypeScript
128 lines
4.3 KiB
TypeScript
import { setLintingErrors } from "actions/lintingActions";
|
|
import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import { APP_MODE } from "entities/App";
|
|
import { call, put, select, takeEvery } from "redux-saga/effects";
|
|
import { getAppMode } from "@appsmith/selectors/entitiesSelector";
|
|
import type { TJSLibrary } from "workers/common/JSLibrary";
|
|
import { logLatestLintPropertyErrors } from "./PostLintingSagas";
|
|
import { getAppsmithConfigs } from "@appsmith/configs";
|
|
import type { AppState } from "@appsmith/reducers";
|
|
import type { LintError } from "utils/DynamicBindingUtils";
|
|
import { get, set, uniq } from "lodash";
|
|
import type { LintErrorsStore } from "reducers/lintingReducers/lintErrorsReducers";
|
|
import type { TJSPropertiesState } from "workers/Evaluation/JSObject/jsPropertiesState";
|
|
import type {
|
|
LintTreeRequestPayload,
|
|
LintTreeResponse,
|
|
LintTreeSagaRequestData,
|
|
} from "plugins/Linting/types";
|
|
import type { getUnevaluatedDataTree } from "selectors/dataTreeSelectors";
|
|
import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils";
|
|
import { Linter } from "plugins/Linting/Linter";
|
|
import log from "loglevel";
|
|
import { getFixedTimeDifference } from "workers/common/DataTreeEvaluator/utils";
|
|
|
|
const APPSMITH_CONFIGS = getAppsmithConfigs();
|
|
|
|
export const lintWorker = new Linter();
|
|
|
|
function* updateLintGlobals(
|
|
action: ReduxAction<{ add?: boolean; libs: TJSLibrary[] }>,
|
|
) {
|
|
const appMode: APP_MODE = yield select(getAppMode);
|
|
const isEditorMode = appMode === APP_MODE.EDIT;
|
|
if (!isEditorMode) return;
|
|
yield call(lintWorker.updateJSLibraryGlobals, action.payload);
|
|
}
|
|
|
|
function* updateOldJSCollectionLintErrors(
|
|
lintedJSPaths: string[],
|
|
errors: LintErrorsStore,
|
|
jsObjectsState: TJSPropertiesState,
|
|
) {
|
|
const jsEntities = uniq(
|
|
lintedJSPaths.map((path) => getEntityNameAndPropertyPath(path).entityName),
|
|
);
|
|
const updatedJSCollectionLintErrors: LintErrorsStore = {};
|
|
for (const jsObjectName of jsEntities) {
|
|
const jsObjectBodyPath = `["${jsObjectName}.body"]`;
|
|
const oldJsBodyLintErrors: LintError[] = yield select((state: AppState) =>
|
|
get(state.linting.errors, jsObjectBodyPath, []),
|
|
);
|
|
const newJSBodyLintErrors = get(
|
|
errors,
|
|
jsObjectBodyPath,
|
|
[] as LintError[],
|
|
);
|
|
|
|
const jsObjectState = get(jsObjectsState, jsObjectName, {});
|
|
const jsObjectProperties = Object.keys(jsObjectState).map(
|
|
(propertyName) => `${jsObjectName}.${propertyName}`,
|
|
);
|
|
|
|
const filteredOldJsObjectBodyLintErrors = oldJsBodyLintErrors.filter(
|
|
(lintError) =>
|
|
lintError.originalPath &&
|
|
jsObjectProperties.includes(lintError.originalPath) &&
|
|
!lintedJSPaths.includes(lintError.originalPath),
|
|
);
|
|
const updatedLintErrors = [
|
|
...filteredOldJsObjectBodyLintErrors,
|
|
...newJSBodyLintErrors,
|
|
];
|
|
set(updatedJSCollectionLintErrors, jsObjectBodyPath, updatedLintErrors);
|
|
}
|
|
return updatedJSCollectionLintErrors;
|
|
}
|
|
|
|
export function* lintTreeSaga(payload: LintTreeSagaRequestData) {
|
|
const { configTree, forceLinting, unevalTree } = payload;
|
|
|
|
const lintTreeRequestData: LintTreeRequestPayload = {
|
|
unevalTree,
|
|
configTree,
|
|
cloudHosting: !!APPSMITH_CONFIGS.cloudHosting,
|
|
forceLinting,
|
|
};
|
|
|
|
const { errors, jsPropertiesState, lintedJSPaths }: LintTreeResponse =
|
|
yield call(lintWorker.lintTree, lintTreeRequestData);
|
|
|
|
const updatedOldJSCollectionLintErrors: LintErrorsStore =
|
|
yield updateOldJSCollectionLintErrors(
|
|
lintedJSPaths,
|
|
errors,
|
|
jsPropertiesState,
|
|
);
|
|
|
|
const updatedErrors = { ...errors, ...updatedOldJSCollectionLintErrors };
|
|
|
|
yield put(setLintingErrors(updatedErrors));
|
|
yield call(logLatestLintPropertyErrors, {
|
|
errors,
|
|
dataTree: unevalTree,
|
|
});
|
|
}
|
|
|
|
export function* initiateLinting(
|
|
unEvalAndConfigTree: ReturnType<typeof getUnevaluatedDataTree>,
|
|
forceLinting: boolean,
|
|
) {
|
|
const lintingStartTime = performance.now();
|
|
const { configTree, unEvalTree: unevalTree } = unEvalAndConfigTree;
|
|
|
|
yield call(lintTreeSaga, {
|
|
unevalTree,
|
|
configTree,
|
|
forceLinting,
|
|
});
|
|
log.debug({
|
|
lintTime: getFixedTimeDifference(performance.now(), lintingStartTime),
|
|
});
|
|
}
|
|
|
|
export default function* lintTreeSagaWatcher() {
|
|
yield takeEvery(ReduxActionTypes.UPDATE_LINT_GLOBALS, updateLintGlobals);
|
|
}
|