The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(twenty-front): new layout fast-follows — settings drawer, loading & command menu (#21389)
Félix Malfaitadba66caea15
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsxindex cdaa5077fcd..ff8072c49a1 100644--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsx@@ -1,7 +1,7 @@import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';-import { NavigationDrawerAiChatContent } from '@/ai/components/NavigationDrawerAiChatContent';import { MainNavigationDrawerNavigationContent } from '@/navigation/components/MainNavigationDrawerNavigationContent';import { MainNavigationDrawerTabsRow } from '@/navigation/components/MainNavigationDrawerTabsRow';+import { NavigationDrawerTabbedContent } from '@/navigation/components/NavigationDrawerTabbedContent';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';import { NavigationDrawerFixedContent } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerFixedContent';@@ -32,11 +32,10 @@ export const MainNavigationDrawer = ({ className }: { className?: string }) => {</NavigationDrawerFixedContent><NavigationDrawerScrollableContent>- {showAiChatContent ? (- <NavigationDrawerAiChatContent />- ) : (- <MainNavigationDrawerNavigationContent />- )}+ <NavigationDrawerTabbedContent+ showAiChatContent={showAiChatContent}+ navigationContent={<MainNavigationDrawerNavigationContent />}+ /></NavigationDrawerScrollableContent></NavigationDrawer>);diff --git a/packages/twenty-front/src/modules/navigation/components/NavigationDrawerTabbedContent.tsx b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerTabbedContent.tsxnew file mode 100644index 00000000000..fffac0d093c--- /dev/null+++ b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerTabbedContent.tsx@@ -0,0 +1,36 @@+import { NavigationDrawerAiChatContent } from '@/ai/components/NavigationDrawerAiChatContent';+import { styled } from '@linaria/react';+import { type ReactNode, useState } from 'react';++type NavigationDrawerTabbedContentProps = {+ showAiChatContent: boolean;+ navigationContent: ReactNode;+};++const StyledTabContent = styled.div<{ isHidden: boolean }>`+ display: ${({ isHidden }) => (isHidden ? 'none' : 'contents')};+`;++export const NavigationDrawerTabbedContent = ({+ showAiChatContent,+ navigationContent,+}: NavigationDrawerTabbedContentProps) => {+ const [hasOpenedAiChat, setHasOpenedAiChat] = useState(showAiChatContent);++ if (showAiChatContent && !hasOpenedAiChat) {+ setHasOpenedAiChat(true);+ }++ return (+ <>+ <StyledTabContent isHidden={showAiChatContent}>+ {navigationContent}+ </StyledTabContent>+ {hasOpenedAiChat && (+ <StyledTabContent isHidden={!showAiChatContent}>+ <NavigationDrawerAiChatContent />+ </StyledTabContent>+ )}+ </>+ );+};diff --git a/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsx b/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsxindex 51bde137d6c..721bc4933a6 100644--- a/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsx+++ b/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsx@@ -1,5 +1,5 @@-import { NavigationDrawerAiChatContent } from '@/ai/components/NavigationDrawerAiChatContent';import { MainNavigationDrawerTabsRow } from '@/navigation/components/MainNavigationDrawerTabsRow';+import { NavigationDrawerTabbedContent } from '@/navigation/components/NavigationDrawerTabbedContent';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { SettingsNavigationDrawerItems } from '@/settings/components/SettingsNavigationDrawerItems';import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';@@ -18,10 +18,8 @@ import { themeCssVariables } from 'twenty-ui-deprecated/theme-constants';import { PermissionFlagType } from '~/generated-metadata/graphql';const StyledAdvancedToggleWrapper = styled.div<{ isMobile: boolean }>`- padding-left: ${({ isMobile }) =>- isMobile ? '0' : themeCssVariables.spacing[5]};padding-right: ${({ isMobile }) =>- isMobile ? '0' : themeCssVariables.spacing[8]};+ isMobile ? '0' : themeCssVariables.spacing[1]};`;export const SettingsNavigationDrawer = ({@@ -52,11 +50,10 @@ export const SettingsNavigationDrawer = ({)}<NavigationDrawerScrollableContent>- {showAiChatContent ? (- <NavigationDrawerAiChatContent />- ) : (- <SettingsNavigationDrawerItems />- )}+ <NavigationDrawerTabbedContent+ showAiChatContent={showAiChatContent}+ navigationContent={<SettingsNavigationDrawerItems />}+ /></NavigationDrawerScrollableContent>{!showAiChatContent && (@@ -65,7 +62,7 @@ export const SettingsNavigationDrawer = ({<AdvancedSettingsToggleisAdvancedModeEnabled={isAdvancedModeEnabled}setIsAdvancedModeEnabled={setIsAdvancedModeEnabled}- label={t`Advanced:`}+ label={t`Advanced`}/></StyledAdvancedToggleWrapper></NavigationDrawerFixedContent>diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsxindex cff5bdf0b56..9df0d0dbb10 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx@@ -39,7 +39,6 @@ export const SettingsNavigationDrawerItem = ({label={item.label}to={href}Icon={item.Icon}- withIconBackgroundactive={isActive}modifier={item.modifier}onClick={item.onClick}@@ -55,7 +54,6 @@ export const SettingsNavigationDrawerItem = ({label={item.label}to={href || undefined}Icon={item.Icon}- withIconBackgroundactive={isActive}modifier={item.modifier}onClick={item.onClick}diff --git a/packages/twenty-front/src/modules/settings/components/SettingsSkeletonLoader.tsx b/packages/twenty-front/src/modules/settings/components/SettingsSkeletonLoader.tsxindex f5b047bb395..f0e5f551bd6 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsSkeletonLoader.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsSkeletonLoader.tsx@@ -1,6 +1,4 @@import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';-import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';import { PageCardHeader } from '@/ui/layout/page/components/PageCardHeader';import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';import { useContext } from 'react';@@ -39,9 +37,7 @@ export const SettingsSkeletonLoader = () => {}showInformationBanner={false}>- <SettingsPageContainer>- <SettingsSectionSkeletonLoader />- </SettingsPageContainer>+ {null}</PageCardLayout></SkeletonTheme>);diff --git a/packages/twenty-front/src/modules/settings/components/layout/SettingsPageLayout.tsx b/packages/twenty-front/src/modules/settings/components/layout/SettingsPageLayout.tsxindex a0853eb488e..ccfff453fd3 100644--- a/packages/twenty-front/src/modules/settings/components/layout/SettingsPageLayout.tsx+++ b/packages/twenty-front/src/modules/settings/components/layout/SettingsPageLayout.tsx@@ -29,6 +29,7 @@ export const SettingsPageLayout = ({title={title}tag={tag}actionButton={actionButton}+ centerTitle/>}secondaryBar={diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown.tsxdeleted file mode 100644index b631c4faa43..00000000000--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown.tsx+++ /dev/null@@ -1,135 +0,0 @@-import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';-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 { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { styled } from '@linaria/react';-import { t } from '@lingui/core/macro';-import { useContext } from 'react';-import { useLocation, useParams, useSearchParams } from 'react-router-dom';-import { SettingsPath } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { IconChevronDown } from 'twenty-ui-deprecated/display';-import { Button } from 'twenty-ui-deprecated/input';-import { MenuItem } from 'twenty-ui-deprecated/navigation';-import {- ThemeContext,- themeCssVariables,-} from 'twenty-ui-deprecated/theme-constants';-import { useNavigateSettings } from '~/hooks/useNavigateSettings';--const StyledContainer = styled.div`- align-items: center;- color: ${themeCssVariables.font.color.tertiary};- cursor: default;- display: flex;- font-size: ${themeCssVariables.font.size.md};-`;--const StyledButtonContainer = styled.div`- position: relative;- width: 100%;-`;--const StyledDownChevronContainer = styled.span`- align-items: center;- color: ${themeCssVariables.font.color.primary};- display: flex;- position: absolute;- right: ${themeCssVariables.spacing['1.5']};- top: 50%;- transform: translateY(-50%);-`;--const StyledMenuItemWrapper = styled.div<{ disabled?: boolean }>`- cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};- width: 100%;-`;--const StyledSpan = styled.span`- margin-left: ${themeCssVariables.spacing[2]};-`;--const StyledButtonWrapper = styled.div`- button {- color: ${themeCssVariables.font.color.primary};- padding-right: ${themeCssVariables.spacing[6]};- }-`;--export const SettingsDataModelNewFieldBreadcrumbDropDown = () => {- const { theme } = useContext(ThemeContext);- const dropdownId = `settings-object-new-field-breadcrumb-dropdown`;- const { closeDropdown } = useCloseDropdown();- const navigate = useNavigateSettings();- const location = useLocation();- const { objectNamePlural = '' } = useParams();- const [searchParams] = useSearchParams();-- const fieldType = searchParams.get('fieldType') as SettingsFieldType;- const isConfigureStep = location.pathname.includes('/configure');-- const handleClick = (step: 'select' | 'configure') => {- if (step === 'configure' && isDefined(fieldType)) {- navigate(- SettingsPath.ObjectNewFieldConfigure,- { objectNamePlural },- { fieldType },- );- } else {- navigate(- SettingsPath.ObjectNewFieldSelect,- { objectNamePlural },- fieldType ? { fieldType } : undefined,- );- }- closeDropdown(dropdownId);- };-- return (- <StyledContainer>- {t`New Field`} <StyledSpan>-</StyledSpan>- <Dropdown- dropdownPlacement="bottom-start"- dropdownId={dropdownId}- clickableComponent={- <StyledButtonContainer>- <StyledDownChevronContainer>- <IconChevronDown size={theme.icon.size.md} />- </StyledDownChevronContainer>- {isConfigureStep ? (- <StyledButtonWrapper>- <Button variant="tertiary" title={t`2. Configure`} />- </StyledButtonWrapper>- ) : (- <StyledButtonWrapper>- <Button variant="tertiary" title={t`1. Type`} />- </StyledButtonWrapper>- )}- </StyledButtonContainer>- }- dropdownComponents={- <DropdownContent>- <DropdownMenuItemsContainer>- <StyledMenuItemWrapper>- <MenuItem- text={t`1. Type`}- onClick={() => handleClick('select')}- selected={!isConfigureStep}- />- </StyledMenuItemWrapper>- <StyledMenuItemWrapper disabled={!isDefined(fieldType)}>- <MenuItem- text={t`2. Configure`}- onClick={() => handleClick('configure')}- selected={isConfigureStep}- disabled={!isDefined(fieldType)}- />- </StyledMenuItemWrapper>- </DropdownMenuItemsContainer>- </DropdownContent>- }- />- </StyledContainer>- );-};diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsxindex d2e95465bc2..89371810ab1 100644--- a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsx+++ b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsx@@ -71,15 +71,10 @@ const StyledLoadingMore = styled.div`text-align: center;`;-const StyledSkeletonContainer = styled.div`- padding: ${themeCssVariables.spacing[2]};-`;-const StyledIntersectionObserver = styled.div`height: 1px;`;-const SKELETON_ROW_COUNT = 8;const EVENT_LOG_SCROLL_WRAPPER_INSTANCE_ID = 'event-log-results-table';const buildGridTemplateColumns = (@@ -192,19 +187,23 @@ export const EventLogResultsTable = ({<TableHeader key={column.id}>{t(column.label)}</TableHeader>))}</TableRow>+ <TableRow gridTemplateColumns={gridTemplateColumns}>+ {baseColumns.map((column, index) => (+ <TableCell key={column.id}>+ {index === 0 && (+ <SkeletonTheme+ baseColor={theme.background.tertiary}+ highlightColor={theme.background.transparent.lighter}+ borderRadius={4}+ >+ <Skeleton width={120} height={16} />+ </SkeletonTheme>+ )}+ </TableCell>+ ))}+ </TableRow></Table></StyledTableContainer>- <SkeletonTheme- baseColor={theme.background.tertiary}- highlightColor={theme.background.transparent.lighter}- borderRadius={4}- >- <StyledSkeletonContainer>- {Array.from({ length: SKELETON_ROW_COUNT }).map((_, index) => (- <Skeleton height={40} key={index} style={{ marginBottom: 4 }} />- ))}- </StyledSkeletonContainer>- </SkeletonTheme></ScrollWrapper></StyledScrollWrapperContainer>);diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsxindex a2e3b19d5ac..5180b000e6f 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx@@ -1,6 +1,8 @@import { SIDE_PANEL_TOP_BAR_HEIGHT_MOBILE } from '@/side-panel/constants/SidePanelTopBarHeightMobile';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';+import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';+import { SidePanelPages } from 'twenty-shared/types';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';import { PAGE_HEADER_SIDE_PANEL_BUTTON_CLICK_OUTSIDE_ID } from '@/ui/layout/page-header/constants/PageHeaderSidePanelButtonClickOutsideId';@@ -130,12 +132,23 @@ const AnimatedIcon = ({export const SidePanelToggleButton = () => {const { toggleSidePanelMenu } = useSidePanelMenu();const isSidePanelOpened = useAtomStateValue(isSidePanelOpenedState);+ const sidePanelPage = useAtomStateValue(sidePanelPageState);const isLayoutCustomizationModeEnabled = useAtomStateValue(isLayoutCustomizationModeEnabledState,);const isMobile = useIsMobile();+ const isCommandMenuOpened =+ isSidePanelOpened &&+ [+ SidePanelPages.CommandMenuDisplay,+ SidePanelPages.CommandMenuEdit,+ SidePanelPages.SearchRecords,+ ].includes(sidePanelPage);++ const showAsOpen = isSidePanelOpened && !isCommandMenuOpened;+const alignWithSidePanelTopBar =isMobile && isLayoutCustomizationModeEnabled && isSidePanelOpened;@@ -148,7 +161,7 @@ export const SidePanelToggleButton = () => {<StyledButtonWrapper alignToTop={alignWithSidePanelTopBar}><div id="toggle-side-panel-button"><AnimatedButton- animatedSvg={<AnimatedIcon isSidePanelOpened={isSidePanelOpened} />}+ animatedSvg={<AnimatedIcon isSidePanelOpened={showAsOpen} />}dataClickOutsideId={PAGE_HEADER_SIDE_PANEL_BUTTON_CLICK_OUTSIDE_ID}dataTestId="page-header-side-panel-button"size={isMobile ? 'medium' : 'small'}@@ -158,7 +171,7 @@ export const SidePanelToggleButton = () => {ariaLabel={ariaLabel}onClick={toggleSidePanelMenu}animate={{- rotate: isSidePanelOpened ? 90 : 0,+ rotate: showAsOpen ? 90 : 0,}}transition={{duration: theme.animation.duration.normal,diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsxindex c7477a72bc0..ce7d182251d 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsx@@ -19,6 +19,7 @@ type PageCardHeaderProps = {title?: ReactNode;tag?: ReactNode;actionButton?: ReactNode;+ centerTitle?: boolean;};const StyledHeader = styled.div`@@ -30,6 +31,7 @@ const StyledHeader = styled.div`gap: ${themeCssVariables.spacing[2]};min-height: ${SIDE_PANEL_TOP_BAR_HEIGHT}px;padding: 0 ${themeCssVariables.spacing[3]};+ position: relative;width: 100%;`;@@ -51,6 +53,15 @@ const StyledTitle = styled.div`min-width: 0;`;+const StyledCenteredTitle = styled(StyledTitle)`+ bottom: 0;+ justify-content: center;+ left: 50%;+ position: absolute;+ top: 0;+ transform: translateX(-50%);+`;+const StyledRight = styled.div`align-items: center;display: flex;@@ -67,10 +78,22 @@ export const PageCardHeader = ({title,tag,actionButton,+ centerTitle = false,}: PageCardHeaderProps) => {const isMobile = useIsMobile();const isNavigationDrawerExpanded = useNavigationDrawerExpanded();+ const hasTitleContent =+ !isMobile && (isDefined(icon) || isDefined(title) || isDefined(tag));++ const titleContent = (+ <>+ {icon}+ {isDefined(title) && title}+ {tag}+ </>+ );+return (<StyledHeader><StyledLeft>@@ -80,15 +103,13 @@ export const PageCardHeader = ({{isDefined(breadcrumb)? breadcrumb: isDefined(links) && <Breadcrumb links={links} />}- {!isMobile &&- (isDefined(icon) || isDefined(title) || isDefined(tag)) && (- <StyledTitle>- {icon}- {isDefined(title) && title}- {tag}- </StyledTitle>- )}+ {!centerTitle && hasTitleContent && (+ <StyledTitle>{titleContent}</StyledTitle>+ )}</StyledLeft>+ {centerTitle && hasTitleContent && (+ <StyledCenteredTitle>{titleContent}</StyledCenteredTitle>+ )}<StyledRightdata-click-outside-id={PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID}>diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsxindex 08f2ee0c58f..b5163623db5 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsx@@ -1,8 +1,16 @@import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';import { useNavigationSection } from '@/ui/navigation/navigation-drawer/hooks/useNavigationSection';+import { styled } from '@linaria/react';import { type ReactNode } from 'react';import { AnimatedExpandableContainer } from 'twenty-ui-deprecated/layout';+import { themeCssVariables } from 'twenty-ui-deprecated/theme-constants';++const StyledItems = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.betweenSiblingsGap};+`;type CollapsibleNavigationDrawerSectionProps = {// Namespaced id (e.g. 'settings/User') used to persist open/closed state.@@ -39,7 +47,7 @@ export const CollapsibleNavigationDrawerSection = ({containAnimationinitial={false}>- {children}+ <StyledItems>{children}</StyledItems></AnimatedExpandableContainer></NavigationDrawerSection>);diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsxindex fca66d724ea..0a137065dee 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx@@ -31,7 +31,7 @@ const StyledIconAndButtonContainer = styled.button`font-family: ${themeCssVariables.font.family};font-weight: ${themeCssVariables.font.weight.medium};gap: ${themeCssVariables.spacing[2]};- padding: ${themeCssVariables.spacing['1.5']} ${themeCssVariables.spacing[1]};+ padding: ${themeCssVariables.spacing[1]};width: 100%;&:hover {background: ${themeCssVariables.background.transparent.light};diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsxindex 7a27d975057..e98929b9d97 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx@@ -16,7 +16,7 @@ const StyledTitle = styled.div`align-items: center;border-radius: ${themeCssVariables.border.radius.sm};display: flex;- height: ${themeCssVariables.spacing[5]};+ height: ${themeCssVariables.spacing[7]};justify-content: space-between;padding-bottom: ${themeCssVariables.spacing[1]};padding-left: ${themeCssVariables.spacing[1]};diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsxindex 58fb12e3b9d..950d0ecc3a4 100644--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx@@ -1,9 +1,8 @@import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';-import { SettingsDataModelNewFieldBreadcrumbDropDown } from '@/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown';+import { SettingsWizardStepBar } from '@/settings/components/layout/SettingsWizardStepBar';import { FIELD_NAME_MAXIMUM_LENGTH } from '@/settings/data-model/constants/FieldNameMaximumLength';import { SettingsDataModelFieldIconLabelForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm';import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';@@ -23,6 +22,7 @@ import {} from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { H2Title } from 'twenty-ui-deprecated/display';+import { Button } from 'twenty-ui-deprecated/input';import { Section } from 'twenty-ui-deprecated/layout';import { type z } from 'zod';import { FieldMetadataType } from '~/generated-metadata/graphql';@@ -181,7 +181,7 @@ export const SettingsObjectNewFieldConfigure = () => {{...formConfig}><SettingsPageLayout- title={t`2. Configure field`}+ title={activeObjectMetadataItem.labelPlural}links={[{children: t`Workspace`,@@ -197,26 +197,28 @@ export const SettingsObjectNewFieldConfigure = () => {objectNamePlural,}),},-- { children: <SettingsDataModelNewFieldBreadcrumbDropDown /> },+ { children: t`New field` },]}- actionButton={- <SaveAndCancelButtons- isLoading={isSaving}- isSaveDisabled={!canSave}- isCancelDisabled={isSubmitting}- onCancel={() =>+ secondaryBar={+ <SettingsWizardStepBar+ label={t`2. Configure field`}+ onBack={() =>navigate(SettingsPath.ObjectNewFieldSelect,- {- objectNamePlural,- },- {- fieldType,- },+ { objectNamePlural },+ { fieldType },)}- onSave={formConfig.handleSubmit(handleSave)}+ trailing={+ <Button+ title={t`Save`}+ variant="primary"+ size="small"+ accent="blue"+ onClick={formConfig.handleSubmit(handleSave)}+ disabled={!canSave || isSaving}+ />+ }/>}>diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsxindex 67eaa59e77f..24ff9145b4f 100644--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx@@ -1,11 +1,11 @@import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';-import { SettingsDataModelNewFieldBreadcrumbDropDown } from '@/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown';+import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';+import { SettingsWizardStepBar } from '@/settings/components/layout/SettingsWizardStepBar';import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';import { SettingsObjectNewFieldSelector } from '@/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector';import { type FieldType } from '@/settings/data-model/types/FieldType';import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';-import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { zodResolver } from '@hookform/resolvers/zod';import { t } from '@lingui/core/macro';import { useEffect } from 'react';@@ -65,7 +65,7 @@ export const SettingsObjectNewFieldSelect = () => {{...formMethods}><SettingsPageLayout- title={t`1. Select a field type`}+ title={activeObjectMetadataItem.labelPlural}links={[{children: t`Workspace`,@@ -78,8 +78,11 @@ export const SettingsObjectNewFieldSelect = () => {objectNamePlural,}),},- { children: <SettingsDataModelNewFieldBreadcrumbDropDown /> },+ { children: t`New field` },]}+ secondaryBar={+ <SettingsWizardStepBar label={t`1. Select a field type`} />+ }><SettingsPageContainer><SettingsObjectNewFieldSelectordiff --git a/packages/twenty-ui-deprecated/src/navigation/link/components/AdvancedSettingsToggle.tsx b/packages/twenty-ui-deprecated/src/navigation/link/components/AdvancedSettingsToggle.tsxindex c9a7958bfbd..c72d6ef5a37 100644--- a/packages/twenty-ui-deprecated/src/navigation/link/components/AdvancedSettingsToggle.tsx+++ b/packages/twenty-ui-deprecated/src/navigation/link/components/AdvancedSettingsToggle.tsx@@ -1,16 +1,17 @@import { styled } from '@linaria/react';-import { IconPoint } from '@ui/display';import { Toggle } from '@ui/input';import { ThemeContext, themeCssVariables } from '@ui/theme-constants';import { useContext, useId } from 'react';-const StyledContainer = styled.div`+const StyledContainer = styled.label`align-items: center;+ box-sizing: border-box;+ cursor: pointer;display: flex;- gap: ${themeCssVariables.spacing[2]};- position: relative;height: ${themeCssVariables.spacing[5]};+ justify-content: space-between;padding: ${themeCssVariables.spacing[1]};+ width: 100%;`;const StyledText = styled.div`@@ -19,21 +20,6 @@ const StyledText = styled.div`font-weight: ${themeCssVariables.font.weight.medium};`;-const StyledIconContainer = styled.div`- align-items: center;- display: flex;- left: calc(-1 * ${themeCssVariables.spacing[5]});- position: absolute;-`;--const StyledToggleContainer = styled.label`- align-items: center;- cursor: pointer;- display: flex;- justify-content: space-between;- width: 100%;-`;-type AdvancedSettingsToggleProps = {isAdvancedModeEnabled: boolean;setIsAdvancedModeEnabled: (enabled: boolean) => void;@@ -43,7 +29,7 @@ type AdvancedSettingsToggleProps = {export const AdvancedSettingsToggle = ({isAdvancedModeEnabled,setIsAdvancedModeEnabled,- label = 'Advanced:',+ label = 'Advanced',}: AdvancedSettingsToggleProps) => {const { theme } = useContext(ThemeContext);@@ -52,23 +38,15 @@ export const AdvancedSettingsToggle = ({};const instanceId = useId();- const yellowColor = theme.color.yellow;-return (- <StyledContainer>- <StyledIconContainer>- <IconPoint size={12} color={yellowColor} fill={yellowColor} />- </StyledIconContainer>- <StyledToggleContainer htmlFor={instanceId}>- <StyledText>{label}</StyledText>-- <Toggle- id={instanceId}- onChange={onChange}- color={yellowColor}- value={isAdvancedModeEnabled}- />- </StyledToggleContainer>+ <StyledContainer htmlFor={instanceId}>+ <StyledText>{label}</StyledText>+ <Toggle+ id={instanceId}+ onChange={onChange}+ color={theme.color.yellow}+ value={isAdvancedModeEnabled}+ /></StyledContainer>);};