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

fix: calendar subcontainer components comes out of the parent container on copy/paste

Browse source
This commit is contained in:
arpitnath 2023-09-30 21:19:21 +05:30
parent e44369fc73
commit 9493cdbbbe
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1399,7 +1399,6 @@ const getAllChildComponents = (allComponents, parentId) => {
if (componentParentId && isParentTabORCalendar) {
const childComponent = allComponents[componentId];
const childTabId = componentParentId.split('-').at(-1);
if (componentParentId === `${parentId}-${childTabId}`) {
childComponent.componentId = componentId;
childComponents.push(childComponent);
@ -1437,7 +1436,7 @@ const updateComponentLayout = (components, parentId, isCut = false) => {
};
const isChildOfTabsOrCalendar = (component, allComponents = []) => {
const parentId = component.component.parent.slice(0, -2);
const parentId = component.component.parent.split('-').slice(0, -1).join('-');
const parentComponent = allComponents.find((comp) => comp.componentId === parentId);
@ -1469,8 +1468,9 @@ export const addComponents = (pageId, appDefinition, appDefinitionChanged, paren
const componentData = component.component;
if (isChild && isChildOfTabsOrCalendar(component, pastedComponents)) {
const parentId = component.component.parent.slice(0, -2);
const parentId = component.component.parent.split('-').slice(0, -1).join('-');
const childTabId = component.component.parent.split('-').at(-1);
componentData.parent = `${componentMap[parentId]}-${childTabId}`;
} else if (isChild) {
componentData.parent = componentMap[isChild];