Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cleanup

Browse source
This commit is contained in:
arpitnath 2023-08-19 16:10:23 +05:30
parent a9ed8de7be
commit af64dc91df
2 changed files with 76 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
frontend/src/Editor/EditorFunc.jsx
View file

@ -37,6 +37,8 @@ import {
debuggerActions,
cloneComponents,
removeSelectedComponent,
buildAppDefinition,
buildComponentMetaDefinition,
} from '@/_helpers/appUtils';
import { Confirm } from './Viewer/Confirm';
import { Tooltip as ReactTooltip } from 'react-tooltip';
@ -73,7 +75,6 @@ import { useMounted } from '@/_hooks/use-mount';
// eslint-disable-next-line import/no-unresolved
import { diff } from 'deep-object-diff';
import { camelizeKeys } from 'humps';
setAutoFreeze(false);
enablePatches();
@ -84,79 +85,6 @@ function setWindowTitle(name) {
const decimalToHex = (alpha) => (alpha === 0 ? '00' : Math.round(255 * alpha).toString(16));
const buildComponentMetaDefinition = (components = {}, events = []) => {
for (const componentId in components) {
const currentComponentData = components[componentId];
const componentEvents = events
.filter((event) => event.sourceId === componentId)
?.map((event) => ({ ...event.event, id: event.id }));
const componentMeta = componentTypes.find((comp) => currentComponentData.component.component === comp.component);
const mergedDefinition = {
...componentMeta.definition,
events: componentEvents,
properties: {
...componentMeta.definition.properties,
...currentComponentData?.component.definition.properties,
},
styles: {
...componentMeta.definition.styles,
...currentComponentData?.component.definition.styles,
},
validations: {
...componentMeta.definition.validations,
...currentComponentData?.component.definition.validations,
},
};
const mergedComponent = {
component: {
...componentMeta,
...currentComponentData.component,
},
layouts: {
...currentComponentData.layouts,
},
withDefaultChildren: componentMeta.withDefaultChildren ?? false,
};
mergedComponent.component.definition = mergedDefinition;
components[componentId] = mergedComponent;
}
return components;
};
const buildAppDefinition = (data) => {
const editingVersion = _.omit(camelizeKeys(data.editing_version), ['definition', 'updatedAt', 'createdAt', 'name']);
editingVersion['currentVersionId'] = editingVersion.id;
_.unset(editingVersion, 'id');
const eventsData = data?.events;
const pages = data.pages.reduce((acc, page) => {
const currentComponents = buildComponentMetaDefinition(_.cloneDeep(page?.components), eventsData);
page.components = currentComponents;
acc[page.id] = page;
return acc;
}, {});
const appJSON = {
globalSettings: editingVersion.globalSettings,
homePageId: editingVersion.homePageId,
showHideViewerNavigation: editingVersion.showHideViewerNavigation ?? true,
pages: pages,
};
return appJSON;
};
const EditorComponent = (props) => {
const { socket } = createWebsocketConnection(props?.params?.id);
const mounted = useMounted();

74
frontend/src/_helpers/appUtils.js
View file

@ -33,6 +33,7 @@ import { useQueryPanelStore } from '@/_stores/queryPanelStore';
import { useCurrentStateStore, getCurrentState } from '@/_stores/currentStateStore';
import { useAppVersionStore } from '@/_stores/appVersionStore';
import { useEditorStore } from '@/_stores/editorStore';
import { camelizeKeys } from 'humps';
const ERROR_TYPES = Object.freeze({
ReferenceError: 'ReferenceError',
@ -1653,3 +1654,76 @@ export const computeQueryState = (queries) => {
});
}
};
export const buildComponentMetaDefinition = (components = {}, events = []) => {
for (const componentId in components) {
const currentComponentData = components[componentId];
const componentEvents = events
.filter((event) => event.sourceId === componentId)
?.map((event) => ({ ...event.event, id: event.id }));
const componentMeta = componentTypes.find((comp) => currentComponentData.component.component === comp.component);
const mergedDefinition = {
...componentMeta.definition,
events: componentEvents,
properties: {
...componentMeta.definition.properties,
...currentComponentData?.component.definition.properties,
},
styles: {
...componentMeta.definition.styles,
...currentComponentData?.component.definition.styles,
},
validations: {
...componentMeta.definition.validations,
...currentComponentData?.component.definition.validations,
},
};
const mergedComponent = {
component: {
...componentMeta,
...currentComponentData.component,
},
layouts: {
...currentComponentData.layouts,
},
withDefaultChildren: componentMeta.withDefaultChildren ?? false,
};
mergedComponent.component.definition = mergedDefinition;
components[componentId] = mergedComponent;
}
return components;
};
export const buildAppDefinition = (data) => {
const editingVersion = _.omit(camelizeKeys(data.editing_version), ['definition', 'updatedAt', 'createdAt', 'name']);
editingVersion['currentVersionId'] = editingVersion.id;
_.unset(editingVersion, 'id');
const eventsData = data?.events;
const pages = data.pages.reduce((acc, page) => {
const currentComponents = buildComponentMetaDefinition(_.cloneDeep(page?.components), eventsData);
page.components = currentComponents;
acc[page.id] = page;
return acc;
}, {});
const appJSON = {
globalSettings: editingVersion.globalSettings,
homePageId: editingVersion.homePageId,
showHideViewerNavigation: editingVersion.showHideViewerNavigation ?? true,
pages: pages,
};
return appJSON;
};