The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fields widget rename group (#18169)
Baptiste Devessiera06abb1d60f1
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsxindex eafbe4e6043..3746409f45f 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsx@@ -9,11 +9,14 @@ import {import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/useContextStoreObjectMetadataItemOrThrow';import { FieldsConfigurationGroupEditor } from '@/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor';import { useCreateFieldsWidgetEditorGroup } from '@/page-layout/widgets/fields/hooks/useCreateFieldsWidgetEditorGroup';+import { useDeleteFieldsWidgetEditorGroup } from '@/page-layout/widgets/fields/hooks/useDeleteFieldsWidgetEditorGroup';import { useFieldsWidgetGroupsDraft } from '@/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsDraft';import { useMoveFieldInDraft } from '@/page-layout/widgets/fields/hooks/useMoveFieldInDraft';import { useReorderFieldsWidgetEditorGroups } from '@/page-layout/widgets/fields/hooks/useReorderFieldsWidgetEditorGroups';import { useToggleFieldVisibilityInDraft } from '@/page-layout/widgets/fields/hooks/useToggleFieldVisibilityInDraft';+import { useUpdateFieldsWidgetEditorGroup } from '@/page-layout/widgets/fields/hooks/useUpdateFieldsWidgetEditorGroup';import { useLingui } from '@lingui/react/macro';+import { useState } from 'react';const StyledGroupsDroppable = styled.div`display: flex;@@ -58,6 +61,36 @@ export const FieldsConfigurationEditor = ({widgetId,});+ const { updateGroup } = useUpdateFieldsWidgetEditorGroup({+ pageLayoutId,+ widgetId,+ });++ const { deleteGroup } = useDeleteFieldsWidgetEditorGroup({+ pageLayoutId,+ widgetId,+ });++ const [renamingGroupValue, setRenamingGroupValue] = useState('');++ const handleStartRename = ({ groupName }: { groupName: string }) => {+ setRenamingGroupValue(groupName);+ };++ const handleRenameGroup = ({+ groupId,+ newName,+ }: {+ groupId: string;+ newName: string;+ }) => {+ updateGroup({ groupId, name: newName });+ };++ const handleDeleteGroup = ({ groupId }: { groupId: string }) => {+ deleteGroup(groupId);+ };+const handleDragEnd = (result: DropResult) => {const { source, destination, type } = result;@@ -153,6 +186,11 @@ export const FieldsConfigurationEditor = ({onToggleFieldVisibility={(fieldMetadataId) =>toggleFieldVisibility(group.id, fieldMetadataId)}+ onRenameGroup={handleRenameGroup}+ onDeleteGroup={handleDeleteGroup}+ renamingGroupValue={renamingGroupValue}+ onRenamingGroupValueChange={setRenamingGroupValue}+ onStartRename={handleStartRename}/>)}</Draggable>diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsxnew file mode 100644index 00000000000..9cecb48a612--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx@@ -0,0 +1,66 @@+import { useLingui } from '@lingui/react/macro';+import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/display';+import { LightIconButton } from 'twenty-ui/input';+import { MenuItem } from 'twenty-ui/navigation';++import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';++type FieldsConfigurationGroupDropdownProps = {+ groupId: string;+ onStartRename: () => void;+ onDelete: () => void;+};++export const FieldsConfigurationGroupDropdown = ({+ groupId,+ onStartRename,+ onDelete,+}: FieldsConfigurationGroupDropdownProps) => {+ const { t } = useLingui();++ const dropdownId = `fields-configuration-group-edit-${groupId}`;++ const { closeDropdown } = useCloseDropdown();++ const handleRename = () => {+ closeDropdown(dropdownId);+ onStartRename();+ };++ const handleDelete = () => {+ closeDropdown(dropdownId);+ onDelete();+ };++ return (+ <Dropdown+ dropdownId={dropdownId}+ clickableComponent={+ <LightIconButton Icon={IconDotsVertical} accent="tertiary" />+ }+ dropdownPlacement="bottom-start"+ dropdownComponents={+ <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>+ <DropdownMenuItemsContainer>+ <MenuItem+ LeftIcon={IconPencil}+ onClick={handleRename}+ accent="default"+ text={t`Rename`}+ />+ <MenuItem+ LeftIcon={IconTrash}+ onClick={handleDelete}+ accent="danger"+ text={t`Delete`}+ />+ </DropdownMenuItemsContainer>+ </DropdownContent>+ }+ />+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsxindex da4f2368d83..231677c4c55 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupEditor.tsx@@ -6,8 +6,15 @@ import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItimport { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { FieldsConfigurationFieldEditor } from '@/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor';+import { FieldsConfigurationGroupDropdown } from '@/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown';+import { FieldsConfigurationGroupRenameInput } from '@/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput';import { type FieldsWidgetGroup } from '@/page-layout/widgets/fields/types/FieldsWidgetGroup';-import { IconDotsVertical, IconNewSection } from 'twenty-ui/display';+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';+import { IconNewSection } from 'twenty-ui/display';import { MenuItem, MenuItemDraggable } from 'twenty-ui/navigation';const StyledFieldsDroppable = styled.div`@@ -27,6 +34,26 @@ const StyledGroupContainer = styled.div<{ isDragging: boolean }>`width: 100%;`;+const StyledGroupHeaderRow = styled.div`+ align-items: center;+ display: flex;+ position: relative;+ width: 100%;+`;++const StyledMenuItemDraggableWrapper = styled.div`+ flex: 1;+ min-width: 0;+`;++const StyledDropdownContainer = styled.div`+ position: absolute;+ right: ${({ theme }) => theme.spacing(1)};+ top: 50%;+ transform: translateY(-50%);+ z-index: 1;+`;+type FieldsConfigurationGroupEditorProps = {group: FieldsWidgetGroup;index: number;@@ -35,6 +62,11 @@ type FieldsConfigurationGroupEditorProps = {isDragging: boolean;onAddGroup?: () => void;onToggleFieldVisibility: (fieldMetadataId: string) => void;+ onRenameGroup: (params: { groupId: string; newName: string }) => void;+ onDeleteGroup: (params: { groupId: string }) => void;+ renamingGroupValue: string;+ onRenamingGroupValueChange: (value: string) => void;+ onStartRename: (params: { groupId: string; groupName: string }) => void;};export const FieldsConfigurationGroupEditor = ({@@ -43,9 +75,41 @@ export const FieldsConfigurationGroupEditor = ({isDragging,onAddGroup,onToggleFieldVisibility,+ onRenameGroup,+ onDeleteGroup,+ renamingGroupValue,+ onRenamingGroupValueChange,+ onStartRename,}: FieldsConfigurationGroupEditorProps) => {const { t } = useLingui();+ const renameDropdownId = `fields-configuration-group-rename-${group.id}`;++ const { openDropdown } = useOpenDropdown();+ const { closeDropdown } = useCloseDropdown();++ const handleStartRename = () => {+ onStartRename({ groupId: group.id, groupName: group.name });+ openDropdown({+ dropdownComponentInstanceIdFromProps: renameDropdownId,+ });+ };++ const handleCancelRename = () => {+ closeDropdown(renameDropdownId);+ };++ const handleRenameGroup = ({+ groupId,+ newName,+ }: {+ groupId: string;+ newName: string;+ }) => {+ closeDropdown(renameDropdownId);+ onRenameGroup({ groupId, newName });+ };+const sortedFields = [...group.fields].sort((a, b) => a.position - b.position,);@@ -58,23 +122,46 @@ export const FieldsConfigurationGroupEditor = ({isDragging={isDragging}>{/* eslint-disable-next-line react/jsx-props-no-spreading */}- <div {...draggableProvided.dragHandleProps}>- <MenuItemDraggable- text={group.name}- gripMode="always"- isIconDisplayedOnHoverOnly={false}- withIconContainer- iconButtons={[- {- Icon: IconDotsVertical,- onClick: (e) => {- e.stopPropagation();- // TODO: Add group menu- },- },- ]}+ <StyledGroupHeaderRow {...draggableProvided.dragHandleProps}>+ <Dropdown+ dropdownId={renameDropdownId}+ clickableComponentWidth="100%"+ clickableComponent={+ <StyledMenuItemDraggableWrapper>+ <MenuItemDraggable+ text={group.name}+ gripMode="always"+ isIconDisplayedOnHoverOnly={false}+ withIconContainer+ />+ </StyledMenuItemDraggableWrapper>+ }+ disableClickForClickableComponent+ dropdownPlacement="bottom-start"+ dropdownOffset={{ x: 32 }}+ onClose={handleCancelRename}+ dropdownComponents={+ <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>+ <FieldsConfigurationGroupRenameInput+ dropdownId={renameDropdownId}+ renameValue={renamingGroupValue}+ onRenameValueChange={onRenamingGroupValueChange}+ onSave={(newName) =>+ handleRenameGroup({ groupId: group.id, newName })+ }+ onCancel={handleCancelRename}+ />+ </DropdownContent>+ }/>- </div>+ <StyledDropdownContainer>+ <FieldsConfigurationGroupDropdown+ groupId={group.id}+ onStartRename={handleStartRename}+ onDelete={() => onDeleteGroup({ groupId: group.id })}+ />+ </StyledDropdownContainer>+ </StyledGroupHeaderRow><Droppable droppableId={`group-${group.id}`} type="FIELD">{(droppableProvided) => (diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput.tsxnew file mode 100644index 00000000000..bb7ebd73dc1--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput.tsx@@ -0,0 +1,75 @@+import styled from '@emotion/styled';+import { useLingui } from '@lingui/react/macro';+import { Key } from 'ts-key-enum';++import { TextInput } from '@/ui/input/components/TextInput';+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';+import { Button } from 'twenty-ui/input';++const StyledContainer = styled.div`+ align-items: center;+ display: flex;+ gap: ${({ theme }) => theme.spacing(1)};+ padding: ${({ theme }) => theme.spacing(1)};+ width: 100%;+ box-sizing: border-box;+`;++type FieldsConfigurationGroupRenameInputProps = {+ dropdownId: string;+ renameValue: string;+ onRenameValueChange: (value: string) => void;+ onSave: (newName: string) => void;+ onCancel: () => void;+};++export const FieldsConfigurationGroupRenameInput = ({+ dropdownId,+ renameValue,+ onRenameValueChange,+ onSave,+ onCancel,+}: FieldsConfigurationGroupRenameInputProps) => {+ const { t } = useLingui();++ const handleSave = () => {+ if (renameValue.trim().length > 0) {+ onSave(renameValue.trim());+ }+ onCancel();+ };++ useHotkeysOnFocusedElement({+ keys: [Key.Enter],+ callback: handleSave,+ focusId: dropdownId,+ dependencies: [handleSave],+ });++ useHotkeysOnFocusedElement({+ keys: [Key.Escape],+ callback: onCancel,+ focusId: dropdownId,+ dependencies: [onCancel],+ });++ return (+ <StyledContainer>+ <TextInput+ value={renameValue}+ onChange={onRenameValueChange}+ autoFocus+ fullWidth+ sizeVariant="sm"+ placeholder={t`Group name`}+ />+ <Button+ variant="primary"+ accent="blue"+ size="small"+ title="Done"+ onClick={handleSave}+ />+ </StyledContainer>+ );+};