Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improvement: the folder deletion #6527

Open
wants to merge 26 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b77cd08
improvement: the folder deletion
kobenguyent Sep 18, 2023
01d8741
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Sep 18, 2023
d7f4c50
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Sep 19, 2023
8a8176d
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Sep 25, 2023
abbde86
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Sep 25, 2023
e5681a9
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Sep 25, 2023
e61458a
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Sep 26, 2023
c82e221
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 1, 2023
4b63d17
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 1, 2023
dfb939a
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 1, 2023
f27b495
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 3, 2023
d116b9e
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 3, 2023
62c3b3d
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 3, 2023
dcf4e5c
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 4, 2023
6f24b5a
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 5, 2023
3205c58
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Oct 31, 2023
923c763
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Nov 15, 2023
e0b8726
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Nov 19, 2023
10c15e1
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Nov 21, 2023
d64cf4c
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Nov 22, 2023
aa7ff64
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Nov 22, 2023
b3a6556
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Dec 4, 2023
7d5eeb9
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Dec 7, 2023
7ab03d9
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Dec 15, 2023
0cb2dee
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Jan 17, 2024
242f701
Merge branch 'develop' into feat-confirm-when-deleting-folder
kobenguyent Apr 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -16,6 +16,7 @@ import { CreateRequestType, useRequestGroupPatcher } from '../../hooks/use-reque
import { useRootLoaderData } from '../../routes/root';
import { WorkspaceLoaderData } from '../../routes/workspace';
import { type DropdownHandle, type DropdownProps } from '../base/dropdown';
import { PromptButton } from '../base/prompt-button';
import { Icon } from '../icon';
import { showError, showModal, showPrompt } from '../modals';
import { AskModal } from '../modals/ask-modal';
Expand Down Expand Up @@ -239,13 +240,6 @@ export const RequestGroupActionsDropdown = ({
action: () =>
handleRename(),
},
{
id: 'Delete',
name: 'Delete',
icon: 'trash',
action: () =>
handleDeleteFolder(),
},
...actionPlugins.map(plugin => ({
id: plugin.label,
name: plugin.label,
Expand All @@ -265,6 +259,12 @@ export const RequestGroupActionsDropdown = ({
return (
<Fragment>
<MenuTrigger onOpenChange={isOpen => isOpen && onOpen()}>
<PromptButton
onClick={() => handleDeleteFolder()}
className="opacity-0 hover:opacity-100"
>
<Icon icon='trash' />
</PromptButton>
<Button
data-testid={`Dropdown-${toKebabCase(requestGroup.name)}`}
aria-label="Request Group Actions"
Expand Down