## 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>
393 lines
14 KiB
TypeScript
393 lines
14 KiB
TypeScript
import type {
|
|
PropertyPaneConfig,
|
|
ValidationConfig,
|
|
} from "constants/PropertyControlConstants";
|
|
import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
|
|
import { get, isObject, isUndefined, omitBy } from "lodash";
|
|
import memoize from "micro-memoize";
|
|
import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
|
|
import type { WidgetProps } from "widgets/BaseWidget";
|
|
|
|
/**
|
|
* @typedef {Object} Paths
|
|
* @property {Object} configBindingPaths - The Binding Path
|
|
* @property {Object} configReactivePaths - The Dynamic Property Path
|
|
* @property {Object} configTriggerPaths - The Trigger Path
|
|
* @property {Object} configValidationPaths - The Validation Path
|
|
*/
|
|
|
|
/**
|
|
* All widget's property or paths where user can write javaScript bindings using mustache syntax are called bindingPaths.
|
|
* Widget's meta and derived paths aren't binding paths as user can't add or remove binding for those value.
|
|
*/
|
|
type BindingPaths = Record<string, EvaluationSubstitutionType>;
|
|
/**
|
|
* Binding paths and non-binding paths of widget/action together form reactivePaths.
|
|
*/
|
|
type ReactivePaths = Record<string, EvaluationSubstitutionType>;
|
|
|
|
/**
|
|
* This function gets the binding validation and trigger paths from a config
|
|
* @param config
|
|
* @param path
|
|
* @returns {Paths} Paths
|
|
*/
|
|
const checkPathsInConfig = (
|
|
config: any,
|
|
path: string,
|
|
): {
|
|
configBindingPaths: BindingPaths;
|
|
configReactivePaths: ReactivePaths;
|
|
configTriggerPaths: Record<string, true>;
|
|
configValidationPaths: Record<string, ValidationConfig>;
|
|
} => {
|
|
const configBindingPaths: BindingPaths = {};
|
|
const configTriggerPaths: Record<string, true> = {};
|
|
const configValidationPaths: Record<any, ValidationConfig> = {};
|
|
// Purely a Binding Path
|
|
if (config.isBindProperty && !config.isTriggerProperty) {
|
|
configBindingPaths[path] =
|
|
config.evaluationSubstitutionType || EvaluationSubstitutionType.TEMPLATE;
|
|
if (config.validation) {
|
|
configValidationPaths[path] = config.validation;
|
|
}
|
|
} else if (config.isBindProperty && config.isTriggerProperty) {
|
|
configTriggerPaths[path] = true;
|
|
}
|
|
return {
|
|
configBindingPaths,
|
|
configReactivePaths: configBindingPaths, // All bindingPaths are reactivePaths.
|
|
configTriggerPaths,
|
|
configValidationPaths,
|
|
};
|
|
};
|
|
|
|
// "originalWidget" param here always contains the complete widget props
|
|
// as this function's widget parameter tends to change in each iteration
|
|
const childHasPanelConfig = (
|
|
config: any,
|
|
widget: WidgetProps,
|
|
basePath: string,
|
|
originalWidget: WidgetProps,
|
|
) => {
|
|
const panelPropertyPath = config.propertyName;
|
|
const widgetPanelPropertyValues = get(widget, panelPropertyPath);
|
|
|
|
let bindingPaths: BindingPaths = {};
|
|
let reactivePaths: ReactivePaths = {};
|
|
let triggerPaths: Record<string, true> = {};
|
|
let validationPaths: Record<any, ValidationConfig> = {};
|
|
if (widgetPanelPropertyValues) {
|
|
Object.values(widgetPanelPropertyValues).forEach(
|
|
(widgetPanelPropertyValue: any) => {
|
|
const { panelIdPropertyName } = config.panelConfig;
|
|
const propertyPath = `${basePath}.${widgetPanelPropertyValue[panelIdPropertyName]}`;
|
|
|
|
let panelConfigChildren = [
|
|
...(config.panelConfig.contentChildren || []),
|
|
...(config.panelConfig.styleChildren || []),
|
|
];
|
|
|
|
if (panelConfigChildren.length === 0)
|
|
panelConfigChildren = config.panelConfig.children;
|
|
|
|
panelConfigChildren.forEach((panelColumnConfig: any) => {
|
|
let isSectionHidden = false;
|
|
if ("hidden" in panelColumnConfig) {
|
|
isSectionHidden = panelColumnConfig.hidden(
|
|
originalWidget,
|
|
propertyPath,
|
|
);
|
|
}
|
|
if (!isSectionHidden) {
|
|
panelColumnConfig.children.forEach(
|
|
(panelColumnControlOrSectionConfig: any) => {
|
|
if (
|
|
panelColumnControlOrSectionConfig.sectionName !== undefined
|
|
) {
|
|
panelColumnControlOrSectionConfig.children.forEach(
|
|
(panelColumnControlConfig: any) => {
|
|
const panelPropertyConfigPath = `${propertyPath}.${panelColumnControlConfig.propertyName}`;
|
|
let isControlHidden = false;
|
|
if ("hidden" in panelColumnControlConfig) {
|
|
isControlHidden = panelColumnControlConfig.hidden(
|
|
originalWidget,
|
|
panelPropertyConfigPath,
|
|
);
|
|
}
|
|
if (!isControlHidden) {
|
|
const {
|
|
configBindingPaths,
|
|
configReactivePaths,
|
|
configTriggerPaths,
|
|
configValidationPaths,
|
|
} = checkPathsInConfig(
|
|
panelColumnControlConfig,
|
|
panelPropertyConfigPath,
|
|
);
|
|
bindingPaths = {
|
|
...configBindingPaths,
|
|
...bindingPaths,
|
|
};
|
|
reactivePaths = {
|
|
...configReactivePaths,
|
|
...reactivePaths,
|
|
};
|
|
triggerPaths = {
|
|
...configTriggerPaths,
|
|
...triggerPaths,
|
|
};
|
|
validationPaths = {
|
|
...configValidationPaths,
|
|
...validationPaths,
|
|
};
|
|
// Has child Panel Config
|
|
if (panelColumnControlConfig.panelConfig) {
|
|
const {
|
|
bindingPaths: panelBindingPaths,
|
|
reactivePaths: panelReactivePaths,
|
|
triggerPaths: panelTriggerPaths,
|
|
validationPaths: panelValidationPaths,
|
|
} = childHasPanelConfig(
|
|
panelColumnControlConfig,
|
|
widgetPanelPropertyValue,
|
|
panelPropertyConfigPath,
|
|
originalWidget,
|
|
);
|
|
bindingPaths = {
|
|
...panelBindingPaths,
|
|
...bindingPaths,
|
|
};
|
|
reactivePaths = {
|
|
...panelReactivePaths,
|
|
...reactivePaths,
|
|
};
|
|
triggerPaths = {
|
|
...panelTriggerPaths,
|
|
...triggerPaths,
|
|
};
|
|
validationPaths = {
|
|
...panelValidationPaths,
|
|
...validationPaths,
|
|
};
|
|
}
|
|
}
|
|
},
|
|
);
|
|
} else {
|
|
const panelPropertyConfigPath = `${propertyPath}.${panelColumnControlOrSectionConfig.propertyName}`;
|
|
let isControlHidden = false;
|
|
if ("hidden" in panelColumnControlOrSectionConfig) {
|
|
isControlHidden = panelColumnControlOrSectionConfig.hidden(
|
|
originalWidget,
|
|
panelPropertyConfigPath,
|
|
);
|
|
}
|
|
if (!isControlHidden) {
|
|
const {
|
|
configBindingPaths,
|
|
configReactivePaths,
|
|
configTriggerPaths,
|
|
configValidationPaths,
|
|
} = checkPathsInConfig(
|
|
panelColumnControlOrSectionConfig,
|
|
panelPropertyConfigPath,
|
|
);
|
|
bindingPaths = {
|
|
...configBindingPaths,
|
|
...bindingPaths,
|
|
};
|
|
reactivePaths = {
|
|
...configReactivePaths,
|
|
...reactivePaths,
|
|
};
|
|
triggerPaths = { ...configTriggerPaths, ...triggerPaths };
|
|
validationPaths = {
|
|
...configValidationPaths,
|
|
...validationPaths,
|
|
};
|
|
// Has child Panel Config
|
|
if (panelColumnControlOrSectionConfig.panelConfig) {
|
|
const {
|
|
bindingPaths: panelBindingPaths,
|
|
reactivePaths: panelReactivePaths,
|
|
triggerPaths: panelTriggerPaths,
|
|
validationPaths: panelValidationPaths,
|
|
} = childHasPanelConfig(
|
|
panelColumnControlOrSectionConfig,
|
|
widgetPanelPropertyValue,
|
|
panelPropertyConfigPath,
|
|
originalWidget,
|
|
);
|
|
bindingPaths = {
|
|
...panelBindingPaths,
|
|
...bindingPaths,
|
|
};
|
|
reactivePaths = {
|
|
...panelReactivePaths,
|
|
...reactivePaths,
|
|
};
|
|
triggerPaths = { ...panelTriggerPaths, ...triggerPaths };
|
|
validationPaths = {
|
|
...panelValidationPaths,
|
|
...validationPaths,
|
|
};
|
|
}
|
|
}
|
|
}
|
|
},
|
|
);
|
|
}
|
|
});
|
|
},
|
|
);
|
|
}
|
|
|
|
return { reactivePaths, triggerPaths, validationPaths, bindingPaths };
|
|
};
|
|
|
|
const getAllPathsFromPropertyConfigWithoutMemo = (
|
|
widget: WidgetProps,
|
|
widgetConfig: readonly PropertyPaneConfig[],
|
|
defaultProperties: Record<string, any>,
|
|
): {
|
|
bindingPaths: BindingPaths;
|
|
reactivePaths: ReactivePaths;
|
|
triggerPaths: Record<string, true>;
|
|
validationPaths: Record<string, ValidationConfig>;
|
|
} => {
|
|
let bindingPaths: BindingPaths = {};
|
|
let reactivePaths: ReactivePaths = {};
|
|
Object.keys(defaultProperties).forEach((property) => {
|
|
reactivePaths[property] = EvaluationSubstitutionType.TEMPLATE;
|
|
});
|
|
let triggerPaths: Record<string, true> = {};
|
|
let validationPaths: Record<any, ValidationConfig> = {};
|
|
|
|
widgetConfig.forEach((config) => {
|
|
if (config.children) {
|
|
config.children.forEach((controlConfig: any) => {
|
|
const basePath = controlConfig.propertyName;
|
|
let isHidden = false;
|
|
if ("hidden" in controlConfig) {
|
|
isHidden = controlConfig.hidden(widget, basePath);
|
|
}
|
|
if (!isHidden) {
|
|
const path = controlConfig.propertyName;
|
|
const {
|
|
configBindingPaths,
|
|
configReactivePaths,
|
|
configTriggerPaths,
|
|
configValidationPaths,
|
|
} = checkPathsInConfig(controlConfig, path);
|
|
bindingPaths = {
|
|
...bindingPaths,
|
|
...configBindingPaths,
|
|
};
|
|
// Update default path configs with the ones in the property config
|
|
reactivePaths = {
|
|
...reactivePaths,
|
|
...configReactivePaths,
|
|
};
|
|
triggerPaths = { ...triggerPaths, ...configTriggerPaths };
|
|
validationPaths = { ...validationPaths, ...configValidationPaths };
|
|
}
|
|
// Has child Panel Config
|
|
if (controlConfig.panelConfig) {
|
|
const resultingPaths = childHasPanelConfig(
|
|
controlConfig,
|
|
widget,
|
|
basePath,
|
|
widget,
|
|
);
|
|
bindingPaths = {
|
|
...bindingPaths,
|
|
...resultingPaths.bindingPaths,
|
|
};
|
|
reactivePaths = {
|
|
...reactivePaths,
|
|
...resultingPaths.reactivePaths,
|
|
};
|
|
triggerPaths = { ...triggerPaths, ...resultingPaths.triggerPaths };
|
|
validationPaths = {
|
|
...validationPaths,
|
|
...resultingPaths.validationPaths,
|
|
};
|
|
}
|
|
if (controlConfig.children) {
|
|
const basePropertyPath = controlConfig.propertyName;
|
|
const widgetPropertyValue = get(widget, basePropertyPath, []);
|
|
// Property in object structure
|
|
if (
|
|
!isUndefined(widgetPropertyValue) &&
|
|
isObject(widgetPropertyValue)
|
|
) {
|
|
Object.keys(widgetPropertyValue).forEach((key: string) => {
|
|
const objectIndexPropertyPath = `${basePropertyPath}.${key}`;
|
|
controlConfig.children.forEach((childPropertyConfig: any) => {
|
|
const childArrayPropertyPath = `${objectIndexPropertyPath}.${childPropertyConfig.propertyName}`;
|
|
const {
|
|
configBindingPaths,
|
|
configReactivePaths,
|
|
configTriggerPaths,
|
|
configValidationPaths,
|
|
} = checkPathsInConfig(
|
|
childPropertyConfig,
|
|
childArrayPropertyPath,
|
|
);
|
|
bindingPaths = {
|
|
...bindingPaths,
|
|
...configBindingPaths,
|
|
};
|
|
reactivePaths = {
|
|
...reactivePaths,
|
|
...configReactivePaths,
|
|
};
|
|
triggerPaths = { ...triggerPaths, ...configTriggerPaths };
|
|
validationPaths = {
|
|
...validationPaths,
|
|
...configValidationPaths,
|
|
};
|
|
});
|
|
});
|
|
}
|
|
}
|
|
});
|
|
}
|
|
});
|
|
|
|
return { reactivePaths, triggerPaths, validationPaths, bindingPaths };
|
|
};
|
|
|
|
export const getAllPathsFromPropertyConfig = memoize(
|
|
getAllPathsFromPropertyConfigWithoutMemo,
|
|
{ maxSize: 1000 },
|
|
);
|
|
|
|
/**
|
|
* this function gets the next available row for pasting widgets
|
|
* NOTE: this function excludes modal widget when calculating next available row
|
|
*
|
|
* @param parentContainerId
|
|
* @param canvasWidgets
|
|
* @returns
|
|
*/
|
|
export const nextAvailableRowInContainer = (
|
|
parentContainerId: string,
|
|
canvasWidgets: { [widgetId: string]: FlattenedWidgetProps },
|
|
) => {
|
|
const filteredCanvasWidgets = omitBy(canvasWidgets, (widget) => {
|
|
return widget.type === "MODAL_WIDGET";
|
|
});
|
|
|
|
return (
|
|
Object.values(filteredCanvasWidgets).reduce(
|
|
(prev: number, next: any) =>
|
|
next?.parentId === parentContainerId && next.bottomRow > prev
|
|
? next.bottomRow
|
|
: prev,
|
|
0,
|
|
) + 1
|
|
);
|
|
};
|