2022-02-04 10:59:54 +00:00
|
|
|
import React, { Component } from "react";
|
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 { AppState } from "@appsmith/reducers";
|
2021-11-23 06:05:01 +00:00
|
|
|
import { connect } from "react-redux";
|
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 { Placement } from "popper.js";
|
2021-11-23 06:05:01 +00:00
|
|
|
import * as Sentry from "@sentry/react";
|
|
|
|
|
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 { ControlProps } from "./BaseControl";
|
|
|
|
|
import BaseControl from "./BaseControl";
|
|
|
|
|
import type { Indices } from "constants/Layers";
|
2021-02-16 10:29:08 +00:00
|
|
|
import EmptyDataState from "components/utils/EmptyDataState";
|
2021-11-23 06:05:01 +00:00
|
|
|
import EvaluatedValuePopup from "components/editorComponents/CodeEditor/EvaluatedValuePopup";
|
|
|
|
|
import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
|
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 { CodeEditorExpected } from "components/editorComponents/CodeEditor";
|
|
|
|
|
import type { ColumnProperties } from "widgets/TableWidget/component/Constants";
|
2021-02-16 10:29:08 +00:00
|
|
|
import {
|
|
|
|
|
getDefaultColumnProperties,
|
|
|
|
|
getTableStyles,
|
2021-09-09 15:10:22 +00:00
|
|
|
} from "widgets/TableWidget/component/TableUtilities";
|
|
|
|
|
import { reorderColumns } from "widgets/TableWidget/component/TableHelpers";
|
2023-10-10 12:32:17 +00:00
|
|
|
import type { DataTree } from "entities/DataTree/dataTreeTypes";
|
2021-11-23 06:05:01 +00:00
|
|
|
import { getDataTreeForAutocomplete } from "selectors/dataTreeSelectors";
|
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 { EvaluationError } from "utils/DynamicBindingUtils";
|
|
|
|
|
import { getEvalErrorPath, getEvalValuePath } from "utils/DynamicBindingUtils";
|
2021-11-23 06:05:01 +00:00
|
|
|
import { getNextEntityName } from "utils/AppsmithUtils";
|
2022-12-08 07:21:58 +00:00
|
|
|
import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl";
|
2022-10-05 11:03:42 +00:00
|
|
|
import { DraggableListCard } from "components/propertyControls/DraggableListCard";
|
2023-05-19 18:37:06 +00:00
|
|
|
import { Button } from "design-system";
|
2021-02-16 10:29:08 +00:00
|
|
|
|
2021-11-23 06:05:01 +00:00
|
|
|
interface ReduxStateProps {
|
|
|
|
|
dynamicData: DataTree;
|
|
|
|
|
datasources: any;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type EvaluatedValuePopupWrapperProps = ReduxStateProps & {
|
|
|
|
|
isFocused: boolean;
|
|
|
|
|
theme: EditorTheme;
|
|
|
|
|
popperPlacement?: Placement;
|
|
|
|
|
popperZIndex?: Indices;
|
|
|
|
|
dataTreePath?: string;
|
|
|
|
|
evaluatedValue?: any;
|
|
|
|
|
expected?: CodeEditorExpected;
|
|
|
|
|
hideEvaluatedValue?: boolean;
|
|
|
|
|
useValidationMessage?: boolean;
|
|
|
|
|
children: JSX.Element;
|
|
|
|
|
};
|
|
|
|
|
|
2021-02-16 10:29:08 +00:00
|
|
|
const getOriginalColumn = (
|
|
|
|
|
columns: Record<string, ColumnProperties>,
|
|
|
|
|
index: number,
|
|
|
|
|
columnOrder?: string[],
|
|
|
|
|
): ColumnProperties | undefined => {
|
|
|
|
|
const reorderedColumns = reorderColumns(columns, columnOrder || []);
|
|
|
|
|
const column: ColumnProperties | undefined = Object.values(
|
|
|
|
|
reorderedColumns,
|
|
|
|
|
).find((column: ColumnProperties) => column.index === index);
|
|
|
|
|
return column;
|
|
|
|
|
};
|
|
|
|
|
|
2023-10-11 07:35:24 +00:00
|
|
|
interface State {
|
2021-11-23 06:05:01 +00:00
|
|
|
focusedIndex: number | null;
|
|
|
|
|
duplicateColumnIds: string[];
|
2023-10-11 07:35:24 +00:00
|
|
|
}
|
2021-11-23 06:05:01 +00:00
|
|
|
|
|
|
|
|
class PrimaryColumnsControl extends BaseControl<ControlProps, State> {
|
|
|
|
|
constructor(props: ControlProps) {
|
|
|
|
|
super(props);
|
|
|
|
|
|
|
|
|
|
const columns: Record<string, ColumnProperties> = props.propertyValue || {};
|
|
|
|
|
const columnOrder = Object.keys(columns);
|
|
|
|
|
const reorderedColumns = reorderColumns(columns, columnOrder);
|
|
|
|
|
const tableColumnLabels = _.map(reorderedColumns, "label");
|
|
|
|
|
const duplicateColumnIds = [];
|
|
|
|
|
|
|
|
|
|
for (let index = 0; index < tableColumnLabels.length; index++) {
|
|
|
|
|
const currLabel = tableColumnLabels[index] as string;
|
|
|
|
|
const duplicateValueIndex = tableColumnLabels.indexOf(currLabel);
|
|
|
|
|
if (duplicateValueIndex !== index) {
|
|
|
|
|
// get column id from columnOrder index
|
|
|
|
|
duplicateColumnIds.push(reorderedColumns[columnOrder[index]].id);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.state = {
|
|
|
|
|
focusedIndex: null,
|
|
|
|
|
duplicateColumnIds,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-04 10:59:54 +00:00
|
|
|
componentDidUpdate(prevProps: ControlProps): void {
|
|
|
|
|
//on adding a new column last column should get focused
|
|
|
|
|
if (
|
|
|
|
|
Object.keys(prevProps.propertyValue).length + 1 ===
|
|
|
|
|
Object.keys(this.props.propertyValue).length
|
|
|
|
|
) {
|
|
|
|
|
this.updateFocus(Object.keys(this.props.propertyValue).length - 1, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-02-16 10:29:08 +00:00
|
|
|
render() {
|
|
|
|
|
// Get columns from widget properties
|
|
|
|
|
const columns: Record<string, ColumnProperties> =
|
|
|
|
|
this.props.propertyValue || {};
|
|
|
|
|
|
|
|
|
|
// If there are no columns, show empty state
|
|
|
|
|
if (Object.keys(columns).length === 0) {
|
|
|
|
|
return <EmptyDataState />;
|
|
|
|
|
}
|
|
|
|
|
// Get an empty array of length of columns
|
|
|
|
|
let columnOrder: string[] = new Array(Object.keys(columns).length);
|
|
|
|
|
|
|
|
|
|
if (this.props.widgetProperties.columnOrder) {
|
|
|
|
|
columnOrder = this.props.widgetProperties.columnOrder;
|
|
|
|
|
} else {
|
|
|
|
|
columnOrder = Object.keys(columns);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const reorderedColumns = reorderColumns(columns, columnOrder);
|
|
|
|
|
|
|
|
|
|
const draggableComponentColumns = Object.values(reorderedColumns).map(
|
|
|
|
|
(column: ColumnProperties) => {
|
|
|
|
|
return {
|
feat: JSON Form widget (#8472)
* initial layout
* updated parser to support nested array
* array field rendering
* changes
* ts fix
* minor revert FormWidget
* modified schema structure
* select and switch fields
* added checkbox field
* added RadioGroupField
* partial DateField and defaults, typing refactoring
* added label and field type change
* minor ts changes
* changes
* modified widget/utils for nested panelConfig, modified schema to object approach
* array/object label support
* hide field configuration when children not present
* added tooltip
* field visibility option
* disabled state
* upgraded tslib, form initial values
* custom field configuration - add/hide/edit
* field configuration - label change
* return input when field configuration reaches max depth
* minor changes
* form - scroll, fixedfooter, enitity defn and other minior changes
* form title
* unregister on unmount
* fixes
* zero state
* fix field padding
* patched updating form values, removed linting warnings
* configured action buttons
* minor fix
* minor change
* property pane - sort fields in field configuration
* refactor include all properties
* checkbox properties
* date properties
* refactor typings and radio group properties
* switch, multselect, select, array, object properties
* minor changes
* default value
* ts fixes
* checkbox field properties implementation
* date field prop implementation
* switch field
* select field and fix deep nested meta properties
* multiselect implementation
* minor change
* input field implementation
* fix position jump on field type change
* initial accordian
* field state property and auto-complete of JSONFormComputeControl
* merge fixes
* renamed FormBuilder to JSONForm
* source data validation minor change
* custom field default value fix
* Editable keys for custom field
* minor fixes
* replaced useFieldArray with custom logic, added widget icon
* array and object accordian with border/background styling
* minor change
* disabled states for array and objects
* default value minor fix
* form level styles
* modified logic for isDisabled for array and object, added disabledWhenInvalid, exposed isValid to fieldState for text input, removed useDisableChildren
* added isValid for all field types
* fixed reset to default values
* debounce form values update
* minor change
* minor change
* fix crash - source data change multi-select to array, fix crash - change of options
* fix positioning
* detect date type in source data
* fix crash - when object is passed to regex input field
* fixed default sourceData path for fields
* accodion keep children mounted on collapse
* jest test for schemaParser
* widget/helper and useRegisterFieldInvalid test
* tests for property config helper and generatePanelPropertyConfig
* fix input field validation not appearing
* fix date field type detection
* rename data -> formData
* handle null/undefined field value change in sourceData
* added null/undefined as valid values for defaultValue text field
* auto detect email field
* set formData default value on initial load
* switch field inline positioning
* field margin fix for row direction
* select full width
* fiex date field default value - out of range
* fix any field type to array
* array default value logic change
* base cypress test changes
* initial json form render cy test
* key sanitization
* fix fieldState update logic
* required design, object/array background color, accordion changes, fix - add new custom field
* minor change
* cypress tests
* fix date formatted value, field state cypress test
* cypress - field properties test and fixes
* rename test file
* fix accessort change to blank value, cypress tests
* fix array field default value for modified accessor
* minor fix
* added animate loading
* fix empty state, add new custom field
* test data fix
* fix warnings
* fix timePrecision visibility
* button styling
* ported input v2
* fix jest tests
* fix cypress tests
* perf changes
* perf improvement
* added comments
* multiselect changes
* input field perf refactor
* array field, object field refactor performance
* checkbox field refactor
* refectored date, radio, select and switch
* fixes
* test fixes
* fixes
* minor fix
* rename field renderer
* remove tracked fieldRenderer field
* cypress test fixes
* cypress changes
* array default value fixes
* arrayfield passedDefaultValue
* auto enabled JS mode for few properties, reverted swith and date property controls
* cypress changes
* added widget sniping mode and fixed object passedDefaultValue
* multiselect v2
* select v2
* fix jest tests
* test fixes
* field limit
* rename field type dropdown texts
* field type changes fixes
* jest fixes
* loading state submit button
* default source data for new widget
* modify limit message
* multiseelct default value changes and cypress fix
* select default value
* keep default value intact on field type change
* TextTable cypress text fix
* review changes
* fixed footer changes
* collapse styles section by default
* fixed footer changes
* form modes
* custom field key rentention
* fixed footer fix in view mode
* non ascii characters
* fix meta merge in dataTreeWidget
* minor fixes
* rename useRegisterFieldInvalid.ts -> useRegisterFieldValidity.ts
* modified dependency injection into evaluated values
* refactored fixedfooter logic
* minor change
* accessor update
* minor change
* fixes
* QA fixes date field, scroll content
* fix phone number field, removed visiblity option from array item
* fix sourceData autocomplete
* reset logic
* fix multiselect reset
* form values hydration on widget drag
* code review changes
* reverted order of merge dataTreeWidget
* fixes
* added button titles, fixed hydration issue
* default value fixes
* upgraded react hook form, modified array-level/field-level default value logic
* fixed select validation
* added icon entity explorer, modified icon align control
* modify accessor validation for mongo db _id
* update email field regex
* review changes
* explicitly handle empty source data validation
2022-03-24 07:13:25 +00:00
|
|
|
label: column.label || "",
|
2021-02-16 10:29:08 +00:00
|
|
|
id: column.id,
|
|
|
|
|
isVisible: column.isVisible,
|
|
|
|
|
isDerived: column.isDerived,
|
|
|
|
|
index: column.index,
|
2021-11-23 06:05:01 +00:00
|
|
|
isDuplicateLabel: _.includes(
|
|
|
|
|
this.state.duplicateColumnIds,
|
|
|
|
|
column.id,
|
|
|
|
|
),
|
2021-02-16 10:29:08 +00:00
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
2021-11-23 06:05:01 +00:00
|
|
|
const column: ColumnProperties | undefined = Object.values(
|
|
|
|
|
reorderedColumns,
|
|
|
|
|
).find(
|
|
|
|
|
(column: ColumnProperties) => column.index === this.state.focusedIndex,
|
|
|
|
|
);
|
|
|
|
|
// show popup on duplicate column label input focused
|
|
|
|
|
const isFocused =
|
|
|
|
|
!_.isNull(this.state.focusedIndex) &&
|
|
|
|
|
_.includes(this.state.duplicateColumnIds, column?.id);
|
2021-02-16 10:29:08 +00:00
|
|
|
return (
|
2023-05-19 18:37:06 +00:00
|
|
|
<div className="flex flex-col w-full gap-1">
|
2021-11-23 06:05:01 +00:00
|
|
|
<EvaluatedValuePopupWrapper {...this.props} isFocused={isFocused}>
|
2022-12-08 07:21:58 +00:00
|
|
|
<DraggableListControl
|
2021-11-23 06:05:01 +00:00
|
|
|
deleteOption={this.deleteOption}
|
2022-02-04 10:59:54 +00:00
|
|
|
fixedHeight={370}
|
|
|
|
|
focusedIndex={this.state.focusedIndex}
|
2021-11-23 06:05:01 +00:00
|
|
|
itemHeight={45}
|
|
|
|
|
items={draggableComponentColumns}
|
|
|
|
|
onEdit={this.onEdit}
|
2022-12-08 07:21:58 +00:00
|
|
|
propertyPath={this.props.dataTreePath}
|
|
|
|
|
renderComponent={(props: any) =>
|
2022-02-04 10:59:54 +00:00
|
|
|
DraggableListCard({
|
|
|
|
|
...props,
|
|
|
|
|
isDelete: false,
|
2023-05-31 16:02:33 +00:00
|
|
|
placeholder: "Column title",
|
2022-02-04 10:59:54 +00:00
|
|
|
})
|
|
|
|
|
}
|
2021-11-23 06:05:01 +00:00
|
|
|
toggleVisibility={this.toggleVisibility}
|
2021-12-29 13:21:30 +00:00
|
|
|
updateFocus={this.updateFocus}
|
2021-11-23 06:05:01 +00:00
|
|
|
updateItems={this.updateItems}
|
|
|
|
|
updateOption={this.updateOption}
|
|
|
|
|
/>
|
|
|
|
|
</EvaluatedValuePopupWrapper>
|
2021-03-15 12:17:56 +00:00
|
|
|
|
2023-05-19 18:37:06 +00:00
|
|
|
<Button
|
|
|
|
|
className="self-end t--add-column-btn"
|
|
|
|
|
kind="tertiary"
|
2021-02-16 10:29:08 +00:00
|
|
|
onClick={this.addNewColumn}
|
2023-05-19 18:37:06 +00:00
|
|
|
size="md"
|
|
|
|
|
startIcon="plus"
|
|
|
|
|
>
|
|
|
|
|
Add new column
|
|
|
|
|
</Button>
|
|
|
|
|
</div>
|
2021-02-16 10:29:08 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
addNewColumn = () => {
|
|
|
|
|
const columns: Record<string, ColumnProperties> =
|
|
|
|
|
this.props.propertyValue || {};
|
|
|
|
|
const columnIds = Object.keys(columns);
|
|
|
|
|
const newColumnName = getNextEntityName("customColumn", columnIds);
|
|
|
|
|
const nextIndex = columnIds.length;
|
|
|
|
|
const columnProps: ColumnProperties = getDefaultColumnProperties(
|
|
|
|
|
newColumnName,
|
|
|
|
|
nextIndex,
|
2022-05-04 09:45:57 +00:00
|
|
|
this.props.widgetProperties,
|
2021-02-16 10:29:08 +00:00
|
|
|
true,
|
|
|
|
|
);
|
|
|
|
|
const tableStyles = getTableStyles(this.props.widgetProperties);
|
|
|
|
|
const column = {
|
|
|
|
|
...columnProps,
|
2021-03-02 03:13:43 +00:00
|
|
|
buttonStyle: "rgb(3, 179, 101)",
|
2021-08-17 12:54:43 +00:00
|
|
|
isDisabled: false,
|
2021-02-16 10:29:08 +00:00
|
|
|
...tableStyles,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
this.updateProperty(`${this.props.propertyName}.${column.id}`, column);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
onEdit = (index: number) => {
|
|
|
|
|
const columns: Record<string, ColumnProperties> =
|
|
|
|
|
this.props.propertyValue || [];
|
|
|
|
|
|
|
|
|
|
const originalColumn = getOriginalColumn(
|
|
|
|
|
columns,
|
|
|
|
|
index,
|
|
|
|
|
this.props.widgetProperties.columnOrder,
|
|
|
|
|
);
|
|
|
|
|
|
2021-03-29 15:47:22 +00:00
|
|
|
this.props.openNextPanel({
|
|
|
|
|
...originalColumn,
|
2021-04-27 07:16:54 +00:00
|
|
|
propPaneId: this.props.widgetProperties.widgetId,
|
2021-03-29 15:47:22 +00:00
|
|
|
});
|
2021-02-16 10:29:08 +00:00
|
|
|
};
|
|
|
|
|
//Used to reorder columns
|
|
|
|
|
updateItems = (items: Array<Record<string, unknown>>) => {
|
|
|
|
|
this.updateProperty(
|
|
|
|
|
"columnOrder",
|
|
|
|
|
items.map(({ id }) => id),
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
toggleVisibility = (index: number) => {
|
|
|
|
|
const columns: Record<string, ColumnProperties> =
|
|
|
|
|
this.props.propertyValue || {};
|
|
|
|
|
const originalColumn = getOriginalColumn(
|
|
|
|
|
columns,
|
|
|
|
|
index,
|
|
|
|
|
this.props.widgetProperties.columnOrder,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (originalColumn) {
|
|
|
|
|
this.updateProperty(
|
|
|
|
|
`${this.props.propertyName}.${originalColumn.id}.isVisible`,
|
|
|
|
|
!originalColumn.isVisible,
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
deleteOption = (index: number) => {
|
|
|
|
|
const columns: Record<string, ColumnProperties> =
|
|
|
|
|
this.props.propertyValue || {};
|
|
|
|
|
const derivedColumns = this.props.widgetProperties.derivedColumns || {};
|
2021-03-15 05:27:34 +00:00
|
|
|
const columnOrder = this.props.widgetProperties.columnOrder || [];
|
2021-02-16 10:29:08 +00:00
|
|
|
|
2021-03-15 05:27:34 +00:00
|
|
|
const originalColumn = getOriginalColumn(columns, index, columnOrder);
|
2021-02-16 10:29:08 +00:00
|
|
|
|
|
|
|
|
if (originalColumn) {
|
|
|
|
|
const propertiesToDelete = [
|
|
|
|
|
`${this.props.propertyName}.${originalColumn.id}`,
|
|
|
|
|
];
|
|
|
|
|
if (derivedColumns[originalColumn.id])
|
|
|
|
|
propertiesToDelete.push(`derivedColumns.${originalColumn.id}`);
|
|
|
|
|
|
2021-03-15 05:27:34 +00:00
|
|
|
const columnOrderIndex = columnOrder.findIndex(
|
2021-02-16 10:29:08 +00:00
|
|
|
(column: string) => column === originalColumn.id,
|
|
|
|
|
);
|
|
|
|
|
if (columnOrderIndex > -1)
|
|
|
|
|
propertiesToDelete.push(`columnOrder[${columnOrderIndex}]`);
|
|
|
|
|
|
|
|
|
|
this.deleteProperties(propertiesToDelete);
|
2021-11-23 06:05:01 +00:00
|
|
|
// if column deleted, clean up duplicateIndexes
|
|
|
|
|
let duplicateColumnIds = [...this.state.duplicateColumnIds];
|
|
|
|
|
duplicateColumnIds = duplicateColumnIds.filter(
|
|
|
|
|
(id) => id !== originalColumn.id,
|
|
|
|
|
);
|
|
|
|
|
this.setState({ duplicateColumnIds });
|
2021-02-16 10:29:08 +00:00
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
updateOption = (index: number, updatedLabel: string) => {
|
|
|
|
|
const columns: Record<string, ColumnProperties> =
|
|
|
|
|
this.props.propertyValue || {};
|
|
|
|
|
const originalColumn = getOriginalColumn(
|
|
|
|
|
columns,
|
|
|
|
|
index,
|
|
|
|
|
this.props.widgetProperties.columnOrder,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (originalColumn) {
|
|
|
|
|
this.updateProperty(
|
|
|
|
|
`${this.props.propertyName}.${originalColumn.id}.label`,
|
|
|
|
|
updatedLabel,
|
|
|
|
|
);
|
2021-11-23 06:05:01 +00:00
|
|
|
// check entered label is unique or duplicate
|
|
|
|
|
const tableColumnLabels = _.map(columns, "label");
|
|
|
|
|
let duplicateColumnIds = [...this.state.duplicateColumnIds];
|
|
|
|
|
// if duplicate, add into array
|
|
|
|
|
if (_.includes(tableColumnLabels, updatedLabel)) {
|
|
|
|
|
duplicateColumnIds.push(originalColumn.id);
|
|
|
|
|
this.setState({ duplicateColumnIds });
|
|
|
|
|
} else {
|
|
|
|
|
duplicateColumnIds = duplicateColumnIds.filter(
|
|
|
|
|
(id) => id !== originalColumn.id,
|
|
|
|
|
);
|
|
|
|
|
this.setState({ duplicateColumnIds });
|
|
|
|
|
}
|
2021-02-16 10:29:08 +00:00
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2021-11-23 06:05:01 +00:00
|
|
|
updateFocus = (index: number, isFocused: boolean) => {
|
|
|
|
|
this.setState({ focusedIndex: isFocused ? index : null });
|
|
|
|
|
};
|
|
|
|
|
|
2022-02-04 10:59:54 +00:00
|
|
|
// updateCurrentFocusedInput = (index: number | null) => {};
|
|
|
|
|
|
2021-02-16 10:29:08 +00:00
|
|
|
static getControlType() {
|
|
|
|
|
return "PRIMARY_COLUMNS";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export default PrimaryColumnsControl;
|
2021-11-23 06:05:01 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* wrapper component on dragable primary columns
|
|
|
|
|
* render popup if primary column labels are not unique
|
|
|
|
|
* show unique name error in PRIMARY_COLUMNS
|
|
|
|
|
*/
|
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
|
|
|
class EvaluatedValuePopupWrapperClass extends Component<EvaluatedValuePopupWrapperProps> {
|
2021-11-23 06:05:01 +00:00
|
|
|
getPropertyValidation = (
|
|
|
|
|
dataTree: DataTree,
|
|
|
|
|
dataTreePath?: string,
|
|
|
|
|
): {
|
|
|
|
|
isInvalid: boolean;
|
|
|
|
|
errors: EvaluationError[];
|
|
|
|
|
pathEvaluatedValue: unknown;
|
|
|
|
|
} => {
|
|
|
|
|
if (!dataTreePath) {
|
|
|
|
|
return {
|
|
|
|
|
isInvalid: false,
|
|
|
|
|
errors: [],
|
|
|
|
|
pathEvaluatedValue: undefined,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const errors = _.get(
|
|
|
|
|
dataTree,
|
|
|
|
|
getEvalErrorPath(dataTreePath),
|
|
|
|
|
[],
|
|
|
|
|
) as EvaluationError[];
|
|
|
|
|
|
|
|
|
|
const pathEvaluatedValue = _.get(dataTree, getEvalValuePath(dataTreePath));
|
|
|
|
|
|
|
|
|
|
return {
|
2022-11-03 09:23:15 +00:00
|
|
|
isInvalid: errors.length > 0,
|
|
|
|
|
errors,
|
2021-11-23 06:05:01 +00:00
|
|
|
pathEvaluatedValue,
|
|
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
render = () => {
|
|
|
|
|
const {
|
|
|
|
|
dataTreePath,
|
|
|
|
|
dynamicData,
|
|
|
|
|
evaluatedValue,
|
|
|
|
|
expected,
|
|
|
|
|
hideEvaluatedValue,
|
|
|
|
|
useValidationMessage,
|
|
|
|
|
} = this.props;
|
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
|
|
|
const { errors, isInvalid, pathEvaluatedValue } =
|
|
|
|
|
this.getPropertyValidation(dynamicData, dataTreePath);
|
2021-11-23 06:05:01 +00:00
|
|
|
let evaluated = evaluatedValue;
|
|
|
|
|
if (dataTreePath) {
|
|
|
|
|
evaluated = pathEvaluatedValue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<EvaluatedValuePopup
|
|
|
|
|
errors={errors}
|
|
|
|
|
evaluatedValue={evaluated}
|
|
|
|
|
expected={expected}
|
|
|
|
|
hasError={isInvalid}
|
|
|
|
|
hideEvaluatedValue={hideEvaluatedValue}
|
|
|
|
|
isOpen={this.props.isFocused && isInvalid}
|
|
|
|
|
popperPlacement={this.props.popperPlacement}
|
|
|
|
|
popperZIndex={this.props.popperZIndex}
|
|
|
|
|
theme={this.props.theme || EditorTheme.LIGHT}
|
|
|
|
|
useValidationMessage={useValidationMessage}
|
|
|
|
|
>
|
|
|
|
|
{this.props.children}
|
|
|
|
|
</EvaluatedValuePopup>
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
const mapStateToProps = (state: AppState): ReduxStateProps => ({
|
|
|
|
|
dynamicData: getDataTreeForAutocomplete(state),
|
|
|
|
|
datasources: state.entities.datasources,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const EvaluatedValuePopupWrapper = Sentry.withProfiler(
|
|
|
|
|
connect(mapStateToProps)(EvaluatedValuePopupWrapperClass),
|
|
|
|
|
);
|