## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
7cbb12af88,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### 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
- [x] 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
- [x] 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:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
445 lines
14 KiB
TypeScript
445 lines
14 KiB
TypeScript
import type {
|
|
ReduxAction,
|
|
EvaluationReduxAction,
|
|
} from "@appsmith/constants/ReduxActionConstants";
|
|
import {
|
|
ReduxActionTypes,
|
|
ReduxActionErrorTypes,
|
|
} from "@appsmith/constants/ReduxActionConstants";
|
|
import {
|
|
all,
|
|
put,
|
|
takeEvery,
|
|
takeLatest,
|
|
select,
|
|
call,
|
|
} from "redux-saga/effects";
|
|
import type { FetchActionsPayload } from "actions/pluginActionActions";
|
|
import type { JSCollection, JSAction } from "entities/JSCollection";
|
|
import {
|
|
createJSCollectionSuccess,
|
|
deleteJSCollectionSuccess,
|
|
deleteJSCollectionError,
|
|
copyJSCollectionSuccess,
|
|
copyJSCollectionError,
|
|
moveJSCollectionSuccess,
|
|
moveJSCollectionError,
|
|
fetchJSCollectionsForPage,
|
|
fetchJSCollectionsForPageSuccess,
|
|
} from "actions/jsActionActions";
|
|
import {
|
|
getJSCollection,
|
|
getPageNameByPageId,
|
|
} from "selectors/entitiesSelector";
|
|
import history from "utils/history";
|
|
import { getCurrentPageId } from "selectors/editorSelectors";
|
|
import type { JSCollectionCreateUpdateResponse } from "api/JSActionAPI";
|
|
import JSActionAPI from "api/JSActionAPI";
|
|
import { Toaster, Variant } from "design-system-old";
|
|
import {
|
|
createMessage,
|
|
JS_ACTION_COPY_SUCCESS,
|
|
ERROR_JS_ACTION_COPY_FAIL,
|
|
JS_ACTION_DELETE_SUCCESS,
|
|
JS_ACTION_MOVE_SUCCESS,
|
|
ERROR_JS_ACTION_MOVE_FAIL,
|
|
ERROR_JS_COLLECTION_RENAME_FAIL,
|
|
} from "@appsmith/constants/messages";
|
|
import { validateResponse } from "./ErrorSagas";
|
|
import type { FetchPageResponse, PageLayout } from "api/PageApi";
|
|
import PageApi from "api/PageApi";
|
|
import { updateCanvasWithDSL } from "sagas/PageSagas";
|
|
import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
|
|
import type { ApiResponse } from "api/ApiResponses";
|
|
import AppsmithConsole from "utils/AppsmithConsole";
|
|
import { ENTITY_TYPE } from "entities/AppsmithConsole";
|
|
import LOG_TYPE from "entities/AppsmithConsole/logtype";
|
|
import type { CreateJSCollectionRequest } from "api/JSActionAPI";
|
|
import * as log from "loglevel";
|
|
import { builderURL, jsCollectionIdURL } from "RouteBuilder";
|
|
import type { EventLocation } from "utils/AnalyticsUtil";
|
|
import AnalyticsUtil from "utils/AnalyticsUtil";
|
|
import { checkAndLogErrorsIfCyclicDependency } from "./helper";
|
|
|
|
export function* fetchJSCollectionsSaga(
|
|
action: EvaluationReduxAction<FetchActionsPayload>,
|
|
) {
|
|
const { applicationId } = action.payload;
|
|
try {
|
|
const response: ApiResponse<JSCollection[]> =
|
|
yield JSActionAPI.fetchJSCollections(applicationId);
|
|
yield put({
|
|
type: ReduxActionTypes.FETCH_JS_ACTIONS_SUCCESS,
|
|
payload: response.data || [],
|
|
});
|
|
} catch (error) {
|
|
yield put({
|
|
type: ReduxActionErrorTypes.FETCH_JS_ACTIONS_ERROR,
|
|
payload: { error },
|
|
});
|
|
}
|
|
}
|
|
|
|
export function* createJSCollectionSaga(
|
|
actionPayload: ReduxAction<{
|
|
request: CreateJSCollectionRequest;
|
|
from: EventLocation;
|
|
}>,
|
|
) {
|
|
try {
|
|
const payload = actionPayload.payload.request;
|
|
const response: JSCollectionCreateUpdateResponse =
|
|
yield JSActionAPI.createJSCollection(payload);
|
|
const isValidResponse: boolean = yield validateResponse(response);
|
|
if (isValidResponse) {
|
|
const actionName = payload.name ? payload.name : "";
|
|
AnalyticsUtil.logEvent("JS_OBJECT_CREATED", {
|
|
name: actionName,
|
|
from: actionPayload.payload.from,
|
|
});
|
|
|
|
AppsmithConsole.info({
|
|
text: `JS Object created`,
|
|
source: {
|
|
type: ENTITY_TYPE.JSACTION,
|
|
// @ts-expect-error: response.data is of type unknown
|
|
id: response.data.id,
|
|
// @ts-expect-error: response.data is of type unknown
|
|
name: response.data.name,
|
|
},
|
|
});
|
|
|
|
const newAction = response.data;
|
|
// @ts-expect-error: response.data is of type unknown
|
|
yield put(createJSCollectionSuccess(newAction));
|
|
}
|
|
} catch (error) {
|
|
yield put({
|
|
type: ReduxActionErrorTypes.CREATE_JS_ACTION_ERROR,
|
|
payload: actionPayload.payload,
|
|
});
|
|
}
|
|
}
|
|
function* copyJSCollectionSaga(
|
|
action: ReduxAction<{ id: string; destinationPageId: string; name: string }>,
|
|
) {
|
|
const actionObject: JSCollection = yield select(
|
|
getJSCollection,
|
|
action.payload.id,
|
|
);
|
|
try {
|
|
if (!actionObject) throw new Error("Could not find js collection to copy");
|
|
const copyJSCollection = Object.assign({}, actionObject, {
|
|
name: action.payload.name,
|
|
pageId: action.payload.destinationPageId,
|
|
}) as Partial<JSCollection>;
|
|
delete copyJSCollection.id;
|
|
if (copyJSCollection.actions && copyJSCollection.actions.length > 0) {
|
|
const newJSSubActions: JSAction[] = [];
|
|
copyJSCollection.actions.forEach((action) => {
|
|
const jsSubAction = JSON.parse(JSON.stringify(action));
|
|
delete jsSubAction.id;
|
|
delete jsSubAction.collectionId;
|
|
newJSSubActions.push(jsSubAction);
|
|
});
|
|
copyJSCollection.actions = newJSSubActions;
|
|
}
|
|
const response: JSCollectionCreateUpdateResponse =
|
|
yield JSActionAPI.copyJSCollection(copyJSCollection);
|
|
|
|
const isValidResponse: boolean = yield validateResponse(response);
|
|
const pageName: string = yield select(
|
|
getPageNameByPageId,
|
|
// @ts-expect-error: response.data is of type unknown
|
|
response.data.pageId,
|
|
);
|
|
if (isValidResponse) {
|
|
Toaster.show({
|
|
text: createMessage(
|
|
JS_ACTION_COPY_SUCCESS,
|
|
actionObject.name,
|
|
pageName,
|
|
),
|
|
variant: Variant.success,
|
|
});
|
|
const payload = response.data;
|
|
|
|
// @ts-expect-error: response.data is of type unknown
|
|
yield put(copyJSCollectionSuccess(payload));
|
|
}
|
|
} catch (e) {
|
|
const actionName = actionObject ? actionObject.name : "";
|
|
Toaster.show({
|
|
text: createMessage(ERROR_JS_ACTION_COPY_FAIL, actionName),
|
|
variant: Variant.danger,
|
|
});
|
|
yield put(copyJSCollectionError(action.payload));
|
|
}
|
|
}
|
|
|
|
function* handleMoveOrCopySaga(actionPayload: ReduxAction<{ id: string }>) {
|
|
const { id } = actionPayload.payload;
|
|
const { pageId }: JSCollection = yield select(getJSCollection, id);
|
|
history.push(
|
|
jsCollectionIdURL({
|
|
pageId: pageId,
|
|
collectionId: id,
|
|
}),
|
|
);
|
|
}
|
|
|
|
function* moveJSCollectionSaga(
|
|
action: ReduxAction<{
|
|
id: string;
|
|
destinationPageId: string;
|
|
name: string;
|
|
}>,
|
|
) {
|
|
const actionObject: JSCollection = yield select(
|
|
getJSCollection,
|
|
action.payload.id,
|
|
);
|
|
try {
|
|
const response: ApiResponse = yield JSActionAPI.moveJSCollection({
|
|
collectionId: actionObject.id,
|
|
destinationPageId: action.payload.destinationPageId,
|
|
name: action.payload.name,
|
|
});
|
|
|
|
const isValidResponse: boolean = yield validateResponse(response);
|
|
const pageName: string = yield select(
|
|
getPageNameByPageId,
|
|
// @ts-expect-error: response.data is of type unknown
|
|
response.data.pageId,
|
|
);
|
|
if (isValidResponse) {
|
|
Toaster.show({
|
|
text: createMessage(
|
|
JS_ACTION_MOVE_SUCCESS,
|
|
// @ts-expect-error: response.data is of type unknown
|
|
response.data.name,
|
|
pageName,
|
|
),
|
|
variant: Variant.success,
|
|
});
|
|
}
|
|
// @ts-expect-error: response.data is of type unknown
|
|
yield put(moveJSCollectionSuccess(response.data));
|
|
} catch (e) {
|
|
Toaster.show({
|
|
text: createMessage(ERROR_JS_ACTION_MOVE_FAIL, actionObject.name),
|
|
variant: Variant.danger,
|
|
});
|
|
yield put(
|
|
moveJSCollectionError({
|
|
id: action.payload.id,
|
|
originalPageId: actionObject.pageId,
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
|
|
export const getIndexToBeRedirected = (
|
|
jsActions: Array<JSCollectionData>,
|
|
id: string,
|
|
): number | undefined => {
|
|
let resultIndex = undefined;
|
|
let redirectIndex = undefined;
|
|
if (jsActions.length > 1) {
|
|
for (let i = 0; i < jsActions.length; i++) {
|
|
if (id === jsActions[i].config.id) {
|
|
resultIndex = i;
|
|
}
|
|
}
|
|
}
|
|
if (resultIndex && resultIndex > 0) {
|
|
redirectIndex = resultIndex - 1;
|
|
} else if (resultIndex === 0 && jsActions.length > 1) {
|
|
redirectIndex = resultIndex + 1;
|
|
}
|
|
return redirectIndex;
|
|
};
|
|
|
|
export function* deleteJSCollectionSaga(
|
|
actionPayload: ReduxAction<{ id: string; name: string }>,
|
|
) {
|
|
try {
|
|
const id = actionPayload.payload.id;
|
|
const pageId: string = yield select(getCurrentPageId);
|
|
const response: ApiResponse = yield JSActionAPI.deleteJSCollection(id);
|
|
const isValidResponse: boolean = yield validateResponse(response);
|
|
if (isValidResponse) {
|
|
Toaster.show({
|
|
// @ts-expect-error: response.data is of type unknown
|
|
text: createMessage(JS_ACTION_DELETE_SUCCESS, response.data.name),
|
|
variant: Variant.success,
|
|
});
|
|
history.push(builderURL({ pageId }));
|
|
AppsmithConsole.info({
|
|
logType: LOG_TYPE.ENTITY_DELETED,
|
|
text: "JS object was deleted",
|
|
source: {
|
|
type: ENTITY_TYPE.JSACTION,
|
|
// @ts-expect-error: response.data is of type unknown
|
|
name: response.data.name,
|
|
// @ts-expect-error: response.data is of type unknown
|
|
id: response.data.id,
|
|
},
|
|
});
|
|
yield put(deleteJSCollectionSuccess({ id }));
|
|
}
|
|
} catch (error) {
|
|
yield put(deleteJSCollectionError({ id: actionPayload.payload.id }));
|
|
}
|
|
}
|
|
|
|
function* saveJSObjectName(action: ReduxAction<{ id: string; name: string }>) {
|
|
// Takes from state, checks if the name isValid, saves
|
|
const collectionId = action.payload.id;
|
|
const collection: JSCollectionData | undefined = yield select((state) =>
|
|
state.entities.jsActions.find(
|
|
(jsAction: JSCollectionData) => jsAction.config.id === collectionId,
|
|
),
|
|
);
|
|
if (!collection) return;
|
|
try {
|
|
yield refactorJSObjectName(
|
|
collection.config.id,
|
|
collection.config.pageId,
|
|
collection.config.name,
|
|
action.payload.name,
|
|
);
|
|
} catch (e) {
|
|
yield put({
|
|
type: ReduxActionErrorTypes.SAVE_JS_COLLECTION_NAME_ERROR,
|
|
payload: {
|
|
actionId: action.payload.id,
|
|
oldName: collection.config.name,
|
|
},
|
|
});
|
|
Toaster.show({
|
|
text: createMessage(ERROR_JS_COLLECTION_RENAME_FAIL, action.payload.name),
|
|
variant: Variant.danger,
|
|
});
|
|
log.error(e);
|
|
}
|
|
}
|
|
|
|
export function* refactorJSObjectName(
|
|
id: string,
|
|
pageId: string,
|
|
oldName: string,
|
|
newName: string,
|
|
) {
|
|
const pageResponse: FetchPageResponse = yield call(PageApi.fetchPage, {
|
|
id: pageId,
|
|
});
|
|
// check if page request is successful
|
|
const isPageRequestSuccessful: boolean = yield validateResponse(pageResponse);
|
|
if (isPageRequestSuccessful) {
|
|
// get the layoutId from the page response
|
|
const layoutId = pageResponse.data.layouts[0].id;
|
|
// call to refactor action
|
|
const refactorResponse: ApiResponse =
|
|
yield JSActionAPI.updateJSCollectionOrActionName({
|
|
layoutId,
|
|
actionCollectionId: id,
|
|
pageId: pageId,
|
|
oldName: oldName,
|
|
newName: newName,
|
|
});
|
|
|
|
const isRefactorSuccessful: boolean = yield validateResponse(
|
|
refactorResponse,
|
|
);
|
|
|
|
const currentPageId: string | undefined = yield select(getCurrentPageId);
|
|
|
|
if (isRefactorSuccessful) {
|
|
yield put({
|
|
type: ReduxActionTypes.SAVE_JS_COLLECTION_NAME_SUCCESS,
|
|
payload: {
|
|
actionId: id,
|
|
},
|
|
});
|
|
if (currentPageId === pageId) {
|
|
// @ts-expect-error: refactorResponse.data is of type unknown
|
|
yield updateCanvasWithDSL(refactorResponse.data, pageId, layoutId);
|
|
} else {
|
|
yield put(fetchJSCollectionsForPage(pageId));
|
|
}
|
|
checkAndLogErrorsIfCyclicDependency(
|
|
(refactorResponse.data as PageLayout).layoutOnLoadActionErrors,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
export function* fetchJSCollectionsForPageSaga(
|
|
action: ReduxAction<{ pageId: string }>,
|
|
) {
|
|
const { pageId } = action.payload;
|
|
try {
|
|
const response: ApiResponse<JSCollection[]> = yield call(
|
|
JSActionAPI.fetchJSCollectionsByPageId,
|
|
pageId,
|
|
);
|
|
const isValidResponse: boolean = yield validateResponse(response);
|
|
if (isValidResponse) {
|
|
yield put(fetchJSCollectionsForPageSuccess(response.data));
|
|
}
|
|
} catch (error) {
|
|
yield put({
|
|
type: ReduxActionErrorTypes.FETCH_JS_ACTIONS_FOR_PAGE_ERROR,
|
|
payload: { error },
|
|
});
|
|
}
|
|
}
|
|
|
|
export function* fetchJSCollectionsForViewModeSaga(
|
|
action: ReduxAction<FetchActionsPayload>,
|
|
) {
|
|
const { applicationId } = action.payload;
|
|
try {
|
|
const response: ApiResponse<JSCollection[]> =
|
|
yield JSActionAPI.fetchJSCollectionsForViewMode(applicationId);
|
|
const resultJSCollections = response.data;
|
|
const isValidResponse: boolean = yield validateResponse(response);
|
|
if (isValidResponse) {
|
|
yield put({
|
|
type: ReduxActionTypes.FETCH_JS_ACTIONS_VIEW_MODE_SUCCESS,
|
|
payload: resultJSCollections,
|
|
});
|
|
}
|
|
} catch (error) {
|
|
yield put({
|
|
type: ReduxActionErrorTypes.FETCH_JS_ACTIONS_VIEW_MODE_ERROR,
|
|
payload: { error },
|
|
});
|
|
}
|
|
}
|
|
|
|
export function* watchJSActionSagas() {
|
|
yield all([
|
|
takeEvery(ReduxActionTypes.FETCH_JS_ACTIONS_INIT, fetchJSCollectionsSaga),
|
|
takeEvery(ReduxActionTypes.CREATE_JS_ACTION_INIT, createJSCollectionSaga),
|
|
takeLatest(ReduxActionTypes.COPY_JS_ACTION_INIT, copyJSCollectionSaga),
|
|
takeEvery(ReduxActionTypes.COPY_JS_ACTION_SUCCESS, handleMoveOrCopySaga),
|
|
takeEvery(ReduxActionErrorTypes.COPY_JS_ACTION_ERROR, handleMoveOrCopySaga),
|
|
takeLatest(ReduxActionTypes.MOVE_JS_ACTION_INIT, moveJSCollectionSaga),
|
|
takeEvery(ReduxActionErrorTypes.MOVE_JS_ACTION_ERROR, handleMoveOrCopySaga),
|
|
takeEvery(ReduxActionTypes.MOVE_JS_ACTION_SUCCESS, handleMoveOrCopySaga),
|
|
takeEvery(ReduxActionTypes.MOVE_JS_ACTION_SUCCESS, handleMoveOrCopySaga),
|
|
takeLatest(ReduxActionTypes.DELETE_JS_ACTION_INIT, deleteJSCollectionSaga),
|
|
takeLatest(ReduxActionTypes.SAVE_JS_COLLECTION_NAME_INIT, saveJSObjectName),
|
|
takeLatest(
|
|
ReduxActionTypes.FETCH_JS_ACTIONS_FOR_PAGE_INIT,
|
|
fetchJSCollectionsForPageSaga,
|
|
),
|
|
takeEvery(
|
|
ReduxActionTypes.FETCH_JS_ACTIONS_VIEW_MODE_INIT,
|
|
fetchJSCollectionsForViewModeSaga,
|
|
),
|
|
]);
|
|
}
|