Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes: copy/paste

Browse source
This commit is contained in:
arpitnath 2023-09-27 19:24:58 +05:30
parent d61dd120fc
commit bd6809d645
1 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -662,7 +662,7 @@ export async function onEvent(_ref, eventName, events, options = {}, mode = 'edi
if (eventName === 'onTableActionButtonClicked') { if (eventName === 'onTableActionButtonClicked') {
const { action, tableActionEvents } = options; const { action, tableActionEvents } = options;
console.log('---arpit::: ', { tableActionEvents });
if (action && tableActionEvents) { if (action && tableActionEvents) {
for (const event of tableActionEvents) { for (const event of tableActionEvents) {
if (event?.event?.actionId) { if (event?.event?.actionId) {
@ -1315,15 +1315,13 @@ export const getComponentName = (currentState, id) => {
const updateNewComponents = (pageId, appDefinition, newComponents, updateAppDefinition) => { const updateNewComponents = (pageId, appDefinition, newComponents, updateAppDefinition) => {
const newAppDefinition = JSON.parse(JSON.stringify(appDefinition)); const newAppDefinition = JSON.parse(JSON.stringify(appDefinition));
newComponents.forEach((newComponent) => {
newComponent.component.name = computeComponentName(
newComponent.component.component,
newAppDefinition.pages[pageId].components
);
newAppDefinition.pages[pageId].components[newComponent.id] = newComponent;
});
updateAppDefinition(newAppDefinition, { componentDefinitionChanged: true }); newAppDefinition.pages[pageId].components = {
...newAppDefinition.pages[pageId].components,
...newComponents,
};
updateAppDefinition(newAppDefinition, { componentAdded: true, containerChanges: true });
}; };
export const cloneComponents = ( export const cloneComponents = (
@ -1353,8 +1351,10 @@ export const cloneComponents = (
let clonedComponent = JSON.parse(JSON.stringify(component)); let clonedComponent = JSON.parse(JSON.stringify(component));
clonedComponent.parent = undefined; clonedComponent.parent = undefined;
clonedComponent.children = []; clonedComponent.children = [];
clonedComponent.children = [...getChildComponents(allComponents, component, clonedComponent, addedComponentId)]; const child = getChildComponents(allComponents, component, clonedComponent, addedComponentId);
newComponents = [...newComponents, clonedComponent]; // clonedComponent.children = [...getChildComponents(allComponents, component, clonedComponent, addedComponentId)];
newComponents = [...newComponents, clonedComponent, ...child];
newComponentObj = { newComponentObj = {
newComponents, newComponents,
isCloning, isCloning,
@ -1388,7 +1388,9 @@ const getChildComponents = (allComponents, component, parentComponent, addedComp
if (component.component.component === 'Tabs' || component.component.component === 'Calendar') { if (component.component.component === 'Tabs' || component.component.component === 'Calendar') {
childComponents = Object.keys(allComponents).filter((key) => allComponents[key].parent?.startsWith(component.id)); childComponents = Object.keys(allComponents).filter((key) => allComponents[key].parent?.startsWith(component.id));
} else { } else {
childComponents = Object.keys(allComponents).filter((key) => allComponents[key].parent === component.id); childComponents = Object.keys(allComponents).filter((key) => {
return allComponents[key].component?.parent === component.id;
});
} }
childComponents.forEach((componentId) => { childComponents.forEach((componentId) => {
@ -1439,9 +1441,10 @@ const updateComponentLayout = (components, parentId, isCut = false) => {
}; };
export const addComponents = (pageId, appDefinition, appDefinitionChanged, parentId = undefined, newComponentObj) => { export const addComponents = (pageId, appDefinition, appDefinitionChanged, parentId = undefined, newComponentObj) => {
const finalComponents = []; const finalComponents = {};
const mapOldParentComponentToNewParentComponent = {};
let parentComponent = undefined; let parentComponent = undefined;
const { isCloning, isCut, newComponents: pastedComponent = [] } = newComponentObj; const { isCloning, isCut, newComponents: pastedComponents = [] } = newComponentObj;
if (parentId) { if (parentId) {
const id = Object.keys(appDefinition.pages[pageId].components).filter((key) => parentId.startsWith(key)); const id = Object.keys(appDefinition.pages[pageId].components).filter((key) => parentId.startsWith(key));
@ -1449,36 +1452,25 @@ export const addComponents = (pageId, appDefinition, appDefinitionChanged, paren
parentComponent.id = parentId; parentComponent.id = parentId;
} }
!isCloning && updateComponentLayout(pastedComponent, parentId, isCut); pastedComponents.forEach((component) => {
const newComponentId = uuidv4();
const buildComponents = (components, parentComponent = undefined, skipTabCalendarCheck = false) => { if (component.children && component.children.length > 0) {
if (Array.isArray(components) && components.length > 0) { mapOldParentComponentToNewParentComponent[component.id] = newComponentId;
components.forEach((component) => {
const newComponent = {
id: uuidv4(),
component: component?.component,
layouts: component?.layouts,
};
if (parentComponent) {
if (
!skipTabCalendarCheck &&
(parentComponent.component.component === 'Tabs' || parentComponent.component.component === 'Calendar')
) {
const childTabId = component.parent.split('-').at(-1);
newComponent.parent = `${parentComponent.id}-${childTabId}`;
} else {
newComponent.parent = parentComponent.id;
}
}
finalComponents.push(newComponent);
if (component.children.length > 0) {
buildComponents(component.children, newComponent);
}
});
} }
};
buildComponents(pastedComponent, parentComponent, true); const newComponent = {
component: {
...component.component,
parent: component.parent ? mapOldParentComponentToNewParentComponent[component.parent] : undefined,
},
layouts: component.layouts,
};
finalComponents[newComponentId] = newComponent;
});
!isCloning && updateComponentLayout(pastedComponents, parentId, isCut);
updateNewComponents(pageId, appDefinition, finalComponents, appDefinitionChanged); updateNewComponents(pageId, appDefinition, finalComponents, appDefinitionChanged);
!isCloning && toast.success('Component pasted succesfully'); !isCloning && toast.success('Component pasted succesfully');