## 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>
347 lines
10 KiB
TypeScript
347 lines
10 KiB
TypeScript
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import type {
|
|
PropertyPaneConfig,
|
|
PropertyPaneControlConfig,
|
|
} from "constants/PropertyControlConstants";
|
|
import type { WidgetType } from "constants/WidgetConstants";
|
|
import { GridDefaults, WidgetHeightLimits } from "constants/WidgetConstants";
|
|
import type { WidgetProps } from "widgets/BaseWidget";
|
|
import type { WidgetConfiguration } from "widgets/constants";
|
|
|
|
export enum RegisteredWidgetFeatures {
|
|
DYNAMIC_HEIGHT = "dynamicHeight",
|
|
}
|
|
|
|
interface WidgetFeatureConfig {
|
|
active: boolean;
|
|
defaultValue?: DynamicHeight;
|
|
sectionIndex: number;
|
|
}
|
|
|
|
export type WidgetFeatures = Record<
|
|
RegisteredWidgetFeatures,
|
|
WidgetFeatureConfig
|
|
>;
|
|
|
|
export enum DynamicHeight {
|
|
AUTO_HEIGHT = "AUTO_HEIGHT",
|
|
FIXED = "FIXED",
|
|
AUTO_HEIGHT_WITH_LIMITS = "AUTO_HEIGHT_WITH_LIMITS",
|
|
}
|
|
|
|
/* This contains all properties which will be added
|
|
to a widget, automatically, by the Appsmith platform
|
|
Each feature, is a unique key, whose value is an object
|
|
with the list of properties to be added to a widget along
|
|
with their default values
|
|
|
|
Note: These are added to the widget configs during registration
|
|
*/
|
|
export const WidgetFeatureProps: Record<
|
|
RegisteredWidgetFeatures,
|
|
Record<string, unknown>
|
|
> = {
|
|
[RegisteredWidgetFeatures.DYNAMIC_HEIGHT]: {
|
|
minDynamicHeight: WidgetHeightLimits.MIN_HEIGHT_IN_ROWS,
|
|
maxDynamicHeight: WidgetHeightLimits.MAX_HEIGHT_IN_ROWS,
|
|
dynamicHeight: DynamicHeight.FIXED,
|
|
},
|
|
};
|
|
|
|
export const WidgetFeaturePropertyEnhancements: Record<
|
|
RegisteredWidgetFeatures,
|
|
(config: WidgetConfiguration) => Record<string, unknown>
|
|
> = {
|
|
[RegisteredWidgetFeatures.DYNAMIC_HEIGHT]: (config: WidgetConfiguration) => {
|
|
const newProperties: Partial<WidgetProps> = {};
|
|
newProperties.dynamicHeight =
|
|
config.features?.dynamicHeight?.defaultValue || DynamicHeight.AUTO_HEIGHT;
|
|
if (config.isCanvas) {
|
|
newProperties.dynamicHeight = DynamicHeight.AUTO_HEIGHT;
|
|
newProperties.minDynamicHeight =
|
|
config.defaults.minDynamicHeight ||
|
|
WidgetHeightLimits.MIN_CANVAS_HEIGHT_IN_ROWS;
|
|
newProperties.maxDynamicHeight =
|
|
config.defaults.maxDynamicHeight ||
|
|
WidgetHeightLimits.MAX_HEIGHT_IN_ROWS;
|
|
newProperties.shouldScrollContents = true;
|
|
} else {
|
|
newProperties.minDynamicHeight =
|
|
config.defaults.minDynamicHeight ||
|
|
WidgetHeightLimits.MIN_HEIGHT_IN_ROWS;
|
|
newProperties.maxDynamicHeight =
|
|
config.defaults.maxDynamicHeight ||
|
|
WidgetHeightLimits.MAX_HEIGHT_IN_ROWS;
|
|
}
|
|
if (config.defaults.overflow) newProperties.overflow = "NONE";
|
|
return newProperties;
|
|
},
|
|
};
|
|
|
|
function findAndUpdatePropertyPaneControlConfig(
|
|
config: PropertyPaneConfig[],
|
|
propertyPaneUpdates: Record<string, Record<string, unknown>>,
|
|
): PropertyPaneConfig[] {
|
|
return config.map((sectionConfig: PropertyPaneConfig) => {
|
|
if (
|
|
Array.isArray(sectionConfig.children) &&
|
|
sectionConfig.children.length > 0
|
|
) {
|
|
Object.keys(propertyPaneUpdates).forEach((propertyName: string) => {
|
|
const controlConfigIndex: number | undefined =
|
|
sectionConfig.children?.findIndex(
|
|
(controlConfig: PropertyPaneConfig) =>
|
|
(controlConfig as PropertyPaneControlConfig).propertyName ===
|
|
propertyName,
|
|
);
|
|
|
|
if (
|
|
controlConfigIndex !== undefined &&
|
|
controlConfigIndex > -1 &&
|
|
sectionConfig.children
|
|
) {
|
|
sectionConfig.children[controlConfigIndex] = {
|
|
...sectionConfig.children[controlConfigIndex],
|
|
...propertyPaneUpdates[propertyName],
|
|
};
|
|
}
|
|
});
|
|
}
|
|
return sectionConfig;
|
|
});
|
|
}
|
|
|
|
export const WidgetFeaturePropertyPaneEnhancements: Record<
|
|
RegisteredWidgetFeatures,
|
|
(
|
|
config: PropertyPaneConfig[],
|
|
widgetType?: WidgetType,
|
|
) => PropertyPaneConfig[]
|
|
> = {
|
|
[RegisteredWidgetFeatures.DYNAMIC_HEIGHT]: (
|
|
config: PropertyPaneConfig[],
|
|
widgetType?: WidgetType,
|
|
) => {
|
|
function hideWhenDynamicHeightIsEnabled(props: WidgetProps) {
|
|
return (
|
|
props.dynamicHeight === DynamicHeight.AUTO_HEIGHT_WITH_LIMITS ||
|
|
props.dynamicHeight === DynamicHeight.AUTO_HEIGHT
|
|
);
|
|
}
|
|
let update = findAndUpdatePropertyPaneControlConfig(config, {
|
|
shouldScrollContents: {
|
|
hidden: hideWhenDynamicHeightIsEnabled,
|
|
dependencies: ["dynamicHeight"],
|
|
},
|
|
scrollContents: {
|
|
hidden: hideWhenDynamicHeightIsEnabled,
|
|
dependencies: ["dynamicHeight"],
|
|
},
|
|
fixedFooter: {
|
|
hidden: hideWhenDynamicHeightIsEnabled,
|
|
dependencies: ["dynamicHeight"],
|
|
},
|
|
overflow: {
|
|
hidden: hideWhenDynamicHeightIsEnabled,
|
|
dependencies: ["dynamicHeight"],
|
|
},
|
|
});
|
|
if (widgetType === "MODAL_WIDGET") {
|
|
update = findAndUpdatePropertyPaneControlConfig(update, {
|
|
dynamicHeight: {
|
|
options: [
|
|
{
|
|
label: "Auto Height",
|
|
value: DynamicHeight.AUTO_HEIGHT,
|
|
},
|
|
{
|
|
label: "Fixed",
|
|
value: DynamicHeight.FIXED,
|
|
},
|
|
],
|
|
},
|
|
});
|
|
}
|
|
return update;
|
|
},
|
|
};
|
|
|
|
/* Hide the min height and max height properties using this function
|
|
as the `hidden` hook in the property pane configuration
|
|
This function checks if the `dynamicHeight` property is enabled
|
|
and returns true if disabled, and false if enabled.
|
|
*/
|
|
export function hideDynamicHeightPropertyControl(props: WidgetProps) {
|
|
return props.dynamicHeight !== DynamicHeight.AUTO_HEIGHT_WITH_LIMITS;
|
|
}
|
|
|
|
// TODO (abhinav): ADD_UNIT_TESTS
|
|
function updateMinMaxDynamicHeight(
|
|
props: WidgetProps,
|
|
propertyName: string,
|
|
propertyValue: unknown,
|
|
) {
|
|
const updates = [
|
|
{
|
|
propertyPath: propertyName,
|
|
propertyValue: propertyValue,
|
|
},
|
|
];
|
|
|
|
if (propertyValue === DynamicHeight.AUTO_HEIGHT_WITH_LIMITS) {
|
|
const minDynamicHeight = parseInt(props.minDynamicHeight, 10);
|
|
|
|
if (
|
|
isNaN(minDynamicHeight) ||
|
|
minDynamicHeight < WidgetHeightLimits.MIN_HEIGHT_IN_ROWS
|
|
) {
|
|
updates.push({
|
|
propertyPath: "minDynamicHeight",
|
|
propertyValue: WidgetHeightLimits.MIN_HEIGHT_IN_ROWS,
|
|
});
|
|
}
|
|
const maxDynamicHeight = parseInt(props.maxDynamicHeight, 10);
|
|
if (
|
|
isNaN(maxDynamicHeight) ||
|
|
maxDynamicHeight === WidgetHeightLimits.MAX_HEIGHT_IN_ROWS ||
|
|
maxDynamicHeight <= WidgetHeightLimits.MIN_HEIGHT_IN_ROWS
|
|
) {
|
|
updates.push({
|
|
propertyPath: "maxDynamicHeight",
|
|
propertyValue:
|
|
props.bottomRow - props.topRow + GridDefaults.CANVAS_EXTENSION_OFFSET,
|
|
});
|
|
}
|
|
|
|
// Case where maxDynamicHeight is zero
|
|
if (isNaN(maxDynamicHeight) || maxDynamicHeight === 0) {
|
|
updates.push({
|
|
propertyPath: "maxDynamicHeight",
|
|
propertyValue: props.bottomRow - props.topRow,
|
|
});
|
|
}
|
|
} else if (propertyValue === DynamicHeight.AUTO_HEIGHT) {
|
|
const minHeightInRows = props.isCanvas
|
|
? WidgetHeightLimits.MIN_CANVAS_HEIGHT_IN_ROWS
|
|
: WidgetHeightLimits.MIN_HEIGHT_IN_ROWS;
|
|
updates.push(
|
|
{
|
|
propertyPath: "minDynamicHeight",
|
|
propertyValue: minHeightInRows,
|
|
},
|
|
{
|
|
propertyPath: "maxDynamicHeight",
|
|
propertyValue: WidgetHeightLimits.MAX_HEIGHT_IN_ROWS,
|
|
},
|
|
);
|
|
}
|
|
|
|
if (propertyValue === DynamicHeight.FIXED) {
|
|
updates.push({
|
|
propertyPath: "originalBottomRow",
|
|
propertyValue: undefined,
|
|
});
|
|
updates.push({
|
|
propertyPath: "originalTopRow",
|
|
propertyValue: undefined,
|
|
});
|
|
}
|
|
|
|
// The following are updates which apply to specific widgets.
|
|
if (
|
|
propertyValue === DynamicHeight.AUTO_HEIGHT ||
|
|
propertyValue === DynamicHeight.AUTO_HEIGHT_WITH_LIMITS
|
|
) {
|
|
if (props.dynamicHeight === DynamicHeight.FIXED) {
|
|
updates.push({
|
|
propertyPath: "originalBottomRow",
|
|
propertyValue: props.bottomRow,
|
|
});
|
|
updates.push({
|
|
propertyPath: "originalTopRow",
|
|
propertyValue: props.topRow,
|
|
});
|
|
}
|
|
if (!props.shouldScrollContents) {
|
|
updates.push({
|
|
propertyPath: "shouldScrollContents",
|
|
propertyValue: true,
|
|
});
|
|
}
|
|
if (props.overflow !== undefined) {
|
|
updates.push({
|
|
propertyPath: "overflow",
|
|
propertyValue: "NONE",
|
|
});
|
|
}
|
|
if (props.scrollContents === true) {
|
|
updates.push({
|
|
propertyPath: "scrollContents",
|
|
propertyValue: false,
|
|
});
|
|
}
|
|
if (props.fixedFooter === true) {
|
|
updates.push({
|
|
propertyPath: "fixedFooter",
|
|
propertyValue: false,
|
|
});
|
|
}
|
|
}
|
|
|
|
return updates;
|
|
}
|
|
|
|
// TODO FEATURE:(abhinav) Add validations to these properties
|
|
|
|
const CONTAINER_SCROLL_HELPER_TEXT =
|
|
"This widget shows an internal scroll when you add widgets in edit mode. It'll resize after you've added widgets. The scroll won't exist in view mode.";
|
|
|
|
export const PropertyPaneConfigTemplates: Record<
|
|
RegisteredWidgetFeatures,
|
|
PropertyPaneConfig[]
|
|
> = {
|
|
[RegisteredWidgetFeatures.DYNAMIC_HEIGHT]: [
|
|
{
|
|
helpText:
|
|
"Auto Height: Configure the way the widget height reacts to content changes.",
|
|
propertyName: "dynamicHeight",
|
|
label: "Height",
|
|
controlType: "DROP_DOWN",
|
|
isBindProperty: false,
|
|
isTriggerProperty: false,
|
|
dependencies: [
|
|
"shouldScrollContents",
|
|
"maxDynamicHeight",
|
|
"minDynamicHeight",
|
|
"bottomRow",
|
|
"topRow",
|
|
"overflow",
|
|
"dynamicHeight",
|
|
"isCanvas",
|
|
],
|
|
updateHook: updateMinMaxDynamicHeight,
|
|
helperText: (props: WidgetProps) => {
|
|
return props.isCanvas &&
|
|
props.dynamicHeight === DynamicHeight.AUTO_HEIGHT
|
|
? CONTAINER_SCROLL_HELPER_TEXT
|
|
: "";
|
|
},
|
|
options: [
|
|
{
|
|
label: "Auto Height",
|
|
value: DynamicHeight.AUTO_HEIGHT,
|
|
},
|
|
{
|
|
label: "Auto Height with limits",
|
|
value: DynamicHeight.AUTO_HEIGHT_WITH_LIMITS,
|
|
},
|
|
{
|
|
label: "Fixed",
|
|
value: DynamicHeight.FIXED,
|
|
},
|
|
],
|
|
postUpdateAction: ReduxActionTypes.CHECK_CONTAINERS_FOR_AUTO_HEIGHT,
|
|
},
|
|
],
|
|
};
|