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

remove widget/component(s): fixed

Browse source
This commit is contained in:
arpitnath 2023-08-09 19:09:52 +05:30
parent 453405d7f2
commit 9770df8b3f
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Editor/ConfigHandle.jsx
View file

@ -56,7 +56,7 @@ export const ConfigHandle = function ConfigHandle({
role="button"
height="12"
draggable="false"
onClick={() => removeComponent({ id })}
onClick={() => removeComponent(id)}
data-cy={`${component.name.toLowerCase()}-delete-button`}
className="delete-icon"
/>

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

@ -768,7 +768,7 @@ const EditorComponent = (props) => {
draft.homePageId = newDefinition.homePageId;
}
if (opts?.generalAppDefinitionChanged || opts?.globalSettings) {
if (opts?.generalAppDefinitionChanged || opts?.globalSettings || isEmpty(opts)) {
Object.assign(draft, newDefinition);
}
});
@ -952,20 +952,20 @@ const EditorComponent = (props) => {
// }
};
const removeComponent = (component) => {
const removeComponent = (componentId) => {
if (!props.isVersionReleased) {
let newDefinition = cloneDeep(appDefinition);
// Delete child components when parent is deleted
let childComponents = [];
if (newDefinition.pages[currentPageId].components?.[component.id].component.component === 'Tabs') {
if (newDefinition.pages[currentPageId].components?.[componentId].component.component === 'Tabs') {
childComponents = Object.keys(newDefinition.pages[currentPageId].components).filter((key) =>
newDefinition.pages[currentPageId].components[key].parent?.startsWith(component.id)
newDefinition.pages[currentPageId].components[key].parent?.startsWith(componentId)
);
} else {
childComponents = Object.keys(newDefinition.pages[currentPageId].components).filter(
(key) => newDefinition.pages[currentPageId].components[key].parent === component.id
(key) => newDefinition.pages[currentPageId].components[key].parent === componentId
);
}
@ -973,7 +973,7 @@ const EditorComponent = (props) => {
delete newDefinition.pages[currentPageId].components[componentId];
});
delete newDefinition.pages[currentPageId].components[component.id];
delete newDefinition.pages[currentPageId].components[componentId];
const platform = navigator?.userAgentData?.platform || navigator?.platform || 'unknown';
if (platform.toLowerCase().indexOf('mac') > -1) {
toast('Component deleted! (⌘ + Z to undo)', {
@ -985,7 +985,7 @@ const EditorComponent = (props) => {
});
}
appDefinitionChanged(newDefinition, {
skipAutoSave: props.isVersionReleased,
componentDefinitionChanged: true,
});
handleInspectorView();
} else {
@ -1049,10 +1049,10 @@ const EditorComponent = (props) => {
};
const removeComponents = () => {
if (!props.isVersionReleased && selectedComponents?.length > 1) {
if (!props.isVersionReleased && selectedComponents?.length >= 1) {
let newDefinition = cloneDeep(appDefinition);
removeSelectedComponent(currentPageId, newDefinition, selectedComponents);
removeSelectedComponent(currentPageId, newDefinition, selectedComponents, appDefinitionChanged);
const platform = navigator?.userAgentData?.platform || navigator?.platform || 'unknown';
if (platform.toLowerCase().indexOf('mac') > -1) {
toast('Selected components deleted! (⌘ + Z to undo)', {
@ -1063,9 +1063,7 @@ const EditorComponent = (props) => {
icon: '🗑️',
});
}
appDefinitionChanged(newDefinition, {
skipAutoSave: props.isVersionReleased,
});
// appDefinitionChanged(newDefinition);
handleInspectorView();
} else if (props.isVersionReleased) {
useAppVersionStore.getState().actions.enableReleasedVersionPopupState();

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

@ -1565,7 +1565,7 @@ export function snapToGrid(canvasWidth, x, y) {
const snappedY = Math.round(y / 10) * 10;
return [snappedX, snappedY];
}
export const removeSelectedComponent = (pageId, newDefinition, selectedComponents) => {
export const removeSelectedComponent = (pageId, newDefinition, selectedComponents, updateAppDefinition) => {
selectedComponents.forEach((component) => {
let childComponents = [];
@ -1585,6 +1585,8 @@ export const removeSelectedComponent = (pageId, newDefinition, selectedComponent
delete newDefinition.pages[pageId].components[component.id];
});
updateAppDefinition(newDefinition, { componentDefinitionChanged: true });
};
const getSelectedText = () => {