2021-08-27 09:25:28 +00:00
|
|
|
import { call, select } from "redux-saga/effects";
|
2021-10-18 14:03:44 +00:00
|
|
|
import { getCurrentPageId, getPageList } from "selectors/editorSelectors";
|
2021-08-27 09:25:28 +00:00
|
|
|
import _ from "lodash";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## 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
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
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>
2023-03-16 11:41:47 +00:00
|
|
|
import type { Page } from "@appsmith/constants/ReduxActionConstants";
|
2021-08-27 09:25:28 +00:00
|
|
|
import AnalyticsUtil from "utils/AnalyticsUtil";
|
2023-03-29 17:07:06 +00:00
|
|
|
import { getAppMode } from "@appsmith/selectors/applicationSelectors";
|
2021-08-27 09:25:28 +00:00
|
|
|
import { APP_MODE } from "entities/App";
|
2022-07-11 04:06:29 +00:00
|
|
|
import { getQueryStringfromObject } from "RouteBuilder";
|
2021-08-27 09:25:28 +00:00
|
|
|
import history from "utils/history";
|
|
|
|
|
import { setDataUrl } from "sagas/PageSagas";
|
|
|
|
|
import AppsmithConsole from "utils/AppsmithConsole";
|
2022-03-25 10:43:26 +00:00
|
|
|
import { builderURL, viewerURL } from "RouteBuilder";
|
2022-09-16 04:30:16 +00:00
|
|
|
import { TriggerFailureError } from "./errorUtils";
|
2023-09-21 01:32:37 +00:00
|
|
|
import { isValidURL, matchesURLPattern } from "utils/URLUtils";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## 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
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
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>
2023-03-16 11:41:47 +00:00
|
|
|
import type { TNavigateToDescription } from "workers/Evaluation/fns/navigateTo";
|
|
|
|
|
import { NavigationTargetType } from "workers/Evaluation/fns/navigateTo";
|
2021-08-27 09:25:28 +00:00
|
|
|
|
2023-02-12 04:15:34 +00:00
|
|
|
export enum NavigationTargetType_Dep {
|
|
|
|
|
SAME_WINDOW = "SAME_WINDOW",
|
|
|
|
|
NEW_WINDOW = "NEW_WINDOW",
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-16 04:30:16 +00:00
|
|
|
const isValidPageName = (
|
|
|
|
|
pageNameOrUrl: string,
|
|
|
|
|
pageList: Page[],
|
|
|
|
|
): Page | undefined => {
|
|
|
|
|
return _.find(pageList, (page: Page) => page.pageName === pageNameOrUrl);
|
|
|
|
|
};
|
|
|
|
|
|
2023-02-11 18:33:20 +00:00
|
|
|
export default function* navigateActionSaga(action: TNavigateToDescription) {
|
|
|
|
|
const { payload } = action;
|
2022-03-25 10:43:26 +00:00
|
|
|
const pageList: Page[] = yield select(getPageList);
|
2023-02-11 18:33:20 +00:00
|
|
|
const { pageNameOrUrl, params, target } = payload;
|
2022-09-16 04:30:16 +00:00
|
|
|
|
|
|
|
|
const page = isValidPageName(pageNameOrUrl, pageList);
|
|
|
|
|
|
2023-09-21 01:32:37 +00:00
|
|
|
if (page) {
|
2022-03-25 10:43:26 +00:00
|
|
|
const currentPageId: string = yield select(getCurrentPageId);
|
2022-09-16 04:30:16 +00:00
|
|
|
|
2021-08-27 09:25:28 +00:00
|
|
|
AnalyticsUtil.logEvent("NAVIGATE", {
|
|
|
|
|
pageName: pageNameOrUrl,
|
|
|
|
|
pageParams: params,
|
|
|
|
|
});
|
2022-09-16 04:30:16 +00:00
|
|
|
|
2022-03-25 10:43:26 +00:00
|
|
|
const appMode: APP_MODE = yield select(getAppMode);
|
2021-08-27 09:25:28 +00:00
|
|
|
const path =
|
|
|
|
|
appMode === APP_MODE.EDIT
|
2022-03-25 10:43:26 +00:00
|
|
|
? builderURL({
|
2021-10-18 14:03:44 +00:00
|
|
|
pageId: page.pageId,
|
|
|
|
|
params,
|
|
|
|
|
})
|
2022-03-25 10:43:26 +00:00
|
|
|
: viewerURL({
|
2021-10-18 14:03:44 +00:00
|
|
|
pageId: page.pageId,
|
|
|
|
|
params,
|
|
|
|
|
});
|
2022-09-16 04:30:16 +00:00
|
|
|
|
2021-08-27 09:25:28 +00:00
|
|
|
if (target === NavigationTargetType.SAME_WINDOW) {
|
|
|
|
|
history.push(path);
|
|
|
|
|
if (currentPageId === page.pageId) {
|
|
|
|
|
yield call(setDataUrl);
|
|
|
|
|
}
|
|
|
|
|
} else if (target === NavigationTargetType.NEW_WINDOW) {
|
|
|
|
|
window.open(path, "_blank");
|
|
|
|
|
}
|
|
|
|
|
AppsmithConsole.info({
|
|
|
|
|
text: `navigateTo('${page.pageName}') was triggered`,
|
|
|
|
|
state: {
|
|
|
|
|
params,
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
} else {
|
2023-09-21 01:32:37 +00:00
|
|
|
let url = pageNameOrUrl + getQueryStringfromObject(params);
|
|
|
|
|
|
|
|
|
|
if (!isValidURL(url)) {
|
|
|
|
|
const looksLikeURL = matchesURLPattern(url);
|
|
|
|
|
|
|
|
|
|
// Filter out cases like navigateTo("1");
|
|
|
|
|
if (!looksLikeURL)
|
|
|
|
|
throw new TriggerFailureError("Enter a valid URL or page name");
|
|
|
|
|
|
|
|
|
|
// Default to https protocol to support navigation to URLs like www.google.com
|
|
|
|
|
url = `https://${url}`;
|
|
|
|
|
if (!isValidURL(url))
|
|
|
|
|
throw new TriggerFailureError("Enter a valid URL or page name");
|
|
|
|
|
}
|
|
|
|
|
if (target === NavigationTargetType.SAME_WINDOW) {
|
|
|
|
|
window.location.assign(url);
|
|
|
|
|
} else if (target === NavigationTargetType.NEW_WINDOW) {
|
|
|
|
|
window.open(url, "_blank");
|
|
|
|
|
}
|
|
|
|
|
AppsmithConsole.info({
|
|
|
|
|
text: `navigateTo('${url}') was triggered`,
|
|
|
|
|
state: {
|
|
|
|
|
params,
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
AnalyticsUtil.logEvent("NAVIGATE", {
|
|
|
|
|
navUrl: pageNameOrUrl,
|
|
|
|
|
});
|
2021-08-27 09:25:28 +00:00
|
|
|
}
|
|
|
|
|
}
|