admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: object activate dropdown (#8438)

Browse Source 
Fixes: #8436 
Fixes: #8435 
& other duplicate ```DropdownMenu```
This commit is contained in:
Harsh Singh
2024-11-11 13:56:07 +05:30
committed by GitHub
parent 51d1305e27
commit 6d62dd9fd1
7 changed files with 143 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
View File

@ -9,7 +9,6 @@ import {
} from 'twenty-ui';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { FieldMetadataType } from '~/generated-metadata/graphql';
@ -55,31 +54,34 @@ export const SettingsObjectFieldInactiveActionDropdown = ({
<Dropdown
dropdownId={dropdownId}
clickableComponent={
<LightIconButton Icon={IconDotsVertical} accent="tertiary" />
<LightIconButton
aria-label="Inactive Field Options"
Icon={IconDotsVertical}
accent="tertiary"
/>
}
dropdownMenuWidth={160}
dropdownComponents={
<DropdownMenu width="160px">
<DropdownMenuItemsContainer>
<DropdownMenuItemsContainer>
<MenuItem
text={isCustomField ? 'Edit' : 'View'}
LeftIcon={isCustomField ? IconPencil : IconEye}
onClick={handleEdit}
/>
<MenuItem
text="Activate"
LeftIcon={IconArchiveOff}
onClick={handleActivate}
/>
{isDeletable && (
<MenuItem
text={isCustomField ? 'Edit' : 'View'}
LeftIcon={isCustomField ? IconPencil : IconEye}
onClick={handleEdit}
text="Delete"
accent="danger"
LeftIcon={IconTrash}
onClick={handleDelete}
/>
<MenuItem
text="Activate"
LeftIcon={IconArchiveOff}
onClick={handleActivate}
/>
{isDeletable && (
<MenuItem
text="Delete"
accent="danger"
LeftIcon={IconTrash}
onClick={handleDelete}
/>
)}
</DropdownMenuItemsContainer>
</DropdownMenu>
)}
</DropdownMenuItemsContainer>
}
dropdownHotkeyScope={{
scope: dropdownId,

36
packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
View File

@ -7,7 +7,6 @@ import {
} from 'twenty-ui';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
@ -42,26 +41,29 @@ export const SettingsObjectInactiveMenuDropDown = ({
<Dropdown
dropdownId={dropdownId}
clickableComponent={
<LightIconButton Icon={IconDotsVertical} accent="tertiary" />
<LightIconButton
aria-label="Inactive Object Options"
Icon={IconDotsVertical}
accent="tertiary"
/>
}
dropdownMenuWidth={160}
dropdownComponents={
<DropdownMenu width="160px">
<DropdownMenuItemsContainer>
<DropdownMenuItemsContainer>
<MenuItem
text="Activate"
LeftIcon={IconArchiveOff}
onClick={handleActivate}
/>
{isCustomObject && (
<MenuItem
text="Activate"
LeftIcon={IconArchiveOff}
onClick={handleActivate}
text="Delete"
LeftIcon={IconTrash}
accent="danger"
onClick={handleDelete}
/>
{isCustomObject && (
<MenuItem
text="Delete"
LeftIcon={IconTrash}
accent="danger"
onClick={handleDelete}
/>
)}
</DropdownMenuItemsContainer>
</DropdownMenu>
)}
</DropdownMenuItemsContainer>
}
dropdownHotkeyScope={{
scope: dropdownId,