Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix\Issues while performing actions on Home Page #749 (#1291)

Browse Source 
Fixes #749
This commit is contained in:
Adam 2020-10-19 17:16:27 +01:00 committed by GitHub
parent 7cb9583034
commit ff79074fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
View File

@ -108,14 +108,15 @@ export const ActionEntityContextMenu = (props: EntityContextMenuProps) => {
value: "move", value: "move",
onSelect: noop, onSelect: noop,
label: "Move to page", label: "Move to page",
children: menuPages children: menuPages.length > 1 ?
.filter(page => page.id !== props.pageId) // Remove current page from the list menuPages
.map(page => { .filter(page => page.id !== props.pageId) // Remove current page from the list
return { .map(page => {
...page, return {
onSelect: () => moveActionToPage(props.id, props.name, page.id), ...page,
}; onSelect: () => moveActionToPage(props.id, props.name, page.id),
}), };
}) : [{ value: "No Pages", onSelect: noop, label: "No Pages" }]
}, },
{ {
value: "delete", value: "delete",

14
app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
View File

@ -77,12 +77,14 @@ export const PageContextMenu = (props: {
label: "Set as Home Page", label: "Set as Home Page",
}); });
} }
optionTree.push({ if (!props.isDefaultPage) {
value: "delete", optionTree.push({
onSelect: () => deletePage(props.pageId, props.name), value: "delete",
label: "Delete", onSelect: () => deletePage(props.pageId, props.name),
intent: "danger", label: "Delete",
}); intent: "danger",
});
}
return ( return (
<TreeDropdown <TreeDropdown
className={props.className} className={props.className}