Skip to content

fix: load main container without waiting for evaluations to complete. #6669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marks0351 merged 3 commits into from
Aug 25, 2021
Merged

fix: load main container without waiting for evaluations to complete. #6669

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c287b7
Fix: load main container without waiting for evaluations to complete.
marks0351 Aug 18, 2021
705822b
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
marks0351 Aug 25, 2021
2250262
addressing code review comments.
marks0351 Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 45 additions & 17 deletions app/client/src/selectors/editorSelectors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,18 @@ import { OccupiedSpace } from "constants/editorConstants";
import { getDataTree, getLoadingEntities } from "selectors/dataTreeSelectors";
import _ from "lodash";
import { ContainerWidgetProps } from "widgets/ContainerWidget";
import { DataTreeWidget, ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import {
DataTree,
DataTreeWidget,
ENTITY_TYPE,
} from "entities/DataTree/dataTreeFactory";
import { getActions } from "selectors/entitiesSelector";

import { getCanvasWidgets } from "./entitiesSelector";
import { WidgetTypes } from "../constants/WidgetConstants";
import {
MAIN_CONTAINER_WIDGET_ID,
WidgetTypes,
} from "../constants/WidgetConstants";

const getWidgetConfigs = (state: AppState) => state.entities.widgetConfig;
const getWidgetSideBar = (state: AppState) => state.ui.widgetSidebar;
Expand Down Expand Up @@ -142,6 +149,17 @@ export const getWidgetCards = createSelector(
},
);

const getMainContainer = (
canvasWidgets: CanvasWidgetsReduxState,
evaluatedDataTree: DataTree,
) => {
const canvasWidget = canvasWidgets[MAIN_CONTAINER_WIDGET_ID];
const evaluatedWidget = _.find(evaluatedDataTree, {
widgetId: MAIN_CONTAINER_WIDGET_ID,
}) as DataTreeWidget;
return createCanvasWidget(canvasWidget, evaluatedWidget);
};

export const getCanvasWidgetDsl = createSelector(
getCanvasWidgets,
getDataTree,
Expand All @@ -151,21 +169,31 @@ export const getCanvasWidgetDsl = createSelector(
evaluatedDataTree,
loadingEntities,
): ContainerWidgetProps<WidgetProps> => {
const widgets: Record<string, DataTreeWidget> = {};
Object.keys(canvasWidgets).forEach((widgetKey) => {
const canvasWidget = canvasWidgets[widgetKey];
const evaluatedWidget = _.find(evaluatedDataTree, {
widgetId: widgetKey,
}) as DataTreeWidget;
if (evaluatedWidget) {
widgets[widgetKey] = createCanvasWidget(canvasWidget, evaluatedWidget);
} else {
widgets[widgetKey] = createLoadingWidget(canvasWidget);
}
widgets[widgetKey].isLoading = loadingEntities.has(
canvasWidget.widgetName,
);
});
const widgets: Record<string, DataTreeWidget> = {
[MAIN_CONTAINER_WIDGET_ID]: getMainContainer(
canvasWidgets,
evaluatedDataTree,
),
};
Object.keys(canvasWidgets)
.filter((each) => each !== MAIN_CONTAINER_WIDGET_ID)
.forEach((widgetKey) => {
const canvasWidget = canvasWidgets[widgetKey];
const evaluatedWidget = _.find(evaluatedDataTree, {
widgetId: widgetKey,
}) as DataTreeWidget;
if (evaluatedWidget) {
widgets[widgetKey] = createCanvasWidget(
canvasWidget,
evaluatedWidget,
);
} else {
widgets[widgetKey] = createLoadingWidget(canvasWidget);
}
widgets[widgetKey].isLoading = loadingEntities.has(
canvasWidget.widgetName,
);
});

return CanvasWidgetsNormalizer.denormalize("0", {
canvasWidgets: widgets,
Expand Down