* initial commit * props hoc * changes * removed ignores and withWidgetProps * added extra props to canvasStructure * widget props changes * list widget changes * reintroduced widget props hook and other refactors * remove warnings * added deepequal for childWidgets selector * fix global hotkeys and tabs widget jest test * fix main container test fix * fixed view mode width * fix form widget values * minor fix * fix skeleton * form widget validity fix * jest test fix * fixed tests: GlobalHotkeys, Tabs, CanvasSelectectionArena and fixed main container rendering * minor fix * minor comments * reverted commented code * simplified structure, selective redux state updates and other inconsistencies * fix junit test cases * stop form widget from force rendering children * fix test case * random commit to re run tests * update isFormValid prop only if it exists * detangling circular dependency * fixing cypress tests * cleaned up code * clean up man cnavas props and fix jest cases * fix rendering order of child widgets for canvas * fix dropdown reset spec * adding comments * cleaning up unwanted code * fix multiselect widget on deploy * adressing review comments * addressing minor review comment changes * destructuring modal widget child and fix test case * fix communityIssues cypress spec * rewrite isVisible logic to match previous behaviour * merging widget props with component props before checking isVisible * adressing review comments for modal widget's isVisible Co-authored-by: rahulramesha <rahul@appsmith.com>
123 lines
3.4 KiB
TypeScript
123 lines
3.4 KiB
TypeScript
import {
|
|
CanvasWidgetsReduxState,
|
|
FlattenedWidgetProps,
|
|
} from "reducers/entityReducers/canvasWidgetsReducer";
|
|
import {
|
|
DataTree,
|
|
DataTreeWidget,
|
|
ENTITY_TYPE,
|
|
} from "entities/DataTree/dataTreeFactory";
|
|
import { pick } from "lodash";
|
|
import { WIDGET_STATIC_PROPS } from "constants/WidgetConstants";
|
|
import WidgetFactory from "./WidgetFactory";
|
|
import { WidgetProps } from "widgets/BaseWidget";
|
|
import { LoadingEntitiesState } from "reducers/evaluationReducers/loadingEntitiesReducer";
|
|
|
|
export const createCanvasWidget = (
|
|
canvasWidget: FlattenedWidgetProps,
|
|
evaluatedWidget: DataTreeWidget,
|
|
specificChildProps?: string[],
|
|
) => {
|
|
const widgetStaticProps = pick(
|
|
canvasWidget,
|
|
Object.keys(WIDGET_STATIC_PROPS),
|
|
);
|
|
|
|
//Pick required only contents for specific widgets
|
|
const evaluatedStaticProps = specificChildProps
|
|
? pick(evaluatedWidget, specificChildProps)
|
|
: evaluatedWidget;
|
|
|
|
return {
|
|
...evaluatedStaticProps,
|
|
...widgetStaticProps,
|
|
} as DataTreeWidget;
|
|
};
|
|
|
|
const WidgetTypes = WidgetFactory.widgetTypes;
|
|
export const createLoadingWidget = (
|
|
canvasWidget: FlattenedWidgetProps,
|
|
): DataTreeWidget => {
|
|
const widgetStaticProps = pick(
|
|
canvasWidget,
|
|
Object.keys(WIDGET_STATIC_PROPS),
|
|
) as WidgetProps;
|
|
return {
|
|
...widgetStaticProps,
|
|
type: WidgetTypes.SKELETON_WIDGET,
|
|
ENTITY_TYPE: ENTITY_TYPE.WIDGET,
|
|
bindingPaths: {},
|
|
reactivePaths: {},
|
|
triggerPaths: {},
|
|
validationPaths: {},
|
|
logBlackList: {},
|
|
isLoading: true,
|
|
propertyOverrideDependency: {},
|
|
overridingPropertyPaths: {},
|
|
privateWidgets: {},
|
|
meta: {},
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Method to build a child widget tree
|
|
* This method is used to build the child widgets array for widgets like Form, or List widget,
|
|
* That need to know the state of its child or grandChild to derive properties
|
|
* This can be replaced with deived properties of the individual widgets
|
|
*
|
|
* @param canvasWidgets
|
|
* @param evaluatedDataTree
|
|
* @param loadingEntities
|
|
* @param widgetId
|
|
* @param requiredWidgetProps
|
|
* @returns
|
|
*/
|
|
export function buildChildWidgetTree(
|
|
canvasWidgets: CanvasWidgetsReduxState,
|
|
evaluatedDataTree: DataTree,
|
|
loadingEntities: LoadingEntitiesState,
|
|
widgetId: string,
|
|
requiredWidgetProps?: string[],
|
|
) {
|
|
const parentWidget = canvasWidgets[widgetId];
|
|
|
|
// specificChildProps are the only properties required by the parent to derive it's properties
|
|
const specificChildProps =
|
|
requiredWidgetProps ||
|
|
getWidgetSpecificChildProps(canvasWidgets[widgetId].type);
|
|
|
|
if (parentWidget.children) {
|
|
return parentWidget.children.map((childWidgetId) => {
|
|
const childWidget = canvasWidgets[childWidgetId];
|
|
const evaluatedWidget = evaluatedDataTree[
|
|
childWidget.widgetName
|
|
] as DataTreeWidget;
|
|
const widget = evaluatedWidget
|
|
? createCanvasWidget(childWidget, evaluatedWidget, specificChildProps)
|
|
: createLoadingWidget(childWidget);
|
|
|
|
widget.isLoading = loadingEntities.has(childWidget.widgetName);
|
|
|
|
if (widget?.children?.length > 0) {
|
|
widget.children = buildChildWidgetTree(
|
|
canvasWidgets,
|
|
evaluatedDataTree,
|
|
loadingEntities,
|
|
childWidgetId,
|
|
specificChildProps,
|
|
);
|
|
}
|
|
|
|
return widget;
|
|
});
|
|
}
|
|
|
|
return [];
|
|
}
|
|
|
|
function getWidgetSpecificChildProps(type: string) {
|
|
if (type === "FORM_WIDGET") {
|
|
return ["value", "isDirty", "isValid", "isLoading", "children"];
|
|
}
|
|
}
|