## 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>
289 lines
7.3 KiB
TypeScript
289 lines
7.3 KiB
TypeScript
import Api from "api/Api";
|
|
import type { ApiResponse } from "./ApiResponses";
|
|
import type { AxiosPromise, CancelTokenSource } from "axios";
|
|
import axios from "axios";
|
|
import type {
|
|
LayoutOnLoadActionErrors,
|
|
PageAction,
|
|
} from "constants/AppsmithActionConstants/ActionConstants";
|
|
import type { DSLWidget } from "widgets/constants";
|
|
import type {
|
|
ClonePageActionPayload,
|
|
CreatePageActionPayload,
|
|
} from "actions/pageActions";
|
|
import type { FetchApplicationResponse } from "./ApplicationApi";
|
|
|
|
export type FetchPageRequest = {
|
|
id: string;
|
|
isFirstLoad?: boolean;
|
|
handleResponseLater?: boolean;
|
|
};
|
|
|
|
export type FetchPublishedPageRequest = {
|
|
pageId: string;
|
|
bustCache?: boolean;
|
|
};
|
|
|
|
export type SavePageRequest = {
|
|
dsl: DSLWidget;
|
|
layoutId: string;
|
|
pageId: string;
|
|
applicationId: string;
|
|
};
|
|
|
|
export type PageLayout = {
|
|
id: string;
|
|
dsl: Partial<DSLWidget>;
|
|
layoutOnLoadActions: PageAction[][];
|
|
layoutActions: PageAction[];
|
|
layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
|
|
};
|
|
|
|
export type FetchPageResponseData = {
|
|
id: string;
|
|
name: string;
|
|
slug: string;
|
|
applicationId: string;
|
|
layouts: Array<PageLayout>;
|
|
lastUpdatedTime: number;
|
|
customSlug?: string;
|
|
userPermissions?: string[];
|
|
layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
|
|
};
|
|
|
|
export type FetchPublishedPageResponseData = FetchPageResponseData;
|
|
|
|
export type SavePageResponseData = {
|
|
id: string;
|
|
layoutOnLoadActions: PageAction[][];
|
|
dsl: Partial<DSLWidget>;
|
|
messages: string[];
|
|
actionUpdates: Array<{
|
|
executeOnLoad: boolean;
|
|
id: string;
|
|
name: string;
|
|
collectionId?: string;
|
|
}>;
|
|
layoutOnLoadActionErrors?: Array<LayoutOnLoadActionErrors>;
|
|
};
|
|
|
|
export type CreatePageRequest = Omit<
|
|
CreatePageActionPayload,
|
|
"blockNavigation"
|
|
>;
|
|
|
|
export type UpdatePageRequest = {
|
|
id: string;
|
|
name?: string;
|
|
isHidden?: boolean;
|
|
customSlug?: string;
|
|
};
|
|
|
|
export type UpdatePageResponse = {
|
|
id: string;
|
|
name: string;
|
|
slug: string;
|
|
customSlug?: string;
|
|
applicationId: string;
|
|
layouts: Array<PageLayout>;
|
|
isHidden: boolean;
|
|
lastUpdatedTime: number;
|
|
defaultResources: unknown[];
|
|
};
|
|
|
|
export type SetPageOrderRequest = {
|
|
order: number;
|
|
pageId: string;
|
|
applicationId: string;
|
|
};
|
|
|
|
export type CreatePageResponse = ApiResponse;
|
|
|
|
export type FetchPageListResponseData = {
|
|
pages: Array<{
|
|
id: string;
|
|
name: string;
|
|
isDefault: boolean;
|
|
isHidden?: boolean;
|
|
layouts: Array<PageLayout>;
|
|
slug: string;
|
|
userPermissions?: string[];
|
|
description?: string;
|
|
}>;
|
|
workspaceId: string;
|
|
};
|
|
|
|
export interface DeletePageRequest {
|
|
id: string;
|
|
}
|
|
|
|
export type ClonePageRequest = Omit<ClonePageActionPayload, "blockNavigation">;
|
|
|
|
export interface UpdateWidgetNameRequest {
|
|
pageId: string;
|
|
layoutId: string;
|
|
newName: string;
|
|
oldName: string;
|
|
}
|
|
|
|
export interface GenerateTemplatePageRequest {
|
|
pageId: string;
|
|
tableName: string;
|
|
datasourceId: string;
|
|
applicationId: string;
|
|
columns?: string[];
|
|
searchColumn?: string;
|
|
mode?: string;
|
|
pluginSpecificParams?: Record<any, any>;
|
|
}
|
|
|
|
export type GenerateTemplatePageResponseData = {
|
|
id: string;
|
|
name: string;
|
|
applicationId: string;
|
|
layouts: Array<PageLayout>;
|
|
};
|
|
|
|
export type SavePageResponse = ApiResponse<SavePageResponseData>;
|
|
|
|
export type FetchPageListResponse = ApiResponse<FetchPageListResponseData>;
|
|
|
|
export type UpdateWidgetNameResponse = ApiResponse<PageLayout>;
|
|
|
|
export type GenerateTemplatePageRequestResponse =
|
|
ApiResponse<GenerateTemplatePageResponseData>;
|
|
|
|
export type FetchPageResponse = ApiResponse<FetchPageResponseData>;
|
|
|
|
export type FetchPublishedPageResponse =
|
|
ApiResponse<FetchPublishedPageResponseData>;
|
|
|
|
class PageApi extends Api {
|
|
static url = "v1/pages";
|
|
static refactorLayoutURL = "v1/layouts/refactor";
|
|
static pageUpdateCancelTokenSource?: CancelTokenSource = undefined;
|
|
static getLayoutUpdateURL = (
|
|
applicationId: string,
|
|
pageId: string,
|
|
layoutId: string,
|
|
) => {
|
|
return `v1/layouts/${layoutId}/pages/${pageId}?applicationId=${applicationId}`;
|
|
};
|
|
|
|
static getGenerateTemplateURL = (pageId?: string) => {
|
|
return `${PageApi.url}/crud-page${pageId ? `/${pageId}` : ""}`;
|
|
};
|
|
|
|
static getPublishedPageURL = (pageId: string, bustCache?: boolean) => {
|
|
const url = `v1/pages/${pageId}/view`;
|
|
return !!bustCache ? url + "?v=" + +new Date() : url;
|
|
};
|
|
|
|
static updatePageUrl = (pageId: string) => `${PageApi.url}/${pageId}`;
|
|
static setPageOrderUrl = (
|
|
applicationId: string,
|
|
pageId: string,
|
|
order: number,
|
|
) => `v1/applications/${applicationId}/page/${pageId}/reorder?order=${order}`;
|
|
|
|
static fetchPage(
|
|
pageRequest: FetchPageRequest,
|
|
): AxiosPromise<FetchPageResponse> {
|
|
return Api.get(PageApi.url + "/" + pageRequest.id);
|
|
}
|
|
|
|
static savePage(
|
|
savePageRequest: SavePageRequest,
|
|
): AxiosPromise<SavePageResponse> | undefined {
|
|
if (PageApi.pageUpdateCancelTokenSource) {
|
|
PageApi.pageUpdateCancelTokenSource.cancel();
|
|
}
|
|
const body = { dsl: savePageRequest.dsl };
|
|
PageApi.pageUpdateCancelTokenSource = axios.CancelToken.source();
|
|
return Api.put(
|
|
PageApi.getLayoutUpdateURL(
|
|
savePageRequest.applicationId,
|
|
savePageRequest.pageId,
|
|
savePageRequest.layoutId,
|
|
),
|
|
body,
|
|
undefined,
|
|
{ cancelToken: PageApi.pageUpdateCancelTokenSource.token },
|
|
);
|
|
}
|
|
|
|
static fetchPublishedPage(
|
|
pageRequest: FetchPublishedPageRequest,
|
|
): AxiosPromise<FetchPublishedPageResponse> {
|
|
return Api.get(
|
|
PageApi.getPublishedPageURL(pageRequest.pageId, pageRequest.bustCache),
|
|
);
|
|
}
|
|
|
|
static createPage(
|
|
createPageRequest: CreatePageRequest,
|
|
): AxiosPromise<FetchPageResponse> {
|
|
return Api.post(PageApi.url, createPageRequest);
|
|
}
|
|
|
|
static updatePage(
|
|
request: UpdatePageRequest,
|
|
): AxiosPromise<ApiResponse<UpdatePageResponse>> {
|
|
return Api.put(PageApi.updatePageUrl(request.id), request);
|
|
}
|
|
|
|
static generateTemplatePage(
|
|
request: GenerateTemplatePageRequest,
|
|
): AxiosPromise<ApiResponse> {
|
|
if (request.pageId) {
|
|
return Api.put(PageApi.getGenerateTemplateURL(request.pageId), request);
|
|
} else {
|
|
return Api.post(PageApi.getGenerateTemplateURL(), request);
|
|
}
|
|
}
|
|
|
|
static fetchPageList(
|
|
applicationId: string,
|
|
): AxiosPromise<FetchPageListResponse> {
|
|
return Api.get(PageApi.url + "/application/" + applicationId);
|
|
}
|
|
|
|
static fetchPageListViewMode(
|
|
applicationId: string,
|
|
): AxiosPromise<FetchPageListResponse> {
|
|
return Api.get(PageApi.url + "/view/application/" + applicationId);
|
|
}
|
|
|
|
static deletePage(request: DeletePageRequest): AxiosPromise<ApiResponse> {
|
|
return Api.delete(PageApi.url + "/" + request.id);
|
|
}
|
|
|
|
static clonePage(request: ClonePageRequest): AxiosPromise<ApiResponse> {
|
|
return Api.post(PageApi.url + "/clone/" + request.id);
|
|
}
|
|
|
|
static updateWidgetName(
|
|
request: UpdateWidgetNameRequest,
|
|
): AxiosPromise<UpdateWidgetNameResponse> {
|
|
return Api.put(PageApi.refactorLayoutURL, request);
|
|
}
|
|
|
|
static setPageOrder(
|
|
request: SetPageOrderRequest,
|
|
): AxiosPromise<FetchPageListResponse> {
|
|
return Api.put(
|
|
PageApi.setPageOrderUrl(
|
|
request.applicationId,
|
|
request.pageId,
|
|
request.order,
|
|
),
|
|
);
|
|
}
|
|
|
|
static fetchAppAndPages(params: any): AxiosPromise<FetchApplicationResponse> {
|
|
return Api.get(PageApi.url, params);
|
|
}
|
|
}
|
|
|
|
export default PageApi;
|