The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Display a single Add a Section button (#18563)
Baptiste Devessier69542898a1ca
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 6c8da8cd7ba..0e8b1d0f5dc 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@@ -25,6 +25,8 @@ import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useLingui } from '@lingui/react/macro';import { useState } from 'react';+import { IconNewSection } from 'twenty-ui/display';+import { MenuItem } from 'twenty-ui/navigation';const StyledGroupsDroppable = styled.div`display: flex;@@ -32,6 +34,10 @@ const StyledGroupsDroppable = styled.div`width: 100%;`;+const StyledAddGroupButtonContainer = styled.div`+ border: 1px solid transparent;+`;+type FieldsConfigurationEditorProps = {pageLayoutId: string;widgetId: string;@@ -250,6 +256,16 @@ export const FieldsConfigurationEditor = ({</Draggable>))}{provided.placeholder}++ <StyledAddGroupButtonContainer>+ <MenuItem+ LeftIcon={IconNewSection}+ text={t`Add a Group`}+ onClick={() => handleAddGroup({})}+ withIconContainer+ withIconContainerBackground={false}+ />+ </StyledAddGroupButtonContainer></StyledGroupsDroppable>)}</Droppable>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.tsxindex 244f1eee424..b2aab93b76a 100644--- 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.tsx@@ -1,5 +1,10 @@import { useLingui } from '@lingui/react/macro';-import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/display';+import {+ IconDotsVertical,+ IconNewSection,+ IconPencil,+ IconTrash,+} from 'twenty-ui/display';import { LightIconButton } from 'twenty-ui/input';import { MenuItem } from 'twenty-ui/navigation';@@ -14,12 +19,14 @@ type FieldsConfigurationGroupDropdownProps = {groupId: string;onStartRename: () => void;onDelete: () => void;+ onAddGroup?: () => void;};export const FieldsConfigurationGroupDropdown = ({groupId,onStartRename,onDelete,+ onAddGroup,}: FieldsConfigurationGroupDropdownProps) => {const { t } = useLingui();@@ -37,6 +44,11 @@ export const FieldsConfigurationGroupDropdown = ({onDelete();};+ const handleAddGroup = () => {+ closeDropdown(dropdownId);+ onAddGroup?.();+ };+return (<DropdowndropdownId={dropdownId}@@ -59,6 +71,12 @@ export const FieldsConfigurationGroupDropdown = ({accent="danger"text={t`Delete`}/>+ <MenuItem+ LeftIcon={IconNewSection}+ onClick={handleAddGroup}+ accent="default"+ text={t`Add a Group`}+ /></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 b7c37fa455c..c28ad6d604e 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@@ -15,8 +15,6 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContentimport { 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 } from 'twenty-ui/navigation';import { FieldsConfigurationGroupDraggableHeader } from '@/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -172,6 +170,7 @@ export const FieldsConfigurationGroupEditor = ({groupId={group.id}onStartRename={handleStartRename}onDelete={() => onDeleteGroup({ groupId: group.id })}+ onAddGroup={onAddGroup}/></StyledDropdownContainer></StyledGroupHeaderRow>@@ -215,13 +214,6 @@ export const FieldsConfigurationGroupEditor = ({</StyledFieldsDroppable>)}</Droppable>-- <MenuItem- LeftIcon={IconNewSection}- withIconContainer- text={t`Add a Section`}- onClick={onAddGroup}- /></StyledGroupContainer>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsxindex bd0c78877c2..33a19663331 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsx@@ -82,9 +82,10 @@ export const FieldsConfigurationUngroupedEditor = ({<MenuItemLeftIcon={IconNewSection}- withIconContainer- text={t`Add a Section`}+ text={t`Add a Group`}onClick={onAddGroup}+ withIconContainer+ withIconContainerBackground={false}/></StyledFieldsDroppable>)}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsxindex 3966d5e8157..593495cfbdc 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx@@ -42,15 +42,15 @@ const StyledPropertyBox = styled.div``;const StyledInlineFieldsPropertyBox = styled.div<{- hasMoreSection: boolean;+ hasMoreGroup: boolean;}>`align-self: stretch;border-radius: ${themeCssVariables.border.radius.sm};display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[2]};- padding-bottom: ${({ hasMoreSection }) =>- hasMoreSection ? themeCssVariables.spacing[3] : '0'};+ padding-bottom: ${({ hasMoreGroup }) =>+ hasMoreGroup ? themeCssVariables.spacing[3] : '0'};padding-top: 0;`;@@ -137,7 +137,7 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {>{displayMode === 'inline' ? (<StyledInlineFieldsPropertyBox- hasMoreSection={shouldShowHiddenFields}+ hasMoreGroup={shouldShowHiddenFields}><FieldsWidgetFieldListfields={groups.flatMap((group) => group.fields)}diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsxindex 927dfbc2c86..083fcd16e20 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx@@ -33,6 +33,7 @@ export type MenuItemProps = {accent?: MenuItemAccent;className?: string;withIconContainer?: boolean;+ withIconContainerBackground?: boolean;iconButtons?: MenuItemIconButton[];isIconDisplayedOnHoverOnly?: boolean;isTooltipOpen?: boolean;@@ -65,6 +66,7 @@ export const MenuItem = ({accent = 'default',className,withIconContainer = false,+ withIconContainerBackground = true,iconButtons,isIconDisplayedOnHoverOnly = true,LeftIcon,@@ -112,6 +114,7 @@ export const MenuItem = ({LeftIcon={LeftIcon ?? undefined}LeftComponent={LeftComponent}withIconContainer={withIconContainer}+ withIconContainerBackground={withIconContainerBackground}text={text}contextualText={contextualText}contextualTextPosition={contextualTextPosition}diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsxindex 087b432c84f..96d499220b1 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx@@ -1,16 +1,18 @@import { type IconComponent } from '@ui/display';-import { useContext } from 'react';import { ThemeContext } from '@ui/theme-constants';+import { useContext } from 'react';import { MenuItemIconBoxContainer } from './MenuItemIconBoxContainer';export type MenuItemIconProps = {Icon: IconComponent | null | undefined;withContainer?: boolean;+ withContainerBackground?: boolean;};export const MenuItemIcon = ({Icon,withContainer = false,+ withContainerBackground = true,}: MenuItemIconProps) => {const { theme } = useContext(ThemeContext);@@ -23,7 +25,11 @@ export const MenuItemIcon = ({);if (withContainer) {- return <MenuItemIconBoxContainer>{iconElement}</MenuItemIconBoxContainer>;+ return (+ <MenuItemIconBoxContainer hasBackground={withContainerBackground}>+ {iconElement}+ </MenuItemIconBoxContainer>+ );}return iconElement;diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.tsxindex b45d2cf1e3f..398074da87d 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.tsx@@ -4,6 +4,14 @@ import { type ReactNode } from 'react';import { themeCssVariables } from '@ui/theme-constants';const StyledIconContainerBase = styled.div`+ align-items: flex-start;+ border-radius: ${themeCssVariables.border.radius.sm};+ display: flex;+ flex-direction: column;+ padding: ${themeCssVariables.spacing[1]};+`;++const StyledIconContainerWithBackground = styled.div`align-items: flex-start;background: ${themeCssVariables.background.transparent.light};border-radius: ${themeCssVariables.border.radius.sm};@@ -15,15 +23,17 @@ const StyledIconContainerBase = styled.div`export const StyledIconContainer = ({children,className,+ hasBackground = true,}: {children?: ReactNode;className?: string;+ hasBackground?: boolean;}) => {- return (- <StyledIconContainerBase className={className}>- {children}- </StyledIconContainerBase>- );+ const Component = hasBackground+ ? StyledIconContainerWithBackground+ : StyledIconContainerBase;++ return <Component className={className}>{children}</Component>;};export { StyledIconContainer as MenuItemIconBoxContainer };diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsxindex bf9e51b43ae..de2273c2a52 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx@@ -43,6 +43,7 @@ type MenuItemLeftContentProps = {LeftComponent?: ReactNode;LeftIcon: IconComponent | null | undefined;withIconContainer?: boolean;+ withIconContainerBackground?: boolean;gripMode?: MenuItemDraggableGripMode;disabled?: boolean;text: ReactNode;@@ -55,6 +56,7 @@ export const MenuItemLeftContent = ({LeftComponent,LeftIcon,withIconContainer = false,+ withIconContainerBackground = true,text,contextualText,contextualTextPosition = 'left',@@ -73,7 +75,7 @@ export const MenuItemLeftContent = ({<StyledMenuItemLeftContent className={className}>{gripMode === 'always' &&(withIconContainer ? (- <MenuItemIconBoxContainer>+ <MenuItemIconBoxContainer hasBackground={withIconContainerBackground}><StyledDraggableItem><IconGripVerticalsize={theme.icon.size.md}@@ -98,7 +100,11 @@ export const MenuItemLeftContent = ({gripIconColor={gripIconColor}/>) : (- <MenuItemIcon Icon={LeftIcon} withContainer={withIconContainer} />+ <MenuItemIcon+ Icon={LeftIcon}+ withContainer={withIconContainer}+ withContainerBackground={withIconContainerBackground}+ />)}{LeftComponent}<StyledMenuItemLabel>