From 464fd5c4853a23a36ec2f7111ae1cc18a21fdf9d Mon Sep 17 00:00:00 2001 From: Pacifique LINJANJA Date: Mon, 2 Sep 2024 19:24:30 +0400 Subject: [PATCH] chore: improve the softdelete style (#6846) ## This PR - Fix #6836 Screenshot 2024-09-02 at 17 54 31 --- .../record-index/hooks/useHandleToggleTrashColumnFilter.ts | 4 ++-- .../options/components/RecordIndexOptionsDropdownContent.tsx | 5 ++--- .../twenty-ui/src/display/icon/components/TablerIcons.ts | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts index fe27cadc1b2b..033773b966a4 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts @@ -29,7 +29,7 @@ export const useHandleToggleTrashColumnFilter = ({ const handleToggleTrashColumnFilter = useCallback(() => { const trashFieldMetadata = objectMetadataItem.fields.find( - (field) => field.name === 'deletedAt', + (field: { name: string }) => field.name === 'deletedAt', ); if (!isDefined(trashFieldMetadata)) return; @@ -52,7 +52,7 @@ export const useHandleToggleTrashColumnFilter = ({ operand: ViewFilterOperand.IsNotEmpty, displayValue: '', definition: { - label: `Deleted ${objectMetadataItem.namePlural}`, + label: `Deleted`, iconName: 'IconTrash', fieldMetadataId: trashFieldMetadata.id, type: filterType, diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx index ea4d0d93f83c..2386009de3b2 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx @@ -6,9 +6,9 @@ import { IconEyeOff, IconFileExport, IconFileImport, + IconRotate2, IconSettings, IconTag, - IconTrash, } from 'twenty-ui'; import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObjectNamePluralFromSingular'; @@ -165,8 +165,7 @@ export const RecordIndexOptionsDropdownContent = ({ handleToggleTrashColumnFilter(); closeDropdown(); }} - LeftIcon={IconTrash} - accent="danger" + LeftIcon={IconRotate2} text={`Deleted ${objectNamePlural}`} /> diff --git a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts index b3423733b341..9ce697da3774 100644 --- a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts +++ b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts @@ -151,6 +151,7 @@ export { IconRestore, IconRocket, IconRotate, + IconRotate2, IconSearch, IconSend, IconSettings,