Skip to content

The open alternative to Salesforce, designed for AI.

Make deactivated objects editable from settings (#24258)

Thomas Trompettee970c061adb6
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
index 5948af252ea..f759261bf25 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
@@ -4,7 +4,13 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
-import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui/icon';
+import {
+ IconArchiveOff,
+ IconDotsVertical,
+ IconEye,
+ IconPencil,
+ IconTrash,
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
@@ -12,14 +18,18 @@ type SettingsObjectInactiveMenuDropDownProps = {
isCustomObject: boolean;
onActivate: () => void;
onDelete: () => void;
+ onEdit: () => void;
objectMetadataItemNamePlural: string;
+ isReadOnly?: boolean;
};
export const SettingsObjectInactiveMenuDropDown = ({
onActivate,
objectMetadataItemNamePlural,
onDelete,
+ onEdit,
isCustomObject,
+ isReadOnly = false,
}: SettingsObjectInactiveMenuDropDownProps) => {
const dropdownId = `${objectMetadataItemNamePlural}-settings-object-inactive-menu-dropdown`;
@@ -35,6 +45,13 @@ export const SettingsObjectInactiveMenuDropDown = ({
closeDropdown(dropdownId);
};
+ const handleEdit = () => {
+ onEdit();
+ closeDropdown(dropdownId);
+ };
+
+ const isEditable = isCustomObject && !isReadOnly;
+
return (
<Dropdown
dropdownId={dropdownId}
@@ -49,11 +66,18 @@ export const SettingsObjectInactiveMenuDropDown = ({
<DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
<DropdownMenuItemsContainer>
<MenuItem
- text={t`Activate`}
- LeftIcon={IconArchiveOff}
- onClick={handleActivate}
+ text={isEditable ? t`Edit` : t`View`}
+ LeftIcon={isEditable ? IconPencil : IconEye}
+ onClick={handleEdit}
/>
- {isCustomObject && (
+ {!isReadOnly && (
+ <MenuItem
+ text={t`Activate`}
+ LeftIcon={IconArchiveOff}
+ onClick={handleActivate}
+ />
+ )}
+ {isCustomObject && !isReadOnly && (
<MenuItem
text={t`Delete`}
LeftIcon={IconTrash}
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
index 14f0aaf10f0..934e918feb4 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
@@ -10,11 +10,13 @@ import { ComponentDecorator } from 'twenty-ui/testing';
const handleActivateMockFunction = fn();
const handleDeleteMockFunction = fn();
+const handleEditMockFunction = fn();
const ClearMocksDecorator: Decorator = (Story, context) => {
if (context.parameters.clearMocks === true) {
handleActivateMockFunction.mockClear();
handleDeleteMockFunction.mockClear();
+ handleEditMockFunction.mockClear();
}
return <Story />;
};
@@ -26,6 +28,7 @@ const meta: Meta<typeof SettingsObjectInactiveMenuDropDown> = {
objectMetadataItemNamePlural: 'settings-object-inactive-menu-dropdown',
onActivate: handleActivateMockFunction,
onDelete: handleDeleteMockFunction,
+ onEdit: handleEditMockFunction,
},
decorators: [ComponentDecorator, ClearMocksDecorator],
parameters: {
@@ -72,6 +75,50 @@ export const WithActivate: Story = {
},
};
+export const WithEdit: Story = {
+ args: { isCustomObject: true },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ const dropdownButton = await canvas.findByRole('button', {
+ name: 'Inactive Object Options',
+ });
+
+ await userEvent.click(dropdownButton);
+
+ await expect(handleEditMockFunction).toHaveBeenCalledTimes(0);
+
+ const editMenuItem = await canvas.findByText('Edit');
+
+ await userEvent.click(editMenuItem);
+
+ await expect(handleEditMockFunction).toHaveBeenCalledTimes(1);
+
+ await userEvent.click(dropdownButton);
+ },
+};
+
+export const WithView: Story = {
+ args: { isCustomObject: false },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ const dropdownButton = await canvas.findByRole('button', {
+ name: 'Inactive Object Options',
+ });
+
+ await userEvent.click(dropdownButton);
+
+ const viewMenuItem = await canvas.findByText('View');
+
+ await userEvent.click(viewMenuItem);
+
+ await expect(handleEditMockFunction).toHaveBeenCalledTimes(1);
+
+ await userEvent.click(dropdownButton);
+ },
+};
+
export const WithDelete: Story = {
args: { isCustomObject: true },
play: async ({ canvasElement }) => {
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
index 23644f2c54d..9f0e6ef23d1 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
@@ -38,6 +38,7 @@ import {
ThemeContext,
themeCssVariables,
} from 'twenty-ui/theme-constants';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { GET_SETTINGS_OBJECT_TABLE_METADATA } from '~/pages/settings/data-model/constants/SettingsObjectTableMetadata';
import type { SettingsObjectTableItem } from '~/pages/settings/data-model/types/SettingsObjectTableItem';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
@@ -73,6 +74,7 @@ export const SettingsObjectTable = ({
const { theme } = useContext(ThemeContext);
const { t } = useLingui();
const getIsMetadataItemCustom = useGetIsMetadataItemCustom();
+ const navigate = useNavigateSettings();
const isAdvancedModeEnabled = useAtomStateValue(isAdvancedModeEnabledState);
const isDDLLocked = useAtomStateValue(isDDLLockedState);
@@ -261,14 +263,22 @@ export const SettingsObjectTable = ({
stroke={theme.icon.stroke.sm}
/>
</StyledIconChevronRightContainer>
- ) : isDDLLocked ? null : (
+ ) : (
<SettingsObjectInactiveMenuDropDown
isCustomObject={getIsMetadataItemCustom(
objectSettingsItem.objectMetadataItem,
)}
+ isReadOnly={isDDLLocked}
objectMetadataItemNamePlural={
objectSettingsItem.objectMetadataItem.namePlural
}
+ onEdit={() =>
+ navigate(SettingsPath.ObjectDetail, {
+ objectNamePlural:
+ objectSettingsItem.objectMetadataItem
+ .namePlural,
+ })
+ }
onActivate={() =>
updateOneObjectMetadataItem({
idToUpdate: