Skip to content

The open alternative to Salesforce, designed for AI.

Separate Twenty UI primitives and components (#26207)

Raphaël Bosi602edaa96349
diff --git a/packages/twenty-companion/src/renderer/components/Empty.tsx b/packages/twenty-companion/src/renderer/components/Empty.tsx
index 3e2ebccfa0e..ecb0a4f5663 100644
--- a/packages/twenty-companion/src/renderer/components/Empty.tsx
+++ b/packages/twenty-companion/src/renderer/components/Empty.tsx
@@ -1,6 +1,5 @@
-import { AnimatedPlaceholder } from '@ui/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder';
-import type { AnimatedPlaceholderType } from '@ui/primitives/feedback/AnimatedPlaceholder/types/AnimatedPlaceholderType';
import { type ReactNode } from 'react';
+import { RecordingEmptyIllustration } from './internal/RecordingEmptyIllustration';
export const Empty = ({
icon,
@@ -10,14 +9,14 @@ export const Empty = ({
actions,
}: {
icon?: ReactNode;
- animatedPlaceholderType?: AnimatedPlaceholderType;
+ animatedPlaceholderType?: 'noCallRecording';
title: string;
children: ReactNode;
actions?: ReactNode;
}) => (
<div className="empty">
{animatedPlaceholderType ? (
- <AnimatedPlaceholder type={animatedPlaceholderType} assetBasePath="." />
+ <RecordingEmptyIllustration />
) : (
<span className="empty-icon">{icon}</span>
)}
diff --git a/packages/twenty-companion/src/renderer/components/Home.tsx b/packages/twenty-companion/src/renderer/components/Home.tsx
index 91977604e97..bfa8684897d 100644
--- a/packages/twenty-companion/src/renderer/components/Home.tsx
+++ b/packages/twenty-companion/src/renderer/components/Home.tsx
@@ -1,4 +1,4 @@
-import { Section } from '@ui/components/Section/Section';
+import { Section } from '@ui/components/layout/Section/Section';
import { useNow } from '../hooks/useNow';
import { MeetingRow } from './MeetingRow';
import { i18n } from '@lingui/core';
diff --git a/packages/twenty-companion/src/renderer/components/MeetingRow.tsx b/packages/twenty-companion/src/renderer/components/MeetingRow.tsx
index bdf6a6533b4..8b73dc543f6 100644
--- a/packages/twenty-companion/src/renderer/components/MeetingRow.tsx
+++ b/packages/twenty-companion/src/renderer/components/MeetingRow.tsx
@@ -1,19 +1,19 @@
-import { i18n } from '@lingui/core';
import { Menu } from '@base-ui/react/menu';
-import { CalendarEventIndicator } from './CalendarEventIndicator';
-import { IconButton } from '@ui/components/IconButton/IconButton';
+import { i18n } from '@lingui/core';
+import { IconButton } from '@ui/components/input/IconButton/IconButton';
+import { MenuItem } from '@ui/components/navigation/MenuItem/MenuItem';
import { Button } from '@ui/primitives/input/Button/Button';
-import { MenuItem } from '@ui/primitives/navigation/MenuItem/MenuItem';
-import styles from './MeetingRow.module.scss';
import {
+ IconArrowUpRight,
IconCalendarEvent,
IconCalendarX,
IconDotsVertical,
- IconArrowUpRight,
} from 'twenty-ui/icon';
import { type Meeting } from '../../shared/types/Meeting';
import { type ActionProps } from '../types/ActionProps';
import { formatTime } from '../utils/formatTime';
+import { CalendarEventIndicator } from './CalendarEventIndicator';
+import styles from './MeetingRow.module.scss';
type MeetingRowProps = Pick<ActionProps, 'command' | 'isPending'> & {
meeting: Meeting;
diff --git a/packages/twenty-companion/src/renderer/components/Notice.tsx b/packages/twenty-companion/src/renderer/components/Notice.tsx
index 6b3bf10a864..bf028c48b9d 100644
--- a/packages/twenty-companion/src/renderer/components/Notice.tsx
+++ b/packages/twenty-companion/src/renderer/components/Notice.tsx
@@ -1,7 +1,7 @@
import { noticeMessage } from '../utils/noticeMessage';
import { Banner } from '@ui/primitives/feedback/Banner/Banner';
import { Notification } from './Notification';
-import { IconButton } from '@ui/components/IconButton/IconButton';
+import { IconButton } from '@ui/components/input/IconButton/IconButton';
import { i18n } from '@lingui/core';
import { Button } from '@ui/primitives/input/Button/Button';
import { IconX } from 'twenty-ui/icon';
diff --git a/packages/twenty-companion/src/renderer/components/Notification.tsx b/packages/twenty-companion/src/renderer/components/Notification.tsx
index 728f8202d7d..bfd9fdc1037 100644
--- a/packages/twenty-companion/src/renderer/components/Notification.tsx
+++ b/packages/twenty-companion/src/renderer/components/Notification.tsx
@@ -1,6 +1,6 @@
import { useState } from 'react';
import { IconInfoCircle, IconX } from '@ui/icon';
-import { IconButton } from '@ui/components/IconButton/IconButton';
+import { IconButton } from '@ui/components/input/IconButton/IconButton';
import { ProgressBar } from '@ui/primitives/feedback/ProgressBar/ProgressBar';
import { useTheme } from '@ui/theme-constants';
import styles from './Notification.module.scss';
diff --git a/packages/twenty-companion/src/renderer/components/Onboarding.tsx b/packages/twenty-companion/src/renderer/components/Onboarding.tsx
index 367a7deb0b8..e654f3fec2b 100644
--- a/packages/twenty-companion/src/renderer/components/Onboarding.tsx
+++ b/packages/twenty-companion/src/renderer/components/Onboarding.tsx
@@ -3,7 +3,7 @@ import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
import { useState } from 'react';
import { type CompanionState } from '../../shared/types/CompanionState';
import { Field } from '@ui/primitives/input/Field/Field';
-import { MainButton } from '@ui/components/MainButton/MainButton';
+import { MainButton } from '@ui/components/input/MainButton/MainButton';
import { IconArrowUpRight, IconRefresh } from 'twenty-ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
import { type ActionProps } from '../types/ActionProps';
diff --git a/packages/twenty-companion/src/renderer/components/Permissions.tsx b/packages/twenty-companion/src/renderer/components/Permissions.tsx
index fa28b6d9d96..8a3e9521af3 100644
--- a/packages/twenty-companion/src/renderer/components/Permissions.tsx
+++ b/packages/twenty-companion/src/renderer/components/Permissions.tsx
@@ -1,7 +1,7 @@
import { i18n } from '@lingui/core';
import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
import { Card } from '@ui/primitives/surfaces/Card/Card';
-import { MainButton } from '@ui/components/MainButton/MainButton';
+import { MainButton } from '@ui/components/input/MainButton/MainButton';
import {
IconMicrophone,
IconHeadphones,
diff --git a/packages/twenty-companion/src/renderer/components/RecordingControls.tsx b/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
index 8732badb926..a3033509767 100644
--- a/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
+++ b/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
@@ -1,4 +1,4 @@
-import { Section } from '@ui/components/Section/Section';
+import { Section } from '@ui/components/layout/Section/Section';
import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
import { Card } from '@ui/primitives/surfaces/Card/Card';
import { i18n } from '@lingui/core';
diff --git a/packages/twenty-companion/src/renderer/components/Settings.tsx b/packages/twenty-companion/src/renderer/components/Settings.tsx
index ba1d50a9f2c..33daf485dfc 100644
--- a/packages/twenty-companion/src/renderer/components/Settings.tsx
+++ b/packages/twenty-companion/src/renderer/components/Settings.tsx
@@ -1,4 +1,4 @@
-import { Section } from '@ui/components/Section/Section';
+import { Section } from '@ui/components/layout/Section/Section';
import { i18n } from '@lingui/core';
import { SettingsCardContent } from './SettingsCardContent';
import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
diff --git a/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx b/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx
index 0b7c0245198..01717e48fe4 100644
--- a/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx
+++ b/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx
@@ -4,7 +4,7 @@ import { formatShortcut } from '../utils/formatShortcut';
import { i18n } from '@lingui/core';
import { SettingsCardContent } from './SettingsCardContent';
import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
-import { IconButton } from '@ui/components/IconButton/IconButton';
+import { IconButton } from '@ui/components/input/IconButton/IconButton';
import { useState } from 'react';
import { IconCommand, IconRestore } from 'twenty-ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
diff --git a/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx b/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx
index 404763b99fe..d4d5b44a2f3 100644
--- a/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx
+++ b/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx
@@ -2,7 +2,7 @@
import { cleanup, render, screen } from '@testing-library/react';
import { afterEach, expect, it } from 'vitest';
import { IconSettings } from 'twenty-ui/icon';
-import { IconButton } from '@ui/components/IconButton/IconButton';
+import { IconButton } from '@ui/components/input/IconButton/IconButton';
import { Button } from '@ui/primitives/input/Button/Button';
afterEach(cleanup);
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss b/packages/twenty-companion/src/renderer/components/internal/RecordingEmptyIllustration.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss
rename to packages/twenty-companion/src/renderer/components/internal/RecordingEmptyIllustration.module.scss
diff --git a/packages/twenty-companion/src/renderer/components/internal/RecordingEmptyIllustration.tsx b/packages/twenty-companion/src/renderer/components/internal/RecordingEmptyIllustration.tsx
new file mode 100644
index 00000000000..c49a60c22ac
--- /dev/null
+++ b/packages/twenty-companion/src/renderer/components/internal/RecordingEmptyIllustration.tsx
@@ -0,0 +1,77 @@
+import { clsx } from 'clsx';
+import { useEffect, useRef } from 'react';
+
+import { useThemeColorScheme } from '@ui/theme-constants';
+
+import styles from './RecordingEmptyIllustration.module.scss';
+
+const PARALLAX_OFFSET_IN_PX = 2;
+
+export const RecordingEmptyIllustration = () => {
+ const colorScheme = useThemeColorScheme();
+ const movingImageRef = useRef<HTMLImageElement>(null);
+
+ useEffect(() => {
+ const movingImage = movingImageRef.current;
+ if (movingImage === null) {
+ return;
+ }
+
+ const setParallax = ({
+ offsetX,
+ offsetY,
+ }: {
+ offsetX: number;
+ offsetY: number;
+ }) => {
+ movingImage.style.setProperty('--parallax-x', `${offsetX}px`);
+ movingImage.style.setProperty('--parallax-y', `${offsetY}px`);
+ };
+
+ const handleMove = (event: MouseEvent | TouchEvent) => {
+ const clientX =
+ 'touches' in event ? event.touches[0].clientX : event.clientX;
+ const clientY =
+ 'touches' in event ? event.touches[0].clientY : event.clientY;
+
+ setParallax({
+ offsetX:
+ (clientX / window.innerWidth) * 2 * PARALLAX_OFFSET_IN_PX -
+ PARALLAX_OFFSET_IN_PX,
+ offsetY:
+ (clientY / window.innerHeight) * 2 * PARALLAX_OFFSET_IN_PX -
+ PARALLAX_OFFSET_IN_PX,
+ });
+ };
+
+ const handleLeave = () => {
+ setParallax({ offsetX: 0, offsetY: 0 });
+ };
+
+ window.addEventListener('mousemove', handleMove);
+ window.addEventListener('touchmove', handleMove);
+ window.document.addEventListener('mouseleave', handleLeave);
+
+ return () => {
+ window.removeEventListener('mousemove', handleMove);
+ window.removeEventListener('touchmove', handleMove);
+ window.document.removeEventListener('mouseleave', handleLeave);
+ };
+ }, []);
+
+ return (
+ <div className={styles.container}>
+ <img
+ src={`./images/placeholders/${colorScheme === 'dark' ? 'dark-background' : 'background'}/no_call_recording_bg.png`}
+ alt=""
+ className={clsx(styles.backgroundImage)}
+ />
+ <img
+ ref={movingImageRef}
+ src={`./images/placeholders/${colorScheme === 'dark' ? 'dark-moving-image' : 'moving-image'}/no_call_recording.png`}
+ alt=""
+ className={styles.movingImage}
+ />
+ </div>
+ );
+};
diff --git a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
index 9a08cb61de1..31fe75846b6 100644
--- a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
+++ b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
@@ -761,15 +761,15 @@ These entry points do not require `monaco-editor`.
| Subpath | What it exports |
| --- | --- |
-| `twenty-ui/primitives/accessibility` | Hidden elements and keyboard interaction helpers |
-| `twenty-ui/primitives/data-display` | Avatars, chips, tags, status indicators, and display helpers |
-| `twenty-ui/primitives/feedback` | Toasts, banners, progress bars, and loaders |
-| `twenty-ui/primitives/input` | Buttons, form controls, and pickers |
-| `twenty-ui/primitives/json-visualizer` | JSON tree viewer |
-| `twenty-ui/primitives/layout` | Layout, animation, resizing, and section components |
-| `twenty-ui/primitives/navigation` | Links, list items, menus, and tabs |
+| `twenty-ui/components` | Shared presets, pickers, menu rows, toasts, and the JSON viewer |
+| `twenty-ui/primitives/accessibility` | Hidden elements |
+| `twenty-ui/primitives/data-display` | Avatars, chips, tags, color samples, and status indicators |
+| `twenty-ui/primitives/feedback` | Banners, progress bars, and loaders |
+| `twenty-ui/primitives/input` | Buttons and form controls |
+| `twenty-ui/primitives/layout` | Expansion, separators, direction, and resizing |
+| `twenty-ui/primitives/navigation` | Action links, list items, and tabs |
| `twenty-ui/primitives/surfaces` | Cards, dialogs, menus, popovers, and tooltips |
-| `twenty-ui/primitives/typography` | Text, headings, labels, and typography helpers |
+| `twenty-ui/primitives/typography` | Text and headings |
| `twenty-ui/icon` | `Icon*` components (e.g. `IconCheck`) |
| `twenty-ui/theme-constants` | `ThemeProvider`, `themeCssVariables` |
diff --git a/packages/twenty-docs/docs.json b/packages/twenty-docs/docs.json
index f064944814e..75f3dcaf949 100644
--- a/packages/twenty-docs/docs.json
+++ b/packages/twenty-docs/docs.json
@@ -553,13 +553,8 @@
"ui/primitives/surfaces/alert-dialog",
"ui/primitives/surfaces/dialog",
"ui/primitives/surfaces/menu",
- "ui/primitives/surfaces/popover"
- ]
- },
- {
- "group": "Feedback",
- "pages": [
- "ui/primitives/feedback/toast"
+ "ui/primitives/surfaces/popover",
+ "ui/primitives/surfaces/tooltip"
]
},
{
@@ -582,7 +577,8 @@
"ui/components/section",
"ui/components/settings-row",
"ui/components/tab-button",
- "ui/components/code-editor"
+ "ui/components/code-editor",
+ "ui/components/toast"
]
}
]
@@ -7363,6 +7359,10 @@
{
"source": "/user-guide/billing/capabilities/billing-and-pricing-faq",
"destination": "/user-guide/billing/how-tos/billing-faq"
+ },
+ {
+ "source": "/ui/primitives/feedback/toast",
+ "destination": "/ui/components/toast"
}
]
}
diff --git a/packages/twenty-docs/navigation/base-structure.json b/packages/twenty-docs/navigation/base-structure.json
index 4dc2c604a67..fea73f70084 100644
--- a/packages/twenty-docs/navigation/base-structure.json
+++ b/packages/twenty-docs/navigation/base-structure.json
@@ -566,14 +566,10 @@
"ui/primitives/surfaces/alert-dialog",
"ui/primitives/surfaces/dialog",
"ui/primitives/surfaces/menu",
- "ui/primitives/surfaces/popover"
+ "ui/primitives/surfaces/popover",
+ "ui/primitives/surfaces/tooltip"
]
},
- {
- "key": "uiFeedback",
- "label": "Feedback",
- "pages": ["ui/primitives/feedback/toast"]
- },
{
"key": "uiTypography",
"label": "Typography",
@@ -596,7 +592,8 @@
"ui/components/section",
"ui/components/settings-row",
"ui/components/tab-button",
- "ui/components/code-editor"
+ "ui/components/code-editor",
+ "ui/components/toast"
]
}
]
diff --git a/packages/twenty-docs/navigation/navigation.template.json b/packages/twenty-docs/navigation/navigation.template.json
index 8717d50f5c8..cc64f147b0b 100644
--- a/packages/twenty-docs/navigation/navigation.template.json
+++ b/packages/twenty-docs/navigation/navigation.template.json
@@ -218,9 +218,6 @@
"uiSurfaces": {
"label": "Surfaces"
},
- "uiFeedback": {
- "label": "Feedback"
- },
"uiTypography": {
"label": "Typography"
}
diff --git a/packages/twenty-docs/snippets/ui/generated/navigation/list-item.mdx b/packages/twenty-docs/snippets/ui/generated/navigation/list-item.mdx
index 2216f6e6f0a..510476c82c2 100644
--- a/packages/twenty-docs/snippets/ui/generated/navigation/list-item.mdx
+++ b/packages/twenty-docs/snippets/ui/generated/navigation/list-item.mdx
@@ -15,6 +15,10 @@
Trailing content, such as buttons, rendered after the content.
</ParamField>
+<ParamField body="actionsVisibility" type="&quot;always&quot; | &quot;hover&quot;" default="hover">
+ When trailing actions are visible: on hover and focus, or always.
+</ParamField>
+
<ParamField body="color" type="&quot;danger&quot; | &quot;neutral&quot;" default="neutral">
Color of the text and icons. `danger` marks a destructive action.
</ParamField>
diff --git a/packages/twenty-docs/ui/components/input/light-icon-button.mdx b/packages/twenty-docs/ui/components/input/light-icon-button.mdx
index 00aea57915c..d9f3f18f500 100644
--- a/packages/twenty-docs/ui/components/input/light-icon-button.mdx
+++ b/packages/twenty-docs/ui/components/input/light-icon-button.mdx
@@ -46,10 +46,9 @@ Replace `LightIconButtonGroup` with [ButtonGroup](/ui/primitives/input/button-gr
`MenuItem`, `MenuItemDraggable`, and `MenuItemAvatar` accept JSX through `iconButtons`. Pass one `LightIconButton` directly, or use `ButtonGroup` for multiple buttons. The menu controls their placement and hover visibility; each button owns its accessible name, click handler, and disabled state. Wrap dropdown triggers directly around the button.
```tsx
-import { LightIconButton } from 'twenty-ui/components';
+import { LightIconButton, MenuItem } from 'twenty-ui/components';
import { IconEyeOff, IconTrash } from 'twenty-ui/icon';
import { ButtonGroup } from 'twenty-ui/primitives/input';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
export const RecordMenuItem = () => (
<MenuItem
diff --git a/packages/twenty-docs/ui/components/overview.mdx b/packages/twenty-docs/ui/components/overview.mdx
index ce3d0331f21..45e742269ef 100644
--- a/packages/twenty-docs/ui/components/overview.mdx
+++ b/packages/twenty-docs/ui/components/overview.mdx
@@ -20,3 +20,8 @@ Import shared components from `twenty-ui/components`. The code editor has its ow
| [SettingsRow](/ui/components/settings-row) | Labeled switches for settings and filters. |
| [TabButton](/ui/components/tab-button) | Route links and adjacent actions with the same appearance as tabs. |
| [CodeEditor](/ui/components/code-editor) | Code editing with Monaco, an optional header, and the Twenty theme. |
+| [Toast](/ui/components/toast) | Notifications, queue management, and dismissal. |
+
+Shared components also include `AvatarGroup`, `JsonTree`, `NavigationBar`, menu-row presets, pickers, banners, and icon-button presets. Import these from `twenty-ui/components`.
+
+Routing, record formatting, product placeholders, and application state belong to the host application. Shared components expose data, callback, and render props for those integrations.
diff --git a/packages/twenty-docs/ui/primitives/feedback/toast.mdx b/packages/twenty-docs/ui/components/toast.mdx
similarity index 95%
rename from packages/twenty-docs/ui/primitives/feedback/toast.mdx
rename to packages/twenty-docs/ui/components/toast.mdx
index 4db0a296efc..f06794a74cb 100644
--- a/packages/twenty-docs/ui/primitives/feedback/toast.mdx
+++ b/packages/twenty-docs/ui/components/toast.mdx
@@ -19,7 +19,7 @@ import ToastReference from '/snippets/ui/generated/feedback/toast.mdx';
```tsx
import { useState } from 'react';
-import { Toast } from 'twenty-ui/primitives/feedback';
+import { Toast } from 'twenty-ui/components';
export const SaveNotification = () => {
const [visible, setVisible] = useState(false);
@@ -49,7 +49,7 @@ export const SaveNotification = () => {
## Progress and cancellation
```tsx
-import { Toast } from 'twenty-ui/primitives/feedback';
+import { Toast } from 'twenty-ui/components';
type ImportProgressProps = { progress: number; onCancel: () => void };
diff --git a/packages/twenty-docs/ui/getting-started.mdx b/packages/twenty-docs/ui/getting-started.mdx
index c02d43855c4..a7ee39836dd 100644
--- a/packages/twenty-docs/ui/getting-started.mdx
+++ b/packages/twenty-docs/ui/getting-started.mdx
@@ -69,21 +69,20 @@ layout remain in the application.
Each primitive family has a matching public entry point, such as
`twenty-ui/primitives/input`.
-| Import | Contents |
-| -------------------------------------- | ------------------------------------------------------------ |
-| `twenty-ui/components` | Shared design presets and reusable app building blocks |
-| `twenty-ui/components/code-editor` | Code editor, editor header, and editor theme helpers |
-| `twenty-ui/primitives/accessibility` | Hidden elements and keyboard interaction helpers |
-| `twenty-ui/primitives/data-display` | Avatars, chips, tags, status indicators, and display helpers |
-| `twenty-ui/primitives/feedback` | Toasts, banners, progress bars, and loaders |
-| `twenty-ui/primitives/input` | Buttons, form controls, and pickers |
-| `twenty-ui/primitives/json-visualizer` | JSON tree viewer |
-| `twenty-ui/primitives/layout` | Layout, animation, resizing, and section components |
-| `twenty-ui/primitives/navigation` | Links, list items, menus, and tabs |
-| `twenty-ui/primitives/surfaces` | Cards, dialogs, menus, popovers, and tooltips |
-| `twenty-ui/primitives/typography` | Text, headings, labels, and typography helpers |
-| `twenty-ui/icon` | Icons |
-| `twenty-ui/theme-constants` | Theme provider, hooks, and CSS variable references |
+| Import | Contents |
+| ------------------------------------ | --------------------------------------------------------------- |
+| `twenty-ui/components` | Shared presets, pickers, menu rows, toasts, and the JSON viewer |
+| `twenty-ui/components/code-editor` | Code editor, editor header, and editor theme helpers |
+| `twenty-ui/primitives/accessibility` | Hidden elements |
+| `twenty-ui/primitives/data-display` | Avatars, chips, tags, color samples, and status indicators |
+| `twenty-ui/primitives/feedback` | Banners, progress bars, and loaders |
+| `twenty-ui/primitives/input` | Buttons and form controls |
+| `twenty-ui/primitives/layout` | Expansion, separators, direction, and resizing |
+| `twenty-ui/primitives/navigation` | Action links, list items, and tabs |
+| `twenty-ui/primitives/surfaces` | Cards, dialogs, menus, popovers, and tooltips |
+| `twenty-ui/primitives/typography` | Text and headings |
+| `twenty-ui/icon` | Icons |
+| `twenty-ui/theme-constants` | Theme provider, hooks, and CSS variable references |
Import individual icons, such as `IconCheck`, from `twenty-ui/icon`. The dynamic icon provider includes the full icon catalog, so reserve it for interfaces that need to look up icons at runtime.
diff --git a/packages/twenty-docs/ui/primitives/input/button-group.mdx b/packages/twenty-docs/ui/primitives/input/button-group.mdx
index 8e6745dea71..632a64a3970 100644
--- a/packages/twenty-docs/ui/primitives/input/button-group.mdx
+++ b/packages/twenty-docs/ui/primitives/input/button-group.mdx
@@ -4,6 +4,13 @@ description: Group related buttons with shared appearance and an optional frame.
---
import { StoryEmbed } from '/snippets/ui/StoryEmbed.mdx';
+
+<StoryEmbed
+ storyId="ui-input-button-buttongroup--default"
+ title="Button group"
+ height={220}
+/>
+
import ButtonGroupReference from '/snippets/ui/generated/input/button-group.mdx';
Give a group an accessible name and place related buttons inside it. The group joins adjacent borders and can apply a shared size, variant, and color. Buttons retain their own tab stops.
diff --git a/packages/twenty-docs/ui/primitives/input/button.mdx b/packages/twenty-docs/ui/primitives/input/button.mdx
index b1d9ede40b7..9efb265aec2 100644
--- a/packages/twenty-docs/ui/primitives/input/button.mdx
+++ b/packages/twenty-docs/ui/primitives/input/button.mdx
@@ -3,7 +3,9 @@ title: Button
description: Trigger actions or navigate with styled buttons.
---
-import { StoryEmbed } from '/snippets/ui/StoryEmbed.mdx';
+import StoryEmbed from '/snippets/ui/StoryEmbed.mdx';
+
+<StoryEmbed storyId="ui-input-button-button--default" height={220} />
import ButtonReference from '/snippets/ui/generated/input/button.mdx';
Use `Button` for an action. Supply its visible label as children, and give icon-only buttons an `aria-label`.
@@ -79,7 +81,7 @@ Compose `Button` with `AnimatedIconCrossfade` to change its icon when applicatio
import { useState } from 'react';
import { IconPencil, IconX } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { AnimatedIconCrossfade } from 'twenty-ui/primitives/layout';
+import { AnimatedIconCrossfade } from 'twenty-ui/components';
export const EditActions = () => {
const [isEditing, setIsEditing] = useState(false);
diff --git a/packages/twenty-docs/ui/primitives/overview.mdx b/packages/twenty-docs/ui/primitives/overview.mdx
index d8d55a05601..95d95add1c4 100644
--- a/packages/twenty-docs/ui/primitives/overview.mdx
+++ b/packages/twenty-docs/ui/primitives/overview.mdx
@@ -26,7 +26,7 @@ Choose a mode for each state and keep it for the lifetime of the component. Defa
Some components have more than one independent state. For example, [Select](/ui/primitives/input/select#open-state) can have a controlled value and uncontrolled popup visibility. [Menu](/ui/primitives/surfaces/menu#selection-and-submenus) can manage its own visibility while the application controls checkbox and radio selections.
-State belongs to the part that manages the interaction. Configure radio selection on [RadioGroup](/ui/primitives/input/radio-group), not on each Radio. Display components such as Text do not have a controlled or uncontrolled mode. [Toast](/ui/primitives/feedback/toast) delegates its visibility and removal to the application.
+State belongs to the part that manages the interaction. Configure radio selection on [RadioGroup](/ui/primitives/input/radio-group), not on each Radio. Display components such as Text do not have a controlled or uncontrolled mode. [Toast](/ui/components/toast) delegates its visibility and removal to the application.
## Composition
@@ -92,5 +92,4 @@ Each page includes usage examples, interaction guidance, and a generated API ref
| Forms | [Button](/ui/primitives/input/button), [ButtonGroup](/ui/primitives/input/button-group), [Field](/ui/primitives/input/field), [Input](/ui/primitives/input/input), [InputGroup](/ui/primitives/input/input-group), [Textarea](/ui/primitives/input/textarea), [Checkbox](/ui/primitives/input/checkbox), [Radio](/ui/primitives/input/radio), [RadioGroup](/ui/primitives/input/radio-group), [Select](/ui/primitives/input/select), [Slider](/ui/primitives/input/slider), [Switch](/ui/primitives/input/switch) |
| Navigation | [ListItem](/ui/primitives/navigation/list-item), [Tabs](/ui/primitives/navigation/tabs) |
| Surfaces | [AlertDialog](/ui/primitives/surfaces/alert-dialog), [Dialog](/ui/primitives/surfaces/dialog), [Menu](/ui/primitives/surfaces/menu), [Popover](/ui/primitives/surfaces/popover), [Tooltip](/ui/primitives/surfaces/tooltip) |
-| Feedback | [Toast](/ui/primitives/feedback/toast) |
| Typography | [Heading](/ui/primitives/typography/heading), [Text](/ui/primitives/typography/text) |
diff --git a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
index af6cd8e00d2..eebfc841339 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
@@ -28,12 +28,10 @@ import { createGalleryStory } from '@/__stories__/twenty-ui-gallery/utils/create
import { typographyTest } from '@/__stories__/twenty-ui-gallery/utils/typographyTest';
import {
codeEditorTest,
- dataDisplayTest,
displayHelpersTest,
galleryRenderTest,
inputPreactTest,
inputReactTest,
- navigationTest,
themeTokenTest,
} from '@/__stories__/twenty-ui-gallery/utils/galleryRenderTests';
import {
@@ -65,12 +63,12 @@ export default meta;
export const DataDisplayReact: Story = createGalleryStory({
frontComponentBundleName: 'twenty-ui-data-display-gallery',
runtime: 'react',
- play: dataDisplayTest,
+ play: galleryRenderTest,
});
export const DataDisplayPreact: Story = createGalleryStory({
frontComponentBundleName: 'twenty-ui-data-display-gallery',
runtime: 'preact',
- play: dataDisplayTest,
+ play: galleryRenderTest,
});
export const FeedbackReact: Story = createGalleryStory({
@@ -131,12 +129,12 @@ export const LayoutPreact: Story = createGalleryStory({
export const NavigationReact: Story = createGalleryStory({
frontComponentBundleName: 'twenty-ui-navigation-gallery',
runtime: 'react',
- play: navigationTest,
+ play: galleryRenderTest,
});
export const NavigationPreact: Story = createGalleryStory({
frontComponentBundleName: 'twenty-ui-navigation-gallery',
runtime: 'preact',
- play: navigationTest,
+ play: galleryRenderTest,
});
export const SurfacesReact: Story = createGalleryStory({
diff --git a/packages/twenty-front-component-renderer/src/__stories__/host-api/host-api-router-link.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/host-api/host-api-router-link.front-component.tsx
index 3bd2a080c8c..456be0f4f8f 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/host-api/host-api-router-link.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/host-api/host-api-router-link.front-component.tsx
@@ -1,5 +1,5 @@
+import { Link } from 'react-router-dom';
import { defineFrontComponent } from 'twenty-sdk/define';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeProvider } from 'twenty-ui/theme-constants';
import { FrontComponentCard } from '@/__stories__/shared/front-components/front-component-card';
@@ -13,9 +13,7 @@ const HostApiRouterLinkFrontComponent = () => (
<ThemeProvider colorScheme="light">
<FrontComponentCard title="host-api:router-link">
<span data-testid="router-link">
- <UndecoratedLink to="/objects/companies">
- Go to companies
- </UndecoratedLink>
+ <Link to="/objects/companies">Go to companies</Link>
</span>
</FrontComponentCard>
</ThemeProvider>
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md
index e99a6a051ac..af898a24dc3 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md
@@ -14,8 +14,8 @@ error and can allow additional known errors without requiring them to occur.
| Fixture | Components |
| --- | --- |
-| `twenty-ui-field-controls` | Field, Input, InputGroup, Textarea, InputLabel, InputHint |
-| `twenty-ui-display-helpers` | Text, EllipsisDisplay, NumberDisplay, JsonDisplay, TextDisplay, SelectDisplay |
+| `twenty-ui-field-controls` | Field, Input, InputGroup, Textarea |
+| `twenty-ui-display-helpers` | Text |
| `twenty-ui-list-item` | ListItem |
| `twenty-ui-tabs` | Tabs |
| `twenty-ui-popover` | Popover |
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-button-controls.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-button-controls.front-component.tsx
index 197a5f5b178..b9ca0787a91 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-button-controls.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-button-controls.front-component.tsx
@@ -1,17 +1,18 @@
import { useState } from 'react';
import { defineFrontComponent } from 'twenty-sdk/define';
import {
+ AnimatedIconCrossfade,
IconButton,
- LightIconButton,
LightButton,
+ LightIconButton,
MainButton,
+ MenuItem,
+ MenuItemDraggable,
} from 'twenty-ui/components';
-import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
-import { MenuItem, MenuItemDraggable } from 'twenty-ui/primitives/navigation';
import { IconPencil, IconPlus, IconX } from 'twenty-ui/icon';
-import { AnimatedIconCrossfade } from 'twenty-ui/primitives/layout';
-import { ThemeProvider } from 'twenty-ui/theme-constants';
+import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
import 'twenty-ui/style.css';
+import { ThemeProvider } from 'twenty-ui/theme-constants';
const ButtonControls = () => {
const [activations, setActivations] = useState(0);
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-data-display-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-data-display-gallery.front-component.tsx
index 95acfe765a3..fe14515dc34 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-data-display-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-data-display-gallery.front-component.tsx
@@ -1,22 +1,19 @@
import { defineFrontComponent } from 'twenty-sdk/define';
import {
- AnimatedCheckmark,
AvatarGroup,
- AvatarOrIcon,
- Checkmark,
- ColorSample,
CommandBlock,
- LinkChip,
NotificationCounter,
- Pill,
- StyledTintedIconTileContainer,
TintedIconTile,
+} from 'twenty-ui/components';
+import { IconStar } from 'twenty-ui/icon';
+import {
Avatar,
Chip,
+ ColorSample,
+ Pill,
Status,
Tag,
} from 'twenty-ui/primitives/data-display';
-import { IconStar } from 'twenty-ui/icon';
import { ThemeProvider } from 'twenty-ui/theme-constants';
import {
@@ -25,10 +22,6 @@ import {
} from '../shared/front-components/component-gallery';
const DATA_DISPLAY_ENTRIES: GalleryEntry[] = [
- {
- name: 'AnimatedCheckmark',
- node: <AnimatedCheckmark isAnimating size={28} />,
- },
{
name: 'Avatar',
node: <Avatar name="John Doe" size="md" shape="circle" />,
@@ -44,14 +37,6 @@ const DATA_DISPLAY_ENTRIES: GalleryEntry[] = [
/>
),
},
- {
- name: 'AvatarOrIcon',
- node: <AvatarOrIcon name="Jane" Icon={IconStar} />,
- },
- {
- name: 'Checkmark',
- node: <Checkmark />,
- },
{
name: 'Chip',
node: <Chip>Chip label</Chip>,
@@ -64,13 +49,6 @@ const DATA_DISPLAY_ENTRIES: GalleryEntry[] = [
name: 'CommandBlock',
node: <CommandBlock commands={['npm install', 'npm run start']} />,
},
- // KNOWN ISSUE (TDD): LinkChip renders a react-router Link and crashes
- // because the sandbox provides no router context. Expected fix: SDK-injected
- // Router whose navigator bridges to the host navigate API.
- {
- name: 'LinkChip',
- node: <LinkChip to="/example">Link chip</LinkChip>,
- },
{
name: 'NotificationCounter',
node: <NotificationCounter count={3} />,
@@ -83,14 +61,6 @@ const DATA_DISPLAY_ENTRIES: GalleryEntry[] = [
name: 'Status',
node: <Status color="green">Active</Status>,
},
- {
- name: 'StyledTintedIconTileContainer',
- node: (
- <StyledTintedIconTileContainer $dimension="32px">
- <IconStar size={16} />
- </StyledTintedIconTileContainer>
- ),
- },
{
name: 'Tag',
node: <Tag color="blue">Tag</Tag>,
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-display-helpers.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-display-helpers.front-component.tsx
index 97231c9b57d..10fb11c9bc8 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-display-helpers.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-display-helpers.front-component.tsx
@@ -1,11 +1,4 @@
import { defineFrontComponent } from 'twenty-sdk/define';
-import {
- EllipsisDisplay,
- JsonDisplay,
- NumberDisplay,
- SelectDisplay,
- TextDisplay,
-} from 'twenty-ui/primitives/data-display';
import { Text } from 'twenty-ui/primitives/typography';
import { TwentyUiGalleryCard } from '@/__stories__/shared/front-components/twenty-ui-gallery-card';
@@ -19,13 +12,12 @@ const DisplayHelpers = () => (
A longer account description that spans several lines and should be
clamped to two lines.
</Text>
- <EllipsisDisplay maxWidth={120}>
+ <Text truncate style={{ maxWidth: 120 }}>
An overflowing reference number
- </EllipsisDisplay>
- <NumberDisplay value={1234.5} />
- <JsonDisplay text={'{"active":true}'} />
- <TextDisplay text="Account description" />
- <SelectDisplay color="green" label="Qualified" />
+ </Text>
+ <Text truncate>1234.5</Text>
+ <Text truncate>{'{"active":true}'}</Text>
+ <Text truncate>Account description</Text>
</TwentyUiGalleryCard>
);
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-feedback-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-feedback-gallery.front-component.tsx
index e6a14345a24..03e00a5bf55 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-feedback-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-feedback-gallery.front-component.tsx
@@ -1,22 +1,10 @@
import { defineFrontComponent } from 'twenty-sdk/define';
+import { Callout, Info, InlineBanner } from 'twenty-ui/components';
import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
- AnimatedPlaceholderErrorContainer,
- AnimatedPlaceholderErrorSubTitle,
- AnimatedPlaceholderErrorTextContainer,
- AnimatedPlaceholderErrorTitle,
Banner,
- Callout,
CircularProgressBar,
- Info,
- InlineBanner,
Loader,
ProgressBar,
- SidePanelInformationBanner,
} from 'twenty-ui/primitives/feedback';
import { ThemeProvider } from 'twenty-ui/theme-constants';
@@ -26,70 +14,6 @@ import {
} from '../shared/front-components/component-gallery';
const FEEDBACK_ENTRIES: GalleryEntry[] = [
- {
- name: 'AnimatedPlaceholder',
- node: <AnimatedPlaceholder type="error404" />,
- },
- {
- name: 'AnimatedPlaceholderEmptyContainer',
- node: (
- <AnimatedPlaceholderEmptyContainer>
- Empty
- </AnimatedPlaceholderEmptyContainer>
- ),
- },
- {
- name: 'AnimatedPlaceholderEmptyTextContainer',
- node: (
- <AnimatedPlaceholderEmptyTextContainer>
- Empty text
- </AnimatedPlaceholderEmptyTextContainer>
- ),
- },
- {
- name: 'AnimatedPlaceholderEmptyTitle',
- node: (
- <AnimatedPlaceholderEmptyTitle>No records</AnimatedPlaceholderEmptyTitle>
- ),
- },
- {
- name: 'AnimatedPlaceholderEmptySubTitle',
- node: (
- <AnimatedPlaceholderEmptySubTitle>
- Try adding one
- </AnimatedPlaceholderEmptySubTitle>
- ),
- },
- {
- name: 'AnimatedPlaceholderErrorContainer',
- node: (
- <AnimatedPlaceholderErrorContainer>
- Error
- </AnimatedPlaceholderErrorContainer>
- ),
- },
- {
- name: 'AnimatedPlaceholderErrorTextContainer',
- node: (
- <AnimatedPlaceholderErrorTextContainer>
- Error text
- </AnimatedPlaceholderErrorTextContainer>
- ),
- },
- {
- name: 'AnimatedPlaceholderErrorTitle',
- node: (
- <AnimatedPlaceholderErrorTitle>Went wrong</AnimatedPlaceholderErrorTitle>
- ),
- },
- {
- name: 'AnimatedPlaceholderErrorSubTitle',
- node: (
- <AnimatedPlaceholderErrorSubTitle>
- Please retry
- </AnimatedPlaceholderErrorSubTitle>
- ),
- },
{
name: 'Banner',
node: (
@@ -124,10 +48,6 @@ const FEEDBACK_ENTRIES: GalleryEntry[] = [
name: 'ProgressBar',
node: <ProgressBar value={50} ariaLabel="Progress" />,
},
- {
- name: 'SidePanelInformationBanner',
- node: <SidePanelInformationBanner message="Panel info" variant="default" />,
- },
];
const FeedbackGallery = () => (
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-field-controls.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-field-controls.front-component.tsx
index ba8498ac524..4bbfa007da8 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-field-controls.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-field-controls.front-component.tsx
@@ -1,13 +1,6 @@
import { useState } from 'react';
import { defineFrontComponent } from 'twenty-sdk/define';
-import {
- Field,
- Input,
- InputGroup,
- Textarea,
- InputHint,
- InputLabel,
-} from 'twenty-ui/primitives/input';
+import { Field, Input, InputGroup, Textarea } from 'twenty-ui/primitives/input';
import { TwentyUiGalleryCard } from '@/__stories__/shared/front-components/twenty-ui-gallery-card';
@@ -34,10 +27,12 @@ const FieldControls = () => {
<Field.Label>Notes</Field.Label>
<Textarea value={notes} onValueChange={setNotes} rows={2} />
</Field.Root>
- <InputLabel htmlFor="legacy-reference">Reference</InputLabel>
- <Input id="legacy-reference" value="REF-42" readOnly />
- <InputHint>Keep this reference</InputHint>
- <InputHint danger>Reference cannot be changed</InputHint>
+ <Field.Root invalid>
+ <Field.Label>Reference</Field.Label>
+ <Input value="REF-42" readOnly />
+ <Field.Description>Keep this reference</Field.Description>
+ <Field.Error match>Reference cannot be changed</Field.Error>
+ </Field.Root>
<Input aria-label="Disabled input" disabled value="Locked" />
<p role="status">
Email: {email}; Notes: {notes}
@@ -56,6 +51,6 @@ export default defineFrontComponent({
universalIdentifier: '4d23e9af-7cb3-4e4a-bbca-8e960f840001',
name: 'twenty-ui-field-controls',
description:
- 'Field, Input, InputGroup, Textarea and legacy input helpers in the sandbox',
+ 'Field, Input, InputGroup, Textarea and validation in the sandbox',
component: FieldControls,
});
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-icon-button-elevated.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-icon-button-elevated.front-component.tsx
index 913c4522c9b..309c433173e 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-icon-button-elevated.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-icon-button-elevated.front-component.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
import { defineFrontComponent } from 'twenty-sdk/define';
import { IconButton } from 'twenty-ui/components';
import { IconPlus, IconSearch } from 'twenty-ui/icon';
-import { ThemeProvider } from 'twenty-ui/theme-constants';
import 'twenty-ui/style.css';
+import { ThemeProvider } from 'twenty-ui/theme-constants';
const IconButtonElevatedExample = () => {
const [activations, setActivations] = useState(0);
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx
index 14546e433ac..59a6f6b3b7a 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx
@@ -1,30 +1,27 @@
import { defineFrontComponent } from 'twenty-sdk/define';
import {
+ CardPicker,
+ ColorSchemePicker,
IconButton,
LightButton,
LightIconButton,
MainButton,
+ SearchInput,
TabButton,
} from 'twenty-ui/components';
-import { IconPlus, IconSearch, IconStar, IconTrash } from 'twenty-ui/icon';
import { CodeEditorHeader } from 'twenty-ui/components/code-editor';
+import { IconPlus, IconSearch, IconStar, IconTrash } from 'twenty-ui/icon';
import {
Button,
ButtonGroup,
- ColorSchemeCard,
- ColorSchemePicker,
- IconListViewGrip,
- SearchInput,
- SegmentedControl,
- CardPicker,
Checkbox,
Radio,
RadioGroup,
+ SegmentedControl,
Slider,
Switch,
} from 'twenty-ui/primitives/input';
import { ThemeProvider } from 'twenty-ui/theme-constants';
-
import {
ComponentGallery,
type GalleryEntry,
@@ -65,10 +62,6 @@ const INPUT_ENTRIES: GalleryEntry[] = [
name: 'CodeEditorHeader',
node: <CodeEditorHeader title="Editor" />,
},
- {
- name: 'ColorSchemeCard',
- node: <ColorSchemeCard variant="Light" />,
- },
{
name: 'ColorSchemePicker',
node: (
@@ -108,10 +101,6 @@ const INPUT_ENTRIES: GalleryEntry[] = [
</ButtonGroup>
),
},
- {
- name: 'IconListViewGrip',
- node: <IconListViewGrip />,
- },
{
name: 'LightButton',
node: <LightButton>{'Light'}</LightButton>,
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-json-visualizer-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-json-visualizer-gallery.front-component.tsx
index c2c3836d384..111b0c72080 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-json-visualizer-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-json-visualizer-gallery.front-component.tsx
@@ -1,15 +1,5 @@
import { defineFrontComponent } from 'twenty-sdk/define';
-import { IconCube } from 'twenty-ui/icon';
-import {
- JsonArrayNode,
- JsonNestedNode,
- JsonNode,
- JsonObjectNode,
- JsonTree,
- JsonTreeContextProvider,
- type JsonTreeContextType,
- JsonValueNode,
-} from 'twenty-ui/primitives/json-visualizer';
+import { JsonTree } from 'twenty-ui/components';
import { ThemeProvider } from 'twenty-ui/theme-constants';
import {
@@ -17,15 +7,6 @@ import {
type GalleryEntry,
} from '../shared/front-components/component-gallery';
-const JSON_TREE_CONTEXT_VALUE: JsonTreeContextType = {
- shouldExpandNodeInitially: () => true,
- emptyStringLabel: '[empty string]',
- emptyArrayLabel: '[empty array]',
- emptyObjectLabel: '[empty object]',
- arrowButtonCollapsedLabel: 'Expand',
- arrowButtonExpandedLabel: 'Collapse',
-};
-
const JSON_VISUALIZER_ENTRIES: GalleryEntry[] = [
{
name: 'JsonTree',
@@ -41,84 +22,12 @@ const JSON_VISUALIZER_ENTRIES: GalleryEntry[] = [
/>
),
},
- {
- name: 'JsonNode',
- node: (
- <JsonTreeContextProvider value={JSON_TREE_CONTEXT_VALUE}>
- <JsonNode value={{ id: 1, name: 'Twenty' }} depth={0} keyPath="" />
- </JsonTreeContextProvider>
- ),
- },
- {
- name: 'JsonArrayNode',
- node: (
- <JsonTreeContextProvider value={JSON_TREE_CONTEXT_VALUE}>
- <JsonArrayNode
- label="items"
- value={[1, 'two', true]}
- depth={0}
- keyPath="items"
- highlighting={undefined}
- />
- </JsonTreeContextProvider>
- ),
- },
- {
- name: 'JsonObjectNode',
- node: (
- <JsonTreeContextProvider value={JSON_TREE_CONTEXT_VALUE}>
- <JsonObjectNode
- label="object"
- value={{ id: 1, name: 'Twenty' }}
- depth={0}
- keyPath="object"
- highlighting={undefined}
- />
- </JsonTreeContextProvider>
- ),
- },
- {
- name: 'JsonNestedNode',
- node: (
- <JsonTreeContextProvider value={JSON_TREE_CONTEXT_VALUE}>
- <JsonNestedNode
- label="nested"
- Icon={IconCube}
- elements={[
- { id: 'id', label: 'id', value: 1 },
- { id: 'name', label: 'name', value: 'Twenty' },
- ]}
- renderElementsCount={(count) => `{${count}}`}
- emptyElementsText="[empty object]"
- depth={0}
- keyPath="nested"
- highlighting={undefined}
- />
- </JsonTreeContextProvider>
- ),
- },
- {
- name: 'JsonValueNode',
- node: (
- <JsonTreeContextProvider value={JSON_TREE_CONTEXT_VALUE}>
- <JsonValueNode valueAsString="Twenty" highlighting={undefined} />
- </JsonTreeContextProvider>
- ),
- },
- {
- name: 'JsonTreeContextProvider',
- node: (
- <JsonTreeContextProvider value={JSON_TREE_CONTEXT_VALUE}>
- <JsonNode value="leaf value" depth={0} keyPath="" />
- </JsonTreeContextProvider>
- ),
- },
];
const JsonVisualizerGallery = () => (
<ThemeProvider colorScheme="light">
<ComponentGallery
- title="twenty-ui/primitives/json-visualizer"
+ title="twenty-ui/components: JsonTree"
entries={JSON_VISUALIZER_ENTRIES}
/>
</ThemeProvider>
@@ -127,7 +36,6 @@ const JsonVisualizerGallery = () => (
export default defineFrontComponent({
universalIdentifier: 'test-20ui0-0000-0000-0000-000000000106',
name: 'twenty-ui-json-visualizer-gallery',
- description:
- 'Renders every twenty-ui/primitives/json-visualizer component in the sandbox',
+ description: 'Renders JsonTree in the sandbox',
component: JsonVisualizerGallery,
});
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx
index 4e1a0a6b2d3..3fd0da68ba3 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx
@@ -1,14 +1,8 @@
import { defineFrontComponent } from 'twenty-sdk/define';
+import { AnimatedIconCrossfade } from 'twenty-ui/components';
import { IconHeart, IconStar } from 'twenty-ui/icon';
import {
- AnimatedCircleLoading,
- AnimatedContainer,
- AnimatedEaseIn,
- AnimatedEaseInOut,
AnimatedExpandableContainer,
- AnimatedIconCrossfade,
- AnimatedRotate,
- AutogrowWrapper,
HorizontalSeparator,
ResizeHandle,
} from 'twenty-ui/primitives/layout';
@@ -20,22 +14,6 @@ import {
} from '../shared/front-components/component-gallery';
const LAYOUT_ENTRIES: GalleryEntry[] = [
- {
- name: 'AnimatedCircleLoading',
- node: <AnimatedCircleLoading>Loading</AnimatedCircleLoading>,
- },
- {
- name: 'AnimatedContainer',
- node: <AnimatedContainer>Content</AnimatedContainer>,
- },
- {
- name: 'AnimatedEaseIn',
- node: <AnimatedEaseIn>Fades in</AnimatedEaseIn>,
- },
- {
- name: 'AnimatedEaseInOut',
- node: <AnimatedEaseInOut isOpen={true}>Panel</AnimatedEaseInOut>,
- },
{
name: 'AnimatedExpandableContainer',
node: (
@@ -55,14 +33,6 @@ const LAYOUT_ENTRIES: GalleryEntry[] = [
/>
),
},
- {
- name: 'AnimatedRotate',
- node: <AnimatedRotate>Rotate</AnimatedRotate>,
- },
- {
- name: 'AutogrowWrapper',
- node: <AutogrowWrapper>Grows</AutogrowWrapper>,
- },
{
name: 'HorizontalSeparator',
node: <HorizontalSeparator text="or" />,
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-navigation-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-navigation-gallery.front-component.tsx
index 93f9c078f64..55cb70dc2d8 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-navigation-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-navigation-gallery.front-component.tsx
@@ -1,34 +1,19 @@
-import { Tag, ColorSample } from 'twenty-ui/primitives/data-display';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { defineFrontComponent } from 'twenty-sdk/define';
-import { IconHome, IconUser } from 'twenty-ui/icon';
import {
- ClickToActionLink,
- ContactLink,
- GithubVersionLink,
- LinkType,
+ DEFAULT_COLOR_LABELS,
MenuItem,
MenuItemAvatar,
MenuItemDraggable,
- MenuItemHotKeys,
- MenuItemLeftContent,
MenuItemSuggestion,
MenuPicker,
NavigationBar,
- NavigationBarItem,
- RawLink,
RoundedLink,
- SocialLink,
- StyledHoverableMenuItemBase,
- StyledMenuItemIconCheck,
- StyledMenuItemLabel,
- StyledMenuItemLeftContent,
- UndecoratedLink,
- ListItem,
- DEFAULT_COLOR_LABELS,
-} from 'twenty-ui/primitives/navigation';
+} from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { IconHome, IconUser } from 'twenty-ui/icon';
+import { ColorSample, Tag } from 'twenty-ui/primitives/data-display';
+import { ClickToActionLink, ListItem } from 'twenty-ui/primitives/navigation';
import { ThemeProvider } from 'twenty-ui/theme-constants';
-
import {
ComponentGallery,
type GalleryEntry,
@@ -39,44 +24,10 @@ const NAVIGATION_ENTRIES: GalleryEntry[] = [
name: 'ClickToActionLink',
node: <ClickToActionLink href="#">Click me</ClickToActionLink>,
},
- {
- name: 'ContactLink',
- node: <ContactLink href="https://twenty.com">Contact</ContactLink>,
- },
- {
- name: 'GithubVersionLink',
- node: <GithubVersionLink version="v1.0.0" />,
- },
{
name: 'MenuItem',
node: <MenuItem text="Menu item" LeftIcon={IconUser} />,
},
- {
- name: 'MenuItemLeftContent',
- node: <MenuItemLeftContent text="Left content" LeftIcon={IconUser} />,
- },
- {
- name: 'StyledHoverableMenuItemBase',
- node: (
- <StyledHoverableMenuItemBase>Hoverable base</StyledHoverableMenuItemBase>
- ),
- },
- {
- name: 'StyledMenuItemIconCheck',
- node: <StyledMenuItemIconCheck size={16} />,
- },
- {
- name: 'StyledMenuItemLabel',
- node: <StyledMenuItemLabel>Label</StyledMenuItemLabel>,
- },
- {
- name: 'StyledMenuItemLeftContent',
- node: (
- <StyledMenuItemLeftContent>
- Left content wrapper
- </StyledMenuItemLeftContent>
- ),
- },
{
name: 'MenuItemAvatar',
node: <MenuItemAvatar text="Avatar item" />,
@@ -91,10 +42,6 @@ const NAVIGATION_ENTRIES: GalleryEntry[] = [
/>
),
},
- {
- name: 'MenuItemHotKeys',
- node: <MenuItemHotKeys hotKeys={['⌘', 'K']} />,
- },
{
name: 'ListItem multiple selection',
node: (
@@ -229,38 +176,10 @@ const NAVIGATION_ENTRIES: GalleryEntry[] = [
/>
),
},
- {
- name: 'NavigationBarItem',
- node: (
- <NavigationBarItem
- Icon={IconHome}
- isActive={true}
- ariaLabel="Home"
- onClick={() => {}}
- />
- ),
- },
- // KNOWN ISSUE (TDD): RawLink and UndecoratedLink render a react-router Link
- // and crash because the sandbox provides no router context. Expected fix:
- // SDK-injected Router whose navigator bridges to the host navigate API.
- {
- name: 'RawLink',
- node: <RawLink href="/path">Raw link</RawLink>,
- },
{
name: 'RoundedLink',
node: <RoundedLink href="https://twenty.com" label="Rounded link" />,
},
- {
- name: 'SocialLink',
- node: (
- <SocialLink href="https://twitter.com/twenty" type={LinkType.Twitter} />
- ),
- },
- {
- name: 'UndecoratedLink',
- node: <UndecoratedLink to="/path">Undecorated link</UndecoratedLink>,
- },
];
const NavigationGallery = () => (
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-radio-group.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-radio-group.front-component.tsx
index 933d06e06f0..2d5442c273c 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-radio-group.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-radio-group.front-component.tsx
@@ -1,6 +1,7 @@
import { useState } from 'react';
import { defineFrontComponent } from 'twenty-sdk/define';
-import { CardPicker, Radio, RadioGroup } from 'twenty-ui/primitives/input';
+import { CardPicker } from 'twenty-ui/components';
+import { Radio, RadioGroup } from 'twenty-ui/primitives/input';
import { TwentyUiGalleryCard } from '@/__stories__/shared/front-components/twenty-ui-gallery-card';
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx
index 5ad7aacb923..23ae9c915dd 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx
@@ -1,11 +1,11 @@
import { defineFrontComponent } from 'twenty-sdk/define';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
import {
Card,
CardContent,
CardFooter,
CardHeader,
- OverflowingTextWithTooltip,
Tooltip,
} from 'twenty-ui/primitives/surfaces';
import { ThemeProvider } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-toast.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-toast.front-component.tsx
index 8c69bc0dd7d..e1e2a14fd85 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-toast.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-toast.front-component.tsx
@@ -1,6 +1,6 @@
import { useState } from 'react';
import { defineFrontComponent } from 'twenty-sdk/define';
-import { Toast } from 'twenty-ui/primitives/feedback';
+import { Toast } from 'twenty-ui/components';
import { TwentyUiGalleryCard } from '@/__stories__/shared/front-components/twenty-ui-gallery-card';
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx
index 512e70f2f0c..f104cb6f3f4 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx
@@ -1,22 +1,10 @@
import { useState } from 'react';
+import { defineFrontComponent } from 'twenty-sdk/define';
import { Section } from 'twenty-ui/components';
+import { VisibilityHidden } from 'twenty-ui/primitives/accessibility';
import { Button } from 'twenty-ui/primitives/input';
-import { defineFrontComponent } from 'twenty-sdk/define';
-import {
- VisibilityHidden,
- VisibilityHiddenInput,
-} from 'twenty-ui/primitives/accessibility';
+import { Heading, Text } from 'twenty-ui/primitives/typography';
import { ThemeProvider } from 'twenty-ui/theme-constants';
-import {
- Heading,
- Text,
- Label,
- LinkifiedText,
- SeparatorLineText,
- StyledText,
- StyledTextContent,
- StyledTextWrapper,
-} from 'twenty-ui/primitives/typography';
import {
ComponentGallery,
@@ -63,38 +51,10 @@ const TYPOGRAPHY_ENTRIES: GalleryEntry[] = [
</Heading>
),
},
- {
- name: 'Label',
- node: <Label variant="default">Label</Label>,
- },
- {
- name: 'LinkifiedText',
- node: <LinkifiedText text="Visit https://twenty.com now" />,
- },
- {
- name: 'SeparatorLineText',
- node: <SeparatorLineText>or</SeparatorLineText>,
- },
- {
- name: 'StyledText',
- node: <StyledText text="Styled text" />,
- },
- {
- name: 'StyledTextContent',
- node: <StyledTextContent>Content</StyledTextContent>,
- },
- {
- name: 'StyledTextWrapper',
- node: <StyledTextWrapper>Wrapper</StyledTextWrapper>,
- },
{
name: 'VisibilityHidden',
node: <VisibilityHidden>Screen-reader only</VisibilityHidden>,
},
- {
- name: 'VisibilityHiddenInput',
- node: <VisibilityHiddenInput readOnly value="" />,
- },
];
const TypographyGallery = () => (
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/buttonControlsTest.ts b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/buttonControlsTest.ts
index 796f62661cd..8bba0c19b2c 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/buttonControlsTest.ts
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/buttonControlsTest.ts
@@ -1,5 +1,5 @@
-import { expect, userEvent, waitFor, within } from 'storybook/test';
import { type TwentyUiGalleryPlayFunction } from '@/__stories__/twenty-ui-gallery/types/TwentyUiGalleryPlayFunction';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
export const buttonControlsTest: TwentyUiGalleryPlayFunction = async (
context,
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/galleryRenderTests.ts b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/galleryRenderTests.ts
index 37a066176b8..8e7c67b7ac8 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/galleryRenderTests.ts
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/galleryRenderTests.ts
@@ -10,11 +10,6 @@ export const galleryRenderTest = createGalleryRenderTest({
expectedFailedComponents: [],
});
-// LinkChip crashes without a router context in the sandbox.
-export const dataDisplayTest = createGalleryRenderTest({
- expectedFailedComponents: ['LinkChip'],
-});
-
// Unselected radios need Element.matches(':disabled'); React radio groups
// also need compareDocumentPosition, which the sandbox DOM does not implement.
export const inputReactTest = createGalleryRenderTest({
@@ -24,11 +19,6 @@ export const inputPreactTest = createGalleryRenderTest({
expectedFailedComponents: ['Radio'],
});
-// react-router Links crash without a router context.
-export const navigationTest = createGalleryRenderTest({
- expectedFailedComponents: ['RawLink', 'UndecoratedLink'],
-});
-
// Monaco cannot load scripts inside the sandbox worker, so the wrapper mounts
// but the editor's onMount never fires.
export const codeEditorTest: TwentyUiGalleryPlayFunction = async ({
@@ -91,6 +81,5 @@ export const displayHelpersTest: TwentyUiGalleryPlayFunction = async ({
expect(canvas.getByText('1234.5')).toBeVisible();
expect(canvas.getByText('{"active":true}')).toBeVisible();
expect(canvas.getByText('Account description')).toBeVisible();
- expect(canvas.getByText('Qualified')).toBeVisible();
expect(errorHandler).not.toHaveBeenCalled();
};
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/iconButtonElevatedTest.ts b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/iconButtonElevatedTest.ts
index 188a362fcee..61952bb8e70 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/iconButtonElevatedTest.ts
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/iconButtonElevatedTest.ts
@@ -1,6 +1,5 @@
-import { expect, userEvent, waitFor, within } from 'storybook/test';
-
import { type TwentyUiGalleryPlayFunction } from '@/__stories__/twenty-ui-gallery/types/TwentyUiGalleryPlayFunction';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
export const iconButtonElevatedTest: TwentyUiGalleryPlayFunction = async ({
canvasElement,
diff --git a/packages/twenty-front/.oxlintrc.json b/packages/twenty-front/.oxlintrc.json
index 19a4ade75c6..62a8c53b620 100644
--- a/packages/twenty-front/.oxlintrc.json
+++ b/packages/twenty-front/.oxlintrc.json
@@ -143,7 +143,10 @@
},
"overrides": [
{
- "files": ["src/modules/ui/input/components/NavigationButton.tsx"],
+ "files": [
+ "src/modules/ui/input/components/NavigationButton.tsx",
+ "src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx"
+ ],
"rules": {
"react/jsx-props-no-spreading": "off"
}
diff --git a/packages/twenty-front/src/hooks/__tests__/useCopyToClipboard.test.tsx b/packages/twenty-front/src/hooks/__tests__/useCopyToClipboard.test.tsx
index d7e242868d8..e288bf805cb 100644
--- a/packages/twenty-front/src/hooks/__tests__/useCopyToClipboard.test.tsx
+++ b/packages/twenty-front/src/hooks/__tests__/useCopyToClipboard.test.tsx
@@ -6,8 +6,8 @@ import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/hooks/useCopyToClipboard.tsx b/packages/twenty-front/src/hooks/useCopyToClipboard.tsx
index 9dd42bc193e..ebb0465fa2f 100644
--- a/packages/twenty-front/src/hooks/useCopyToClipboard.tsx
+++ b/packages/twenty-front/src/hooks/useCopyToClipboard.tsx
@@ -1,7 +1,7 @@
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconCopy, IconExclamationCircle } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
export const useCopyToClipboard = () => {
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
index 5c448c4f083..ec208085292 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
@@ -1,9 +1,9 @@
-import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';
-import { ComposerHeader } from '@/activities/components/ComposerHeader';
-import { StyledComposerTextInput } from '@/activities/components/ComposerTextInput';
import { CalendarEventComposerTargetsInput } from '@/activities/calendar/components/CalendarEventComposerTargetsInput';
import { CalendarEventLocationInput } from '@/activities/calendar/components/CalendarEventLocationInput';
import { type useCalendarEventComposer } from '@/activities/calendar/hooks/useCalendarEventComposer';
+import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';
+import { ComposerHeader } from '@/activities/components/ComposerHeader';
+import { StyledComposerTextInput } from '@/activities/components/ComposerTextInput';
import { EmailRecipientsFieldInput } from '@/activities/emails/recipients/components/EmailRecipientsFieldInput';
import { useEmailRecipientsDragAndDrop } from '@/activities/emails/recipients/hooks/useEmailRecipientsDragAndDrop';
import { type EmailComposerContextRecord } from '@/activities/emails/recipients/types/EmailComposerContextRecord';
@@ -21,7 +21,7 @@ import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/Dra
import { DragDropProvider } from '@dnd-kit/react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { Callout } from 'twenty-ui/primitives/feedback';
+import { Callout } from 'twenty-ui/components';
import { Switch } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx
index a80f545f822..1473675ecb0 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx
@@ -3,7 +3,8 @@ import { type CalendarEventCallRecording } from '@/activities/calendar/types/Cal
import { type CalendarEventParticipant } from '@/activities/calendar/types/CalendarEventParticipant';
import { isTimelineCalendarEventParticipant } from '@/activities/calendar/types/guards/IsTimelineCalendarEventParticipant';
import { isDefined } from 'twenty-shared/utils';
-import { Avatar, AvatarGroup } from 'twenty-ui/primitives/data-display';
+import { AvatarGroup } from 'twenty-ui/components';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { type TimelineCalendarEventParticipant } from '~/generated/graphql';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
index cdf43d31874..230b2d8aa1c 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
@@ -3,21 +3,17 @@ import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext'
import { useCalendarEvents } from '@/activities/calendar/hooks/useCalendarEvents';
import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { format, getYear } from 'date-fns';
import { Section } from 'twenty-ui/components';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+
import { Heading } from 'twenty-ui/primitives/typography';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type TimelineCalendarEvent } from '~/generated/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
@@ -72,17 +68,15 @@ export const CalendarEventsCardContent = ({
if (!timelineCalendarEvents?.length) {
// TODO: change animated placeholder
return (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noMatchRecord" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No Events`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No Events`}</EmptyState.Title>
+ <EmptyState.Description>
{t`No events have been scheduled with this ${objectName} yet.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
);
}
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEventComposer.test.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEventComposer.test.ts
index 631685d0641..70f9c8e9a5e 100644
--- a/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEventComposer.test.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEventComposer.test.ts
@@ -50,8 +50,8 @@ jest.mock('@/object-record/hooks/useFindOneRecord', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventComposer.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventComposer.ts
index de206acf17a..b10dff16bfb 100644
--- a/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventComposer.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventComposer.ts
@@ -27,7 +27,7 @@ import { Temporal } from 'temporal-polyfill';
import { MAX_EMAIL_RECIPIENTS } from 'twenty-shared/constants';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { type SelectOption } from 'twenty-ui/primitives/input';
export const useCalendarEventComposer = ({
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useCreateCalendarEvent.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useCreateCalendarEvent.ts
index ddd8d99ddf4..28c8493882f 100644
--- a/packages/twenty-front/src/modules/activities/calendar/hooks/useCreateCalendarEvent.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useCreateCalendarEvent.ts
@@ -3,7 +3,7 @@ import { useRefetchTimelineCalendarEvents } from '@/activities/calendar/hooks/us
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type CreateCalendarEventInput,
type CreateCalendarEventOutput,
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
index fd6b00d261f..2177153121a 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
@@ -5,8 +5,8 @@ import {
MessageChannelType,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { InlineBanner } from 'twenty-ui/components';
import { IconAlertTriangle } from 'twenty-ui/icon';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
import { type SelectOption } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx
index 8da93220d81..68c1cabbd22 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx
@@ -1,20 +1,15 @@
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { t } from '@lingui/core/macro';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
- Loader,
-} from 'twenty-ui/primitives/feedback';
+
+import { Loader } from 'twenty-ui/primitives/feedback';
export const EmailLoader = ({ loadingText }: { loadingText?: string }) => (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="loadingMessages" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {loadingText || t`Loading emails`}
- </AnimatedPlaceholderEmptyTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{loadingText || t`Loading emails`}</EmptyState.Title>
<Loader />
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Content>
+ </EmptyState.Root>
);
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx
index 72ad041d3db..83f14dc634e 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import Linkify from 'linkify-react';
+import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseInOut } from 'twenty-ui/primitives/layout';
const StyledThreadMessageBody = styled(motion.div)`
color: ${themeCssVariables.font.color.primary};
@@ -35,7 +35,7 @@ export const EmailThreadMessageBody = ({
isDisplayed,
}: EmailThreadMessageBodyProps) => {
return (
- <AnimatedEaseInOut isOpen={isDisplayed} duration="fast">
+ <AnimatedExpandableContainer isExpanded={isDisplayed} duration="fast">
<StyledThreadMessageBody>
<Linkify
options={{
@@ -46,6 +46,6 @@ export const EmailThreadMessageBody = ({
{body}
</Linkify>
</StyledThreadMessageBody>
- </AnimatedEaseInOut>
+ </AnimatedExpandableContainer>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx
index 40560f7b162..ebd6ebe0463 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
import { getDisplayNameFromParticipant } from '@/activities/emails/utils/getDisplayNameFromParticipant';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type EmailThreadMessageReceiversProps = {
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
index b70af52bc3c..df8c035469a 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
@@ -1,15 +1,10 @@
import { useComposeEmailForTargetRecord } from '@/activities/emails/hooks/useComposeEmailForTargetRecord';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { Trans, useLingui } from '@lingui/react/macro';
import { IconMail } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
export const EmptyInboxPlaceholder = () => {
const { t } = useLingui();
@@ -18,22 +13,22 @@ export const EmptyInboxPlaceholder = () => {
useComposeEmailForTargetRecord(targetRecord);
return (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="emptyInbox" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>
<Trans>Empty Inbox</Trans>
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ </EmptyState.Title>
+ <EmptyState.Description>
<Trans>No email exchange has occurred with this record yet.</Trans>
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
<Button
startIcon={<IconMail />}
onClick={openComposer}
disabled={loading}
variant="outline"
>{t`Send Email`}</Button>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Root>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useEmailComposerState.test.tsx b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useEmailComposerState.test.tsx
index d20a684cc88..05827bfbb29 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useEmailComposerState.test.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useEmailComposerState.test.tsx
@@ -7,8 +7,8 @@ import { useEmailComposerState } from '@/activities/emails/hooks/useEmailCompose
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx
index f3947ac0e47..ececcb2afaf 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx
@@ -10,8 +10,8 @@ jest.mock('@/object-record/hooks/useUpdateOneRecord', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useCancelMessageCampaign.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useCancelMessageCampaign.ts
index 0af68aecd6e..9088cd10850 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useCancelMessageCampaign.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useCancelMessageCampaign.ts
@@ -6,7 +6,7 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useU
import { plural, t } from '@lingui/core/macro';
import { MessageCampaignStatus } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type CancelMessageCampaignMutation,
type CancelMessageCampaignMutationVariables,
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts b/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts
index 9167cd82df9..06bd86d79d7 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts
@@ -4,7 +4,7 @@ import { CoreObjectNameSingular } from 'twenty-shared/types';
import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
import { useRecordSeededDraft } from '@/object-record/record-seeded-draft/hooks/useRecordSeededDraft';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type UsePersistedCampaignDraftArgs<TDraft extends object> = {
campaignId: string;
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useSendEmail.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useSendEmail.ts
index 04238cf4e6b..cf62d8047b5 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useSendEmail.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useSendEmail.ts
@@ -6,7 +6,7 @@ import { SEND_EMAIL } from '@/activities/emails/graphql/mutations/sendEmail';
import { getTimelineThreadsFromObjectRecord } from '@/activities/emails/graphql/queries/getTimelineThreadsFromObjectRecord';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { t } from '@lingui/core/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type SendEmailMutation,
type SendEmailMutationVariables,
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts
index 1df62676cc6..aaf7df7ab16 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts
@@ -11,7 +11,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { plural, t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { MessageCampaignStatus } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type SendMessageCampaignMutation,
type SendMessageCampaignMutationVariables,
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaignTest.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaignTest.ts
index 8ab01b5ba20..6094b8fae12 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaignTest.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaignTest.ts
@@ -3,7 +3,7 @@ import { useMutation } from '@apollo/client/react';
import { SEND_MESSAGE_CAMPAIGN_TEST } from '@/activities/emails/graphql/mutations/sendMessageCampaignTest';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { t } from '@lingui/core/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type SendMessageCampaignTestMutation,
type SendMessageCampaignTestMutationVariables,
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailAttachment.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailAttachment.ts
index 3aae5e2ae39..4846caa74a7 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailAttachment.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailAttachment.ts
@@ -4,7 +4,7 @@ import { type EmailAttachment } from 'twenty-shared/types';
import { MAX_ATTACHMENT_SIZE } from '@/advanced-text-editor/utils/maxAttachmentSize';
import { useDirectFileUpload } from '@/file/hooks/useDirectFileUpload';
import { formatFileSize } from '@/file/utils/formatFileSize';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { FileFolder } from '~/generated-metadata/graphql';
import { logError } from '~/utils/logError';
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailImage.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailImage.ts
index 87e690e234a..1d77a872cfe 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailImage.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useUploadEmailImage.ts
@@ -6,7 +6,7 @@ import { type UploadedImage } from '@/advanced-text-editor/types/UploadedImage';
import { MAX_ATTACHMENT_SIZE } from '@/advanced-text-editor/utils/maxAttachmentSize';
import { useDirectFileUpload } from '@/file/hooks/useDirectFileUpload';
import { formatFileSize } from '@/file/utils/formatFileSize';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { logError } from '~/utils/logError';
export const useUploadEmailImage = () => {
diff --git a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx
index d726dd86497..eff51ba2113 100644
--- a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientChipMenuContent.tsx
@@ -1,10 +1,3 @@
-import { useLingui } from '@lingui/react/macro';
-import { isNonEmptyString } from '@sniptt/guards';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-import { IconCopy, IconPencil, IconTrash, IconUserPlus } from 'twenty-ui/icon';
-import { ListItem, MenuItemAvatar } from 'twenty-ui/primitives/navigation';
-
import { type EmailRecipientResolution } from '@/activities/emails/recipients/hooks/useEmailRecipientsResolution';
import { type EmailRecipient } from '@/activities/emails/recipients/types/EmailRecipient';
import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
@@ -12,7 +5,13 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import { MenuItemAvatar, useToast } from 'twenty-ui/components';
+import { IconCopy, IconPencil, IconTrash, IconUserPlus } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
index dcb74670f06..1dfc821348c 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
@@ -10,17 +10,17 @@ import {
import { getFileCategoryFromExtension } from '@/object-record/record-field/ui/utils/getFileCategoryFromExtension';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
-import { useState, useContext } from 'react';
+import { useContext, useState } from 'react';
import { getSafeUrl, isDefined } from 'twenty-shared/utils';
import { type AttachmentWithFile } from '@/activities/files/utils/filterAttachmentsWithFile';
import { FileIcon } from '@/file/components/FileIcon';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
+import { isNavigationModifierPressed } from '@/ui/navigation/utils/isNavigationModifierPressed';
import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconCalendar } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { isNavigationModifierPressed } from 'twenty-ui/utilities';
import { PermissionFlagType } from '~/generated-metadata/graphql';
import { formatToHumanReadableDate } from '~/utils/date-utils';
import { getFileNameAndExtension } from '~/utils/file/getFileNameAndExtension';
diff --git a/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx b/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx
index 061ddaa0a00..a40cca95a10 100644
--- a/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx
@@ -4,16 +4,12 @@ import { AttachmentUploadTrigger } from '@/activities/files/components/Attachmen
import { DropZone } from '@/activities/files/components/DropZone';
import { type Attachment } from '@/activities/files/types/Attachment';
import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
+
import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
@@ -64,16 +60,16 @@ export const FilesCardContent = ({
onUploadFiles={onUploadFiles}
/>
) : (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noFile" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>
<Trans>No Files</Trans>
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ </EmptyState.Title>
+ <EmptyState.Description>
<Trans>There are no associated files with this record.</Trans>
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
{canUploadFiles && (
<AttachmentUploadTrigger targetableObject={targetRecord}>
{({ openFilePicker }) => (
@@ -85,7 +81,7 @@ export const FilesCardContent = ({
)}
</AttachmentUploadTrigger>
)}
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Root>
)}
</StyledDropZoneContainer>
);
diff --git a/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx b/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx
index b5d5e19cef0..2418f477036 100644
--- a/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx
@@ -2,16 +2,12 @@ import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomRes
import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { NoteList } from '@/activities/notes/components/NoteList';
import { type Note } from '@/activities/types/Note';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
+
import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
@@ -44,16 +40,14 @@ export const NotesCardContent = ({
if (isNotesEmpty) {
return (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noNote" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No notes`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No notes`}</EmptyState.Title>
+ <EmptyState.Description>
{t`There are no associated notes with this record.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
{isDefined(onCreateNote) && (
<Button
startIcon={<IconPlus />}
@@ -61,7 +55,7 @@ export const NotesCardContent = ({
variant="outline"
>{t`New note`}</Button>
)}
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Root>
);
}
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx
index bc26080f279..4f4944cd790 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx
@@ -2,18 +2,14 @@ import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { TaskList } from '@/activities/tasks/components/TaskList';
import { type Task } from '@/activities/types/Task';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import groupBy from 'lodash.groupby';
-import { isDefined } from 'twenty-shared/utils';
import { CoreObjectNameSingular } from 'twenty-shared/types';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
+import { isDefined } from 'twenty-shared/utils';
+
import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
@@ -50,16 +46,14 @@ export const TaskGroupsContent = ({
if (isTasksEmpty) {
return (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noTask" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`Mission accomplished!`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`Mission accomplished!`}</EmptyState.Title>
+ <EmptyState.Description>
{t`All tasks addressed. Maintain the momentum.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
{isDefined(onCreateTask) && (
<Button
startIcon={<IconPlus />}
@@ -67,7 +61,7 @@ export const TaskGroupsContent = ({
variant="outline"
>{t`New task`}</Button>
)}
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Root>
);
}
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsx
index 12d8a193f44..dec32b2b792 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { ActivityList } from '@/activities/components/ActivityList';
import { type Task } from '@/activities/types/Task';
-import { SelectDisplay } from 'twenty-ui/primitives/data-display';
+import { SelectDisplay } from '@/ui/field/display/components/SelectDisplay/SelectDisplay';
import { type ThemeColor } from 'twenty-ui/theme';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { TaskRow } from './TaskRow';
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
index d0fa660ed82..e020692b51f 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
@@ -6,22 +6,22 @@ import { beautifyExactDate, hasDatePassed } from '~/utils/date-utils';
import { ActivityRow } from '@/activities/components/ActivityRow';
import { useActivityFieldComponentInstanceId } from '@/activities/hooks/useActivityFieldComponentInstanceId';
+import { useCompleteTask } from '@/activities/tasks/hooks/useCompleteTask';
import { type Task } from '@/activities/types/Task';
-import { useObjectMorphJunctionConfigOrThrow } from '@/object-record/record-field/ui/hooks/useObjectMorphJunctionConfigOrThrow';
-import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContextProvider } from '@/object-record/record-field/ui/components/FieldContextProvider';
+import { useObjectMorphJunctionConfigOrThrow } from '@/object-record/record-field/ui/hooks/useObjectMorphJunctionConfigOrThrow';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
+import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { useContext } from 'react';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconCalendar } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { Checkbox } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { useCompleteTask } from '@/activities/tasks/hooks/useCompleteTask';
const StyledTaskBody = styled.div`
color: ${themeCssVariables.font.color.tertiary};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx
index e032f0f0812..c89608d7bbe 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx
@@ -1,22 +1,18 @@
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { type ReactElement } from 'react';
import { EventsGroup } from '@/activities/timeline-activities/components/EventsGroup';
-import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
import { useTimelineActivityTypeFilter } from '@/activities/timeline-activities/hooks/useTimelineActivityTypeFilter';
+import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
import { filterOutInvalidTimelineActivities } from '@/activities/timeline-activities/utils/filterOutInvalidTimelineActivities';
-import { keepTimelineActivitiesOfSelectedTypes } from '@/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes';
import { groupEventsByMonth } from '@/activities/timeline-activities/utils/groupEventsByMonth';
+import { keepTimelineActivitiesOfSelectedTypes } from '@/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes';
import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { useLingui } from '@lingui/react/macro';
-import {
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
+
import { themeCssVariables } from 'twenty-ui/theme-constants';
type EventListProps = {
@@ -65,16 +61,14 @@ export const EventList = ({ events, targetableObject }: EventListProps) => {
if (groupedEvents.length === 0) {
return (
- <AnimatedPlaceholderEmptyContainer>
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No matching activity`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Root>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No matching activity`}</EmptyState.Title>
+ <EmptyState.Description>
{t`No activity matches the selected types.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
);
}
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
index 6c3b3a476c2..ac718340c0a 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
@@ -1,3 +1,4 @@
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
@@ -5,17 +6,12 @@ import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { EventList } from '@/activities/timeline-activities/components/EventList';
import { useTimelineActivities } from '@/activities/timeline-activities/hooks/useTimelineActivities';
import { RecordListUpsertRecordsInStoreEffect } from '@/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { t } from '@lingui/core/macro';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
+
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledMainContainer = styled(StyledWidgetScrollContainer)`
@@ -55,17 +51,15 @@ export const TimelineCard = () => {
if (isTimelineActivitiesEmpty) {
const placeholderContent = (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="emptyTimeline" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No activity yet`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No activity yet`}</EmptyState.Title>
+ <EmptyState.Description>
{t`There is no activity associated with this record.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
);
return isInSidePanel ? (
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx
index 3f4e5f455cc..25edb4e121d 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx
@@ -6,21 +6,21 @@ import { EventCardToggleButton } from '@/activities/timeline-activities/rows/com
import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';
import { type EventRowNativeComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';
-import { getAuthorizedLinkedRecordName } from '@/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName';
import {
StyledEventRow,
StyledEventRowContainer,
StyledEventRowContent,
StyledEventRowLinkedRecord,
} from '@/activities/timeline-activities/rows/components/EventRowStyles';
-import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
-import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { SidePanelSearchRecordPreviewCard } from '@/side-panel/pages/search/components/SidePanelSearchRecordPreviewCard';
+import { getAuthorizedLinkedRecordName } from '@/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName';
import { allowRequestsToTwentyIconsState } from '@/client-config/states/allowRequestsToTwentyIcons';
import { recordStoreIdentifierFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreIdentifierFamilySelector';
+import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
+import { SidePanelSearchRecordPreviewCard } from '@/side-panel/pages/search/components/SidePanelSearchRecordPreviewCard';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
type EventRowGenericLinkedProps = EventRowNativeComponentProps;
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
index 220f859f4fb..d56fcc3f7f9 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined, isFieldValueRestricted } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type EmailThreadMessage } from '@/activities/emails/types/EmailThreadMessage';
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx
index 9ef9614a7a1..0aef1aa715c 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { isDefined } from 'twenty-shared/utils';
-import type { IconComponent } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { type IconComponent } from 'twenty-ui/icon';
type BubbleMenuIconButtonProps = {
label: string;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx
index dd60da47103..5d78e7da56d 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx
@@ -16,9 +16,9 @@ import { useLingui } from '@lingui/react/macro';
import { type Editor } from '@tiptap/core';
import { type ComponentType, useEffect, useId, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import { IconMaximize } from 'twenty-ui/icon';
import { Field } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommandMenu.tsx b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommandMenu.tsx
index 5ed05b10cc4..65891e02fd7 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommandMenu.tsx
@@ -1,6 +1,6 @@
import { type Editor, type Range } from '@tiptap/core';
import { forwardRef, useCallback, useState } from 'react';
-import { MenuItemSuggestion } from 'twenty-ui/primitives/navigation';
+import { MenuItemSuggestion } from 'twenty-ui/components';
import { type SlashCommandItem } from '@/advanced-text-editor/extensions/slash-command/SlashCommand';
import { SuggestionMenu } from '@/ui/suggestion/components/SuggestionMenu';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatInlineBanner.tsx b/packages/twenty-front/src/modules/ai/components/AiChatInlineBanner.tsx
index 6f3dab57143..d245709bbda 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatInlineBanner.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatInlineBanner.tsx
@@ -1,5 +1,5 @@
import { type ComponentProps } from 'react';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
+import { InlineBanner } from 'twenty-ui/components';
type AiChatInlineBannerProps = Pick<
ComponentProps<typeof InlineBanner>,
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx b/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx
index 27f861b2cf1..13188f96661 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx
@@ -2,18 +2,18 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
+import { IconButton } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconDotsVertical, IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { IconButton } from 'twenty-ui/components';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AiChatThreadItemMenu } from '@/ai/components/AiChatThreadItemMenu';
import { AI_CHAT_THREAD_ACTIONS_SURFACE } from '@/ai/constants/AiChatThreadActionsSurface';
import { useAiChatThreadRename } from '@/ai/hooks/useAiChatThreadRename';
import { useSwitchToNewAiChat } from '@/ai/hooks/useSwitchToNewAiChat';
-import { currentAiChatThreadTitleComponentFamilyState } from '@/ai/states/currentAiChatThreadTitleComponentFamilyState';
import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';
+import { currentAiChatThreadTitleComponentFamilyState } from '@/ai/states/currentAiChatThreadTitleComponentFamilyState';
import { TextInput } from '@/ui/input/components/TextInput';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { type AgentChatThread } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx b/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
index 8f577ada6d1..ed8cc70ad3b 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
@@ -3,13 +3,13 @@ import { useLingui } from '@lingui/react/macro';
import { type KeyboardEvent, useContext, useMemo, useState } from 'react';
import { type AskQuestionAnswer, type AskQuestionItem } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
-import { Tooltip } from 'twenty-ui/primitives/surfaces';
+import { IconButton, LightIconButton } from 'twenty-ui/components';
import {
IconArrowUp,
IconChevronLeft,
IconChevronRightPipe,
- IconInfoCircle,
type IconComponent,
+ IconInfoCircle,
IconSquareNumber1,
IconSquareNumber2,
IconSquareNumber3,
@@ -20,15 +20,14 @@ import {
IconSquareNumber8,
IconSquareNumber9,
} from 'twenty-ui/icon';
-import { IconButton, LightIconButton } from 'twenty-ui/components';
-
+import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { AiModelTierDropdown } from '@/ai/components/AiModelTierDropdown';
+import { TextWithChatReferences } from '@/ai/components/TextWithChatReferences';
import { AgentChatFileUploadButton } from '@/ai/components/internal/AgentChatFileUploadButton';
import { AiChatContextUsageButton } from '@/ai/components/internal/AiChatContextUsageButton';
import { AiChatQuestionOtherOption } from '@/ai/components/internal/AiChatQuestionOtherOption';
-import { TextWithChatReferences } from '@/ai/components/TextWithChatReferences';
-import { AiModelTierDropdown } from '@/ai/components/AiModelTierDropdown';
import { useSubmitQuestionAnswer } from '@/ai/hooks/useSubmitQuestionAnswer';
import { type AgentChatPendingQuestion } from '@/ai/types/AgentChatPendingQuestion';
import { aiModelsState } from '@/client-config/states/aiModelsState';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx b/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx
index a0204d5b389..8d37b796c2e 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx
@@ -1,15 +1,15 @@
-import { t } from '@lingui/core/macro';
import { StyledAiChatContentContainer } from '@/ai/components/StyledAiChatContentContainer';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { useDeleteQueuedMessage } from '@/ai/hooks/useDeleteQueuedMessage';
import { agentChatQueuedMessagesComponentFamilyState } from '@/ai/states/agentChatQueuedMessagesComponentFamilyState';
import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
-import { useDeleteQueuedMessage } from '@/ai/hooks/useDeleteQueuedMessage';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isDefined } from 'twenty-shared/utils';
-import { IconX } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconX } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledQueueContainer = styled(StyledAiChatContentContainer)`
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx
index 86260f0c7a6..487cb264559 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx
@@ -1,7 +1,7 @@
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { IconFilter } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconFilter } from 'twenty-ui/icon';
import { AiChatThreadFilterDropdownContent } from '@/ai/components/AiChatThreadFilterDropdownContent';
import { AI_CHAT_THREAD_FILTER_DROPDOWN_PAGE } from '@/ai/constants/AiChatThreadFilterDropdownPage';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx
index e682e0bef14..0d70e04fb89 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx
@@ -1,7 +1,3 @@
-import { useLingui } from '@lingui/react/macro';
-import { IconChevronLeft } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
-
import { AGENT_CHAT_THREAD_GROUP_BY } from '@/ai/constants/AgentChatThreadGroupBy';
import { AGENT_CHAT_THREAD_GROUP_BY_LABELS } from '@/ai/constants/AgentChatThreadGroupByLabels';
import { agentChatThreadGroupByState } from '@/ai/states/agentChatThreadGroupByState';
@@ -11,6 +7,9 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
+import { useLingui } from '@lingui/react/macro';
+import { IconChevronLeft } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
const AGENT_CHAT_THREAD_GROUP_BY_OPTIONS = [
AGENT_CHAT_THREAD_GROUP_BY.DATE,
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx
index ca86a632664..6d180b19499 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx
@@ -1,7 +1,3 @@
-import { useLingui } from '@lingui/react/macro';
-import { IconChevronLeft } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
-
import { AGENT_CHAT_THREAD_LAST_ACTIVITY_FILTER } from '@/ai/constants/AgentChatThreadLastActivityFilter';
import { AGENT_CHAT_THREAD_LAST_ACTIVITY_FILTER_LABELS } from '@/ai/constants/AgentChatThreadLastActivityFilterLabels';
import { agentChatThreadLastActivityFilterState } from '@/ai/states/agentChatThreadLastActivityFilterState';
@@ -11,6 +7,9 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
+import { useLingui } from '@lingui/react/macro';
+import { IconChevronLeft } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
const AGENT_CHAT_THREAD_LAST_ACTIVITY_FILTER_OPTIONS = [
AGENT_CHAT_THREAD_LAST_ACTIVITY_FILTER.ONE_DAY,
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx
index f98d0b93506..1334452174e 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx
@@ -1,7 +1,3 @@
-import { useLingui } from '@lingui/react/macro';
-import { IconChevronLeft } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
-
import { AGENT_CHAT_THREAD_FILTER_STATUS } from '@/ai/constants/AgentChatThreadFilterStatus';
import { AGENT_CHAT_THREAD_FILTER_STATUS_LABELS } from '@/ai/constants/AgentChatThreadFilterStatusLabels';
import { agentChatThreadFilterStatusState } from '@/ai/states/agentChatThreadFilterStatusState';
@@ -11,6 +7,9 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
+import { useLingui } from '@lingui/react/macro';
+import { IconChevronLeft } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
const AGENT_CHAT_THREAD_FILTER_STATUS_OPTIONS = [
AGENT_CHAT_THREAD_FILTER_STATUS.ACTIVE,
diff --git a/packages/twenty-front/src/modules/ai/components/ChatReferenceChip.tsx b/packages/twenty-front/src/modules/ai/components/ChatReferenceChip.tsx
index 5fccd172d9d..b04e5690870 100644
--- a/packages/twenty-front/src/modules/ai/components/ChatReferenceChip.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ChatReferenceChip.tsx
@@ -1,7 +1,8 @@
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Chip, LinkChip } from 'twenty-ui/primitives/data-display';
+import { Chip } from 'twenty-ui/primitives/data-display';
import { ChatReferenceNavigationEnabledContext } from '@/ai/contexts/ChatReferenceNavigationEnabledContext';
import { useChatReferenceTarget } from '@/ai/hooks/useChatReferenceTarget';
diff --git a/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx b/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx
index 954807e8825..0e7171c3758 100644
--- a/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx
@@ -1,8 +1,9 @@
import { TerminalOutput } from '@/ai/components/TerminalOutput';
import { styled } from '@linaria/react';
-import { useContext, useState } from 'react';
import { useLingui } from '@lingui/react/macro';
-import { Tag } from 'twenty-ui/primitives/data-display';
+import { useContext, useState } from 'react';
+import { LightIconButton } from 'twenty-ui/components';
+import { CodeEditor } from 'twenty-ui/components/code-editor';
import {
IconChevronDown,
IconChevronUp,
@@ -11,8 +12,7 @@ import {
IconDownload,
IconFile,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { CodeEditor } from 'twenty-ui/components/code-editor';
+import { Tag } from 'twenty-ui/primitives/data-display';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx b/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx
index a17a52b7307..9af3e0455ea 100644
--- a/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx
+++ b/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx
@@ -2,8 +2,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNumber, isString } from '@sniptt/guards';
import { Children, isValidElement } from 'react';
-import { IconCopy } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconCopy } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx b/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx
index 2d1ced4a01d..bb2da9d6f5e 100644
--- a/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx
@@ -1,15 +1,15 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
+import { JsonTree } from 'twenty-ui/components';
import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
-import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { useUsageValueFormatter } from '@/settings/usage/hooks/useUsageValueFormatter';
import { useLingui } from '@lingui/react/macro';
import { type DataMessagePart } from 'twenty-shared/ai';
import { type JsonValue } from 'type-fest';
-import { useUsageValueFormatter } from '@/settings/usage/hooks/useUsageValueFormatter';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx b/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
index 281cbbde715..65657634f70 100644
--- a/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
+++ b/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
@@ -1,11 +1,12 @@
import { useResolvedAiModel } from '@/ai/hooks/useResolvedAiModel';
-import { Section } from 'twenty-ui/components';
-import { InputLabel, Checkbox } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconBrandX, IconWorld } from 'twenty-ui/icon';
+import { Checkbox } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCheckboxContainer = styled.div<{ disabled: boolean }>`
diff --git a/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx b/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
index 8cb682f73d5..822c1283112 100644
--- a/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
+++ b/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
@@ -2,8 +2,8 @@ import { MONOSPACE_FONT_FAMILY } from '@/ui/theme/constants/MonospaceFontFamily'
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { IconCopy, IconTerminal } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconCopy, IconTerminal } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx b/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx
index 0e7e7ae5067..b98ab2c15af 100644
--- a/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx
@@ -1,27 +1,27 @@
import { TabListRoot } from '@/ui/layout/tab-list/components/TabListRoot';
-import { Tabs } from 'twenty-ui/primitives/navigation';
import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
+import { getToolName, type DynamicToolUIPart, type ToolUIPart } from 'ai';
import { useState } from 'react';
-import { type DynamicToolUIPart, getToolName, type ToolUIPart } from 'ai';
import { isDefined } from 'twenty-shared/utils';
+import { JsonTree } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronRight, IconCpu } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
+import { Tabs } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type JsonValue } from 'type-fest';
import { AiChatThinkingRow } from '@/ai/components/AiChatThinkingRow';
import { ShimmeringText } from '@/ai/components/ShimmeringText';
import { useToolDisplayContext } from '@/ai/hooks/useToolDisplayContext';
-import { getToolIcon } from '@/ai/utils/getToolIcon';
-import { getToolDisplayMessage } from '@/ai/utils/tool-display/get-tool-display-message';
-import { unwrapToolInput } from '@/ai/utils/tool-display/unwrap-tool-input.util';
import { getActiveReasoningContent } from '@/ai/utils/getActiveReasoningContent';
import { getLastReasoningContent } from '@/ai/utils/getLastReasoningContent';
+import { getToolIcon } from '@/ai/utils/getToolIcon';
import { isThinkingStepPartActive } from '@/ai/utils/isThinkingStepPartActive';
import { type ThinkingStepPart } from '@/ai/utils/thinkingStepPart';
+import { getToolDisplayMessage } from '@/ai/utils/tool-display/get-tool-display-message';
+import { unwrapToolInput } from '@/ai/utils/tool-display/unwrap-tool-input.util';
import { TabList } from '@/ui/layout/tab-list/components/TabList';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
diff --git a/packages/twenty-front/src/modules/ai/components/ToolRecordsWidget.tsx b/packages/twenty-front/src/modules/ai/components/ToolRecordsWidget.tsx
index 60799d70198..330c557f6af 100644
--- a/packages/twenty-front/src/modules/ai/components/ToolRecordsWidget.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ToolRecordsWidget.tsx
@@ -1,11 +1,11 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
import { type ToolRecordReference } from 'twenty-shared/ai';
import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
import { useIcons } from 'twenty-ui/icon';
-import { LinkChip } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
diff --git a/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx b/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx
index 6e59d8edf9a..96279fb30e6 100644
--- a/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx
@@ -1,19 +1,19 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
+import { JsonTree } from 'twenty-ui/components';
import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
-import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { CodeExecutionDisplay } from '@/ai/components/CodeExecutionDisplay';
import { ShimmeringText } from '@/ai/components/ShimmeringText';
import { useToolDisplayContext } from '@/ai/hooks/useToolDisplayContext';
+import { getToolIcon } from '@/ai/utils/getToolIcon';
import { getToolDisplayMessage } from '@/ai/utils/tool-display/get-tool-display-message';
import { unwrapToolInput } from '@/ai/utils/tool-display/unwrap-tool-input.util';
-import { getToolIcon } from '@/ai/utils/getToolIcon';
import { useLingui } from '@lingui/react/macro';
-import { type DynamicToolUIPart, getToolName, type ToolUIPart } from 'ai';
+import { getToolName, type DynamicToolUIPart, type ToolUIPart } from 'ai';
import { isDefined } from 'twenty-shared/utils';
import { type JsonValue } from 'type-fest';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
index f7c931ec99f..584a57c2ff3 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
@@ -3,6 +3,7 @@ import { getFileType } from '@/activities/files/utils/getFileType';
import { useFileCategoryColors } from '@/file/hooks/useFileCategoryColors';
import { IconMapping } from '@/file/utils/fileIconMappings';
import { getFileCategoryFromExtension } from '@/object-record/record-field/ui/utils/getFileCategoryFromExtension';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { filePreviewState } from '@/ui/field/display/states/filePreviewState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { styled } from '@linaria/react';
@@ -10,8 +11,8 @@ import { t } from '@lingui/core/macro';
import { useCallback, useContext } from 'react';
import { type ExtendedFileUIPart } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
-import { AvatarOrIcon, Chip } from 'twenty-ui/primitives/data-display';
import { type IconComponent, IconX } from 'twenty-ui/icon';
+import { Chip } from 'twenty-ui/primitives/data-display';
import { Loader } from 'twenty-ui/primitives/feedback';
import { ThemeContext } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx
index 1764775125e..059813d5bca 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx
@@ -1,15 +1,15 @@
-import { t } from '@lingui/core/macro';
import { AGENT_CHAT_STOP_EVENT_NAME } from '@/ai/constants/AgentChatStopEventName';
-import { agentChatInputIsEmptySelector } from '@/ai/states/selectors/agentChatInputIsEmptySelector';
import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';
import { agentChatIsLoadingState } from '@/ai/states/agentChatIsLoadingState';
import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';
import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
+import { agentChatInputIsEmptySelector } from '@/ai/states/selectors/agentChatInputIsEmptySelector';
import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { IconArrowUp, IconPlayerStop } from 'twenty-ui/icon';
+import { t } from '@lingui/core/macro';
import { IconButton } from 'twenty-ui/components';
+import { IconArrowUp, IconPlayerStop } from 'twenty-ui/icon';
type SendMessageButtonProps = {
onSend: () => void;
diff --git a/packages/twenty-front/src/modules/ai/dictation/components/AiChatDictationEffect.tsx b/packages/twenty-front/src/modules/ai/dictation/components/AiChatDictationEffect.tsx
index d9ba45792df..83caf603045 100644
--- a/packages/twenty-front/src/modules/ai/dictation/components/AiChatDictationEffect.tsx
+++ b/packages/twenty-front/src/modules/ai/dictation/components/AiChatDictationEffect.tsx
@@ -15,7 +15,7 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembe
import { useListenToBrowserEvent } from '@/browser-event/hooks/useListenToBrowserEvent';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type AiChatDictationEffectProps = {
onInterimText: (text: string) => void;
diff --git a/packages/twenty-front/src/modules/ai/dictation/components/__tests__/AiChatDictationEffect.test.tsx b/packages/twenty-front/src/modules/ai/dictation/components/__tests__/AiChatDictationEffect.test.tsx
index 1c392d813d0..3ba55793c52 100644
--- a/packages/twenty-front/src/modules/ai/dictation/components/__tests__/AiChatDictationEffect.test.tsx
+++ b/packages/twenty-front/src/modules/ai/dictation/components/__tests__/AiChatDictationEffect.test.tsx
@@ -12,8 +12,8 @@ type SpeechRecognitionTestWindow = {
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
index 75161722a8b..79e460577d8 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
@@ -1,5 +1,4 @@
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useApolloClient } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
@@ -11,6 +10,7 @@ import {
isValidUuid,
tipTapDocumentToMarkdown,
} from 'twenty-shared/utils';
+import { useToast } from 'twenty-ui/components';
import { v4 } from 'uuid';
import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';
@@ -21,10 +21,9 @@ import { AGENT_CHAT_STOP_EVENT_NAME } from '@/ai/constants/AgentChatStopEventNam
import { SEND_CHAT_MESSAGE } from '@/ai/graphql/mutations/sendChatMessage';
import { STOP_AGENT_CHAT_STREAM } from '@/ai/graphql/mutations/stopAgentChatStream';
import { useAgentChatModelId } from '@/ai/hooks/useAgentChatModelId';
-import { aiModelsState } from '@/client-config/states/aiModelsState';
import { useGetBrowsingContext } from '@/ai/hooks/useBrowsingContext';
-import { useProjectAiChatThreadToUrl } from '@/ai/hooks/useProjectAiChatThreadToUrl';
import { useOptimisticallyUnarchiveOnSend } from '@/ai/hooks/useOptimisticallyUnarchiveOnSend';
+import { useProjectAiChatThreadToUrl } from '@/ai/hooks/useProjectAiChatThreadToUrl';
import {
AGENT_CHAT_NEW_THREAD_DRAFT_KEY,
agentChatDraftsByThreadIdState,
@@ -41,6 +40,7 @@ import { isAiChatCreditsExhaustedError } from '@/ai/utils/isAiChatCreditsExhaust
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { useListenToBrowserEvent } from '@/browser-event/hooks/useListenToBrowserEvent';
import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';
+import { aiModelsState } from '@/client-config/states/aiModelsState';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.ts b/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.ts
index 8f35863dd89..79ffbf874db 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.ts
@@ -4,7 +4,7 @@ import { useDirectFileUpload } from '@/file/hooks/useDirectFileUpload';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { type AgentChatFileUIPart } from '@/ai/types/AgentChatFileUIPart';
import { FileFolder } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx b/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx
index 39c01100602..b1c9d4382b4 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx
+++ b/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx
@@ -1,3 +1,4 @@
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { isNonEmptyString } from '@sniptt/guards';
import { type ReactNode } from 'react';
import { AppPath, SettingsPath } from 'twenty-shared/types';
@@ -7,7 +8,6 @@ import {
getSettingsPath,
isDefined,
} from 'twenty-shared/utils';
-import { AvatarOrIcon } from 'twenty-ui/primitives/data-display';
import { IconApps, IconLock, useIcons } from 'twenty-ui/icon';
import { useTheme } from 'twenty-ui/theme-constants';
@@ -21,10 +21,10 @@ import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { useOpenRoutedPageInSidePanel } from '@/side-panel/routing/hooks/useOpenRoutedPageInSidePanel';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { DEFAULT_SKILL_ICON } from '@/skill-suggestion/constants/DefaultSkillIcon';
import { useSkillIcon } from '@/skill-suggestion/hooks/useSkillIcon';
+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useViewById } from '@/views/hooks/useViewById';
const PROPOSED_OBJECT_METADATA_ICON = 'IconListNumbers';
diff --git a/packages/twenty-front/src/modules/ai/hooks/useChatThreadArchiveActions.ts b/packages/twenty-front/src/modules/ai/hooks/useChatThreadArchiveActions.ts
index ce29e4ba48a..495d41b04b3 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useChatThreadArchiveActions.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useChatThreadArchiveActions.ts
@@ -2,7 +2,7 @@ import { useMutation } from '@apollo/client/react';
import { useApplyAgentChatThreadUpdate } from '@/ai/hooks/useApplyAgentChatThreadUpdate';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
ArchiveChatThreadDocument,
UnarchiveChatThreadDocument,
diff --git a/packages/twenty-front/src/modules/ai/hooks/useDeleteChatThread.ts b/packages/twenty-front/src/modules/ai/hooks/useDeleteChatThread.ts
index 7ab4432907f..b72681f8ab6 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useDeleteChatThread.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useDeleteChatThread.ts
@@ -15,7 +15,7 @@ import { useUpdateMetadataStoreDraft } from '@/metadata-store/hooks/useUpdateMet
import { shouldOpenAiChatAfterOnboardingState } from '@/onboarding/states/shouldOpenAiChatAfterOnboardingState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { tipTapDocumentToMarkdown } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { DeleteChatThreadDocument } from '~/generated-metadata/graphql';
export const useDeleteChatThread = () => {
diff --git a/packages/twenty-front/src/modules/ai/hooks/useRenameChatThread.ts b/packages/twenty-front/src/modules/ai/hooks/useRenameChatThread.ts
index bc906095eff..efb2bddb5ba 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useRenameChatThread.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useRenameChatThread.ts
@@ -2,7 +2,7 @@ import { useMutation } from '@apollo/client/react';
import { useApplyAgentChatThreadUpdate } from '@/ai/hooks/useApplyAgentChatThreadUpdate';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { RenameChatThreadDocument } from '~/generated-metadata/graphql';
export const useRenameChatThread = () => {
diff --git a/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.ts b/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.ts
index 958d877d1b7..5055119369a 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.ts
@@ -24,7 +24,7 @@ import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { markWorkspaceCreditsExhausted } from '@/workspace/utils/updateWorkspaceResourceCreditCap';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';
export const useSubmitQuestionAnswer = () => {
diff --git a/packages/twenty-front/src/modules/apollo/components/ToastOnQueryErrorEffect.tsx b/packages/twenty-front/src/modules/apollo/components/ToastOnQueryErrorEffect.tsx
index 12ed7c56c79..18064dcb51d 100644
--- a/packages/twenty-front/src/modules/apollo/components/ToastOnQueryErrorEffect.tsx
+++ b/packages/twenty-front/src/modules/apollo/components/ToastOnQueryErrorEffect.tsx
@@ -2,7 +2,7 @@ import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsF
import { type ErrorLike } from '@apollo/client';
import { useEffect } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type ToastOnQueryErrorEffectProps = {
error: ErrorLike | undefined;
diff --git a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
index bbfca1c138e..4fa8a6f3b56 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
+++ b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
@@ -1,13 +1,13 @@
+import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
+import { clearSessionGeneration } from '@/auth/utils/clearSessionGeneration';
+import { getSessionGeneration } from '@/auth/utils/getSessionGeneration';
+import { rotateSessionGeneration } from '@/auth/utils/rotateSessionGeneration';
import { gql } from '@apollo/client';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { act, renderHook } from '@testing-library/react';
import fetchMock, { enableFetchMocks } from 'jest-fetch-mock';
import { MemoryRouter, useLocation } from 'react-router-dom';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
-import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
-import { clearSessionGeneration } from '@/auth/utils/clearSessionGeneration';
-import { getSessionGeneration } from '@/auth/utils/getSessionGeneration';
-import { rotateSessionGeneration } from '@/auth/utils/rotateSessionGeneration';
+import { ToastProvider } from 'twenty-ui/components';
enableFetchMocks();
diff --git a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
index e826c081012..74ef6376dd0 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
+++ b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
@@ -18,7 +18,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useUpdateEffect } from '~/hooks/useUpdateEffect';
import { isMatchingLocation } from '~/utils/isMatchingLocation';
diff --git a/packages/twenty-front/src/modules/app/components/App.tsx b/packages/twenty-front/src/modules/app/components/App.tsx
index 9f3ac6f323a..5a88bff8829 100644
--- a/packages/twenty-front/src/modules/app/components/App.tsx
+++ b/packages/twenty-front/src/modules/app/components/App.tsx
@@ -6,12 +6,12 @@ import { AppErrorBoundary } from '@/error-handler/components/AppErrorBoundary';
import { AppRootErrorFallback } from '@/error-handler/components/AppRootErrorFallback';
import { ExceptionHandlerProvider } from '@/error-handler/components/ExceptionHandlerProvider';
import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { HelmetProvider } from '@dr.pogodin/react-helmet';
import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
-import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { Provider as JotaiProvider } from 'jotai';
-import { HelmetProvider } from '@dr.pogodin/react-helmet';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
+import { ToastProvider } from 'twenty-ui/components';
import { IconsProvider } from 'twenty-ui/icon';
import { initialI18nActivate } from '~/utils/i18n/initialI18nActivate';
diff --git a/packages/twenty-front/src/modules/applications/components/AppChip.tsx b/packages/twenty-front/src/modules/applications/components/AppChip.tsx
index eae84266576..af58e470a7a 100644
--- a/packages/twenty-front/src/modules/applications/components/AppChip.tsx
+++ b/packages/twenty-front/src/modules/applications/components/AppChip.tsx
@@ -1,9 +1,9 @@
import { useApplicationChipData } from '@/applications/hooks/useApplicationChipData';
import { styled } from '@linaria/react';
-import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { Avatar, type AvatarSize } from 'twenty-ui/primitives/data-display';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
type AppChipProps = {
size?: AvatarSize;
diff --git a/packages/twenty-front/src/modules/auth/components/Logo.tsx b/packages/twenty-front/src/modules/auth/components/Logo.tsx
index 12263449e8d..2a6953f4184 100644
--- a/packages/twenty-front/src/modules/auth/components/Logo.tsx
+++ b/packages/twenty-front/src/modules/auth/components/Logo.tsx
@@ -1,9 +1,9 @@
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { AppPath } from 'twenty-shared/types';
import { getImageAbsoluteURI, isDefined } from 'twenty-shared/utils';
import { Avatar } from 'twenty-ui/primitives/data-display';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useRedirectToDefaultDomain } from '~/modules/domain-manager/hooks/useRedirectToDefaultDomain';
diff --git a/packages/twenty-front/src/modules/auth/components/Title.tsx b/packages/twenty-front/src/modules/auth/components/Title.tsx
index 8024633f828..d99cb5b6784 100644
--- a/packages/twenty-front/src/modules/auth/components/Title.tsx
+++ b/packages/twenty-front/src/modules/auth/components/Title.tsx
@@ -1,7 +1,7 @@
+import { AnimatedEaseIn } from '@/auth/components/internal/AnimatedEaseIn/AnimatedEaseIn';
import { styled } from '@linaria/react';
import React from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseIn } from 'twenty-ui/primitives/layout';
type TitleProps = React.PropsWithChildren & {
animate?: boolean;
diff --git a/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsx b/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsx
index b7dd0a30414..b5e46509014 100644
--- a/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsx
@@ -8,7 +8,7 @@ import { useLingui } from '@lingui/react/macro';
import { useEffect } from 'react';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateApp } from '~/hooks/useNavigateApp';
export const TwoFactorAuthenticationSetupEffect = () => {
diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
index 266079b4bdd..00942bccd15 100644
--- a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
@@ -13,7 +13,7 @@ import { useEffect } from 'react';
import { useSearchParams } from 'react-router-dom';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast, type ToastOptions } from 'twenty-ui/primitives/feedback';
+import { useToast, type ToastOptions } from 'twenty-ui/components';
import { useNavigateApp } from '~/hooks/useNavigateApp';
import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';
import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';
diff --git a/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmail.test.tsx b/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmail.test.tsx
index 4e766acae3c..18034701646 100644
--- a/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmail.test.tsx
+++ b/packages/twenty-front/src/modules/auth/components/__tests__/VerifyEmail.test.tsx
@@ -53,8 +53,8 @@ jest.mock('~/hooks/useNavigateApp', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/auth/components/internal/AnimatedEaseIn/AnimatedEaseIn.tsx b/packages/twenty-front/src/modules/auth/components/internal/AnimatedEaseIn/AnimatedEaseIn.tsx
new file mode 100644
index 00000000000..5775d0d7e80
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/components/internal/AnimatedEaseIn/AnimatedEaseIn.tsx
@@ -0,0 +1,48 @@
+import { css } from '@linaria/core';
+import { type AnimationDuration } from 'twenty-ui/theme';
+
+const styles = {
+ fadeIn: css`
+ & {
+ --animated-ease-in-duration: calc(
+ var(--t-animation-duration-normal) * 1s
+ );
+ animation: animated-ease-in-animatedEaseInFadeIn
+ var(--animated-ease-in-duration) linear;
+ }
+ &[data-duration='instant'] {
+ --animated-ease-in-duration: calc(
+ var(--t-animation-duration-instant) * 1s
+ );
+ }
+ &[data-duration='fast'] {
+ --animated-ease-in-duration: calc(var(--t-animation-duration-fast) * 1s);
+ }
+ &[data-duration='slow'] {
+ --animated-ease-in-duration: calc(var(--t-animation-duration-slow) * 1s);
+ }
+
+ @keyframes animated-ease-in-animatedEaseInFadeIn {
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
+ }
+ `,
+};
+
+type AnimatedEaseInProps = {
+ children?: React.ReactNode;
+ duration?: AnimationDuration;
+};
+
+export const AnimatedEaseIn = ({
+ children,
+ duration = 'normal',
+}: AnimatedEaseInProps) => (
+ <div className={styles.fadeIn} data-duration={duration}>
+ {children}
+ </div>
+);
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx b/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
index 7d470e7919f..39d652284a9 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
@@ -20,10 +20,10 @@ import {
currentWorkspaceState,
} from '@/auth/states/currentWorkspaceState';
import { returnToPathState } from '@/auth/states/returnToPathState';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
import { renderHook } from '@testing-library/react';
import { getDefaultStore } from 'jotai';
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+import { ToastProvider } from 'twenty-ui/components';
const redirectSpy = jest.fn();
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts b/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts
index 1d454e5ab74..872cc49a38f 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts
@@ -21,8 +21,8 @@ jest.mock('@apollo/client/react', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts b/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts
index dfe363a24d5..e14d45522f6 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts
@@ -22,8 +22,8 @@ jest.mock('../useAuth', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts b/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts
index d3fbd03d140..c18419b6f08 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts
@@ -5,7 +5,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useMutation } from '@apollo/client/react';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { GetAuthTokensFromSsoExchangeTokenDocument } from '~/generated-metadata/graphql';
export const useRedeemSsoExchangeToken = () => {
diff --git a/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts b/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts
index 5ad9caefd3d..5f7623a9c76 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts
@@ -5,7 +5,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useLingui } from '@lingui/react/macro';
import { AppPath } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateApp } from '~/hooks/useNavigateApp';
export const useVerifyLogin = () => {
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
index fa62b47d5a5..5e52d7fcb0b 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
@@ -2,18 +2,18 @@ import { styled } from '@linaria/react';
import { SubTitle } from '@/auth/components/SubTitle';
import { Title } from '@/auth/components/Title';
+import { AnimatedEaseIn } from '@/auth/components/internal/AnimatedEaseIn/AnimatedEaseIn';
import { useHandleResendEmailVerificationToken } from '@/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken';
import {
SignInUpStep,
signInUpStepState,
} from '@/auth/states/signInUpStepState';
import { OnboardingModalCircularIcon } from '@/onboarding/components/OnboardingModalCircularIcon';
-import { t } from '@lingui/core/macro';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
+import { t } from '@lingui/core/macro';
import { MainButton } from 'twenty-ui/components';
import { IconGmail, IconMail, IconMailX, IconMicrosoft } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseIn } from 'twenty-ui/primitives/layout';
const StyledContainer = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
index 1f6480e64e6..7126183d1d7 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
@@ -1,17 +1,14 @@
import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState';
import { returnToPathState } from '@/auth/states/returnToPathState';
import { useBuildWorkspaceUrl } from '@/domain-manager/hooks/useBuildWorkspaceUrl';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { FormProvider } from 'react-hook-form';
-import {
- ClickToActionLink,
- UndecoratedLink,
-} from 'twenty-ui/primitives/navigation';
+import { ClickToActionLink } from 'twenty-ui/primitives/navigation';
import { StyledOnboardingContentContainer } from '@/auth/components/StyledOnboardingContentContainer';
-import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';
import { SignInUpWithCredentials } from '@/auth/sign-in-up/components/internal/SignInUpWithCredentials';
import { SignInUpWithGoogle } from '@/auth/sign-in-up/components/internal/SignInUpWithGoogle';
import { SignInUpWithMicrosoft } from '@/auth/sign-in-up/components/internal/SignInUpWithMicrosoft';
@@ -24,13 +21,14 @@ import {
import { getAvailableWorkspacePathAndSearchParams } from '@/auth/utils/availableWorkspacesUtils';
import { authProvidersState } from '@/client-config/states/authProvidersState';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
-import { Avatar } from 'twenty-ui/primitives/data-display';
import { IconChevronRight, IconPlus } from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpStandardContent.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpStandardContent.tsx
index 4fd51ecdda4..f25fe10657a 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpStandardContent.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpStandardContent.tsx
@@ -1,13 +1,13 @@
-import { StyledAuthContent } from '@/auth/components/StyledAuthContent';
import { Logo } from '@/auth/components/Logo';
+import { StyledAuthContent } from '@/auth/components/StyledAuthContent';
import { Title } from '@/auth/components/Title';
+import { AnimatedEaseIn } from '@/auth/components/internal/AnimatedEaseIn/AnimatedEaseIn';
import { FooterNote } from '@/auth/sign-in-up/components/FooterNote';
import { WorkspaceSelectionFooter } from '@/auth/sign-in-up/components/WorkspaceSelectionFooter';
import { SignInUpStep } from '@/auth/states/signInUpStepState';
import { styled } from '@linaria/react';
import { type JSX } from 'react';
import { AppPath } from 'twenty-shared/types';
-import { AnimatedEaseIn } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type PublicWorkspaceData } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
index 1801e6164c8..4493afa7436 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
@@ -1,13 +1,12 @@
+import { Text } from 'twenty-ui/primitives/typography';
import { type Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';
import { SignInUpMode } from '@/auth/types/signInUpMode';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { motion } from 'framer-motion';
-import { useContext } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
-import { StyledText } from 'twenty-ui/primitives/typography';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledFullWidthMotionDiv = styled(motion.div)`
width: 100%;
@@ -24,7 +23,6 @@ export const SignInUpPasswordField = ({
showErrors: boolean;
signInUpMode: SignInUpMode;
}) => {
- const { theme } = useContext(ThemeContext);
const { t } = useLingui();
const form = useFormContext<Form>();
@@ -58,10 +56,7 @@ export const SignInUpPasswordField = ({
fullWidth
/>
{signInUpMode === SignInUpMode.SignUp && (
- <StyledText
- text={t`At least 8 characters long.`}
- color={theme.font.color.secondary}
- />
+ <StyledPasswordHint>{t`At least 8 characters long.`}</StyledPasswordHint>
)}
</StyledInputContainer>
)}
@@ -69,3 +64,13 @@ export const SignInUpPasswordField = ({
</StyledFullWidthMotionDiv>
);
};
+
+const StyledPasswordHint = styled(Text)`
+ color: ${themeCssVariables.font.color.secondary};
+ cursor: initial;
+ font-size: ${themeCssVariables.font.size.sm};
+ font-weight: ${themeCssVariables.font.weight.regular};
+ overflow: hidden;
+ padding: ${themeCssVariables.spacing[2]} 0;
+ white-space: nowrap;
+`;
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx
index 03509b2f720..177dce46c3f 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx
@@ -23,13 +23,11 @@ import { OTPInput, type SlotProps } from 'input-otp';
import { useState } from 'react';
import { Controller } from 'react-hook-form';
import { AppPath } from 'twenty-shared/types';
-import { MainButton } from 'twenty-ui/components';
+import { MainButton, useToast } from 'twenty-ui/components';
import { ClickToActionLink } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateApp } from '~/hooks/useNavigateApp';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledForm = styled.form`
align-items: center;
display: flex;
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
index 561c8054f62..12a06f8a93a 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
@@ -16,6 +16,9 @@ import { SignInUpMode } from '@/auth/types/signInUpMode';
import { isRequestingCaptchaTokenState } from '@/captcha/states/isRequestingCaptchaTokenState';
import { captchaState } from '@/client-config/states/captchaState';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
+import { InputHint } from '@/ui/input/components/internal/InputHint/InputHint';
+import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
@@ -23,9 +26,6 @@ import { useFormContext } from 'react-hook-form';
import { isDefined } from 'twenty-shared/utils';
import { MainButton } from 'twenty-ui/components';
import { Loader } from 'twenty-ui/primitives/feedback';
-import { InputHint } from 'twenty-ui/primitives/input';
-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
const StyledForm = styled.form`
align-items: center;
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx
index 3508aba7547..abb63730a20 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx
@@ -1,11 +1,11 @@
import { useSignUpInNewWorkspace } from '@/auth/sign-in-up/hooks/useSignUpInNewWorkspace';
-import { OnboardingAnimatedReveal } from '@/onboarding/components/OnboardingAnimatedReveal';
-import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';
-import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';
import { useWorkspaceSubdomainField } from '@/auth/sign-in-up/hooks/useWorkspaceSubdomainField';
import { isCreatingWorkspaceState } from '@/auth/states/isCreatingWorkspaceState';
import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';
+import { OnboardingAnimatedReveal } from '@/onboarding/components/OnboardingAnimatedReveal';
+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';
+import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';
import { TextInput } from '@/ui/input/components/TextInput';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
@@ -15,11 +15,10 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useEffect, useRef, useState } from 'react';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
-import { MainButton, LightIconButton } from 'twenty-ui/components';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import { LightIconButton, MainButton } from 'twenty-ui/components';
import { IconTrash, IconUpload } from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { Button } from 'twenty-ui/primitives/input';
-
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContentContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useHandleResetPassword.test.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useHandleResetPassword.test.ts
index ac619b1cdf0..21b230aca32 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useHandleResetPassword.test.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useHandleResetPassword.test.ts
@@ -17,8 +17,8 @@ import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
jest.mock('@apollo/client/react');
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx
index 174564d2473..9b9cd6c79a1 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx
@@ -26,8 +26,8 @@ jest.mock('@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSso.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSso.test.tsx
index 2c5bea2bb36..be51f522c04 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSso.test.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSso.test.tsx
@@ -8,8 +8,8 @@ import { MemoryRouter } from 'react-router-dom';
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
jest.mock('@/domain-manager/hooks/useRedirect');
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken.ts
index 1cc16c8d0e4..14064f3f5cf 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken.ts
@@ -4,7 +4,7 @@ import { useOrigin } from '@/domain-manager/hooks/useOrigin';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { ResendEmailVerificationTokenDocument } from '~/generated-metadata/graphql';
export const useHandleResendEmailVerificationToken = () => {
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts
index d26eafe9b69..9741aff4b4c 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts
@@ -8,7 +8,7 @@ import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsF
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { EmailPasswordResetLinkDocument } from '~/generated-metadata/graphql';
export const useHandleResetPassword = () => {
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
index 95adbeb9618..40dd30f95fb 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
@@ -25,7 +25,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useLingui } from '@lingui/react/macro';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { buildAppPathWithQueryParams } from '~/utils/buildAppPathWithQueryParams';
import { isMatchingLocation } from '~/utils/isMatchingLocation';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.ts
index 90404c86bf1..228d15fda63 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignUpInNewWorkspace.ts
@@ -8,7 +8,7 @@ import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { AppPath } from 'twenty-shared/types';
import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
SignUpInNewWorkspaceDocument,
UploadNewWorkspaceLogoDocument,
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSso.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSso.ts
index 52e8e00aa65..a3771098409 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSso.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSso.ts
@@ -6,7 +6,7 @@ import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsF
import { useApolloClient } from '@apollo/client/react';
import { useParams } from 'react-router-dom';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { GetAuthorizationUrlForSsoDocument } from '~/generated-metadata/graphql';
export const useSso = () => {
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
index 899870b2dc0..78d4983ca76 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
@@ -5,7 +5,7 @@ import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx
index 5ff189a2024..30eb668dea5 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx
@@ -1,10 +1,10 @@
-import { SLASH_MENU_LIST_ID } from '@/ui/input/constants/SlashMenuListId';
import { type SuggestionItem } from '@/blocknote-editor/types/types';
+import { SLASH_MENU_LIST_ID } from '@/ui/input/constants/SlashMenuListId';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-import { MenuItemSuggestion } from 'twenty-ui/primitives/navigation';
+import { MenuItemSuggestion } from 'twenty-ui/components';
export type CustomSlashMenuListItemProps = {
item: SuggestionItem;
diff --git a/packages/twenty-front/src/modules/blocknote-editor/hooks/useAttachmentSync.ts b/packages/twenty-front/src/modules/blocknote-editor/hooks/useAttachmentSync.ts
index 8aaaaabe281..4a89e4742d3 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/hooks/useAttachmentSync.ts
+++ b/packages/twenty-front/src/modules/blocknote-editor/hooks/useAttachmentSync.ts
@@ -3,14 +3,14 @@ import { filterAttachmentsToRestore } from '@/activities/utils/filterAttachments
import { getActivityAttachmentIdsAndNameToUpdate } from '@/activities/utils/getActivityAttachmentIdsAndNameToUpdate';
import { getActivityAttachmentIdsToDelete } from '@/activities/utils/getActivityAttachmentIdsToDelete';
import { getActivityAttachmentPathsToRestore } from '@/activities/utils/getActivityAttachmentPathsToRestore';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';
import { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecords';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useAttachmentSync = (attachments: Attachment[]) => {
const { deleteManyRecords: deleteAttachments } = useDeleteManyRecords({
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemErrorBoundary.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemErrorBoundary.tsx
index ebb2708c029..f68abef0562 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemErrorBoundary.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemErrorBoundary.tsx
@@ -2,7 +2,7 @@ import { CommandComponentInstanceContext } from '@/command-menu-item/engine-comm
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { type ReactNode } from 'react';
import { ErrorBoundary } from 'react-error-boundary';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type CommandMenuItemErrorBoundaryProps = {
children: ReactNode;
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx
index 88c71d7be08..bcb604e56b4 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx
@@ -1,4 +1,3 @@
-import { AnimatedIconCrossfade } from 'twenty-ui/primitives/layout';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
@@ -7,6 +6,7 @@ import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfo
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
import { SidePanelPages } from 'twenty-shared/types';
+import { AnimatedIconCrossfade } from 'twenty-ui/components';
import { IconPencil, IconX } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx
index 72bae0d0a69..f51a6feec94 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx
@@ -5,6 +5,7 @@ import { useReorderCommandMenuItemsInDraft } from '@/command-menu-item/edit/hook
import { useUpdateCommandMenuItemInDraft } from '@/command-menu-item/edit/hooks/useUpdateCommandMenuItemInDraft';
import { useCurrentCommandMenuContextApi } from '@/command-menu-item/hooks/useCurrentCommandMenuContextApi';
import { commandMenuItemsSelector } from '@/command-menu-item/states/commandMenuItemsSelector';
+import { getCommandMenuItemPlaceholderValues } from '@/command-menu-item/utils/getCommandMenuItemPlaceholderValues';
import { groupCommandMenuItems } from '@/command-menu-item/utils/groupCommandMenuItems';
import { COMMAND_MENU_CLICK_OUTSIDE_ID } from '@/command-menu/constants/CommandMenuClickOutsideId';
import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
@@ -12,23 +13,25 @@ import { SidePanelList } from '@/side-panel/components/SidePanelList';
import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
+import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { ContextStorePageType } from 'twenty-shared/types';
import { interpolateMessagePlaceholders } from 'twenty-shared/i18n';
+import { ContextStorePageType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { getCommandMenuItemPlaceholderValues } from '@/command-menu-item/utils/getCommandMenuItemPlaceholderValues';
+import {
+ LightIconButton,
+ MenuItem,
+ MenuItemDraggable,
+} from 'twenty-ui/components';
import {
IconDotsVertical,
IconPin,
IconPinnedOff,
useIcons,
} from 'twenty-ui/icon';
-import { MenuItem, MenuItemDraggable } from 'twenty-ui/primitives/navigation';
-import { LightIconButton } from 'twenty-ui/components';
import { ButtonGroup } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type CommandMenuItemFieldsFragment } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useResetCommandMenuItemToDefault.ts b/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useResetCommandMenuItemToDefault.ts
index 86a0722d050..48a29d23490 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useResetCommandMenuItemToDefault.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useResetCommandMenuItemToDefault.ts
@@ -10,7 +10,7 @@ import { commandMenuItemsDraftState } from '@/command-menu-item/edit/states/comm
import { RESET_COMMAND_MENU_ITEM } from '@/command-menu-item/graphql/mutations/resetCommandMenuItem';
import { useMetadataErrorHandler } from '@/metadata-error-handler/hooks/useMetadataErrorHandler';
import { useUpdateMetadataStoreDraft } from '@/metadata-store/hooks/useUpdateMetadataStoreDraft';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type ResetCommandMenuItemMutation,
type ResetCommandMenuItemMutationVariables,
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx
index 4f4f172f355..b98b99fff64 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx
@@ -1,15 +1,15 @@
import { useIsHeadlessEngineCommandEffectInitialized } from '@/command-menu-item/engine-command/hooks/useIsHeadlessEngineCommandEffectInitialized';
import { type ReactNode, useEffect } from 'react';
-import { COMMAND_MENU_CONFIRMATION_MODAL_RESULT_BROWSER_EVENT_NAME } from 'twenty-shared/constants';
import { useCommandMenuConfirmationModal } from '@/command-menu-item/confirmation-modal/hooks/useCommandMenuConfirmationModal';
import { type CommandMenuItemConfirmationModalLinkButton } from '@/command-menu-item/confirmation-modal/states/commandMenuItemConfirmationModalState';
-import { type CommandMenuConfirmationModalResultBrowserEventDetail } from 'twenty-shared/types';
import { useUnmountCommand } from '@/command-menu-item/engine-command/hooks/useUnmountEngineCommand';
import { CommandComponentInstanceContext } from '@/command-menu-item/engine-command/states/contexts/CommandComponentInstanceContext';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { COMMAND_MENU_CONFIRMATION_MODAL_RESULT_BROWSER_EVENT_NAME } from 'twenty-shared/constants';
+import { type CommandMenuConfirmationModalResultBrowserEventDetail } from 'twenty-shared/types';
+import { useToast } from 'twenty-ui/components';
import { type ButtonColor } from 'twenty-ui/primitives/input';
export type HeadlessConfirmationModalEngineCommandEffectProps = {
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect.tsx
index 174b1c7f1f9..50a5c6687fe 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect.tsx
@@ -4,7 +4,7 @@ import { CommandComponentInstanceContext } from '@/command-menu-item/engine-comm
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useEffect } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export type HeadlessEngineCommandWrapperEffectProps = {
execute: () => void | Promise<unknown>;
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/global/components/EditLayoutCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/global/components/EditLayoutCommand.tsx
index 07bb926b89d..a96dd9fabb1 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/global/components/EditLayoutCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/global/components/EditLayoutCommand.tsx
@@ -1,4 +1,4 @@
-import { useResetLocationHash } from 'twenty-ui/utilities';
+import { useResetLocationHash } from '@/ui/navigation/utils/hooks/useResetLocationHash';
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
import { useEnterLayoutCustomizationMode } from '@/layout-customization/hooks/useEnterLayoutCustomizationMode';
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/DuplicateDashboardSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/DuplicateDashboardSingleRecordCommand.tsx
index 9f0f06878c3..7e7103471bf 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/DuplicateDashboardSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/DuplicateDashboardSingleRecordCommand.tsx
@@ -5,7 +5,7 @@ import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateApp } from '~/hooks/useNavigateApp';
export const DuplicateDashboardSingleRecordCommand = () => {
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/EditDashboardSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/EditDashboardSingleRecordCommand.tsx
index 37f820c561f..0963c6d69da 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/EditDashboardSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/dashboard/components/EditDashboardSingleRecordCommand.tsx
@@ -1,8 +1,8 @@
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { useSetIsPageLayoutInEditMode } from '@/page-layout/hooks/useSetIsPageLayoutInEditMode';
+import { useResetLocationHash } from '@/ui/navigation/utils/hooks/useResetLocationHash';
import { isDefined } from 'twenty-shared/utils';
-import { useResetLocationHash } from 'twenty-ui/utilities';
export const EditDashboardSingleRecordCommand = () => {
const { selectedRecords } = useHeadlessCommandContextApi();
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/components/DuplicateMessageListSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/components/DuplicateMessageListSingleRecordCommand.tsx
index 73c0e6a8f02..7b0d8bd52e4 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/components/DuplicateMessageListSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/components/DuplicateMessageListSingleRecordCommand.tsx
@@ -6,7 +6,7 @@ import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateApp } from '~/hooks/useNavigateApp';
export const DuplicateMessageListSingleRecordCommand = () => {
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/hooks/useDuplicateMessageList.ts b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/hooks/useDuplicateMessageList.ts
index f5ab0fc92f8..b6968b7260b 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/hooks/useDuplicateMessageList.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/message-list/hooks/useDuplicateMessageList.ts
@@ -5,7 +5,7 @@ import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { CoreObjectNameSingular, CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { DuplicateMessageListDocument } from '~/generated-metadata/graphql';
export const useDuplicateMessageList = () => {
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx
index 789425404de..2a67e9d8497 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx
@@ -7,7 +7,7 @@ import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateApp } from '~/hooks/useNavigateApp';
export const DuplicateWorkflowSingleRecordCommand = () => {
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
index a15cf23162e..88dec1a6e8b 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
@@ -1,7 +1,7 @@
import { isNonEmptyString } from '@sniptt/guards';
import { type ReactNode } from 'react';
+import { MenuItem } from 'twenty-ui/components';
import { IconArrowUpRight, type IconComponent } from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
import { useCommandMenuOnItemClick } from '@/command-menu/hooks/useCommandMenuOnItemClick';
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemSwitch.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemSwitch.tsx
index 06bf6d52ebe..e5534f56fb3 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemSwitch.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemSwitch.tsx
@@ -1,10 +1,10 @@
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { styled } from '@linaria/react';
-import { SettingsRow, type SettingsRowProps } from 'twenty-ui/components';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isDefined } from 'twenty-shared/utils';
+import { SettingsRow, type SettingsRowProps } from 'twenty-ui/components';
import { type IconComponent } from 'twenty-ui/icon';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
type CommandMenuItemSwitchProps = {
id: string;
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx
index 3163004f13e..85f0ae23e7e 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx
@@ -18,10 +18,10 @@ import { WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID } from '@/workflow/wor
import { WORKFLOW_DIAGRAM_EDGE_OPTIONS_CLICK_OUTSIDE_ID } from '@/workflow/workflow-diagram/workflow-edges/constants/WorkflowDiagramEdgeOptionsClickOutsideId';
import { useStore } from 'jotai';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@/ui/navigation/link/constants/LinkChipClickOutsideId';
import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import { useCallback, useContext, useRef } from 'react';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/primitives/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
const StyledCommandMenuBase = styled.div`
diff --git a/packages/twenty-front/src/modules/dashboards/hooks/useDuplicateDashboard.ts b/packages/twenty-front/src/modules/dashboards/hooks/useDuplicateDashboard.ts
index f4ed61f451f..e96b72940b0 100644
--- a/packages/twenty-front/src/modules/dashboards/hooks/useDuplicateDashboard.ts
+++ b/packages/twenty-front/src/modules/dashboards/hooks/useDuplicateDashboard.ts
@@ -5,7 +5,7 @@ import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { CoreObjectNameSingular, CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { DuplicateDashboardDocument } from '~/generated-metadata/graphql';
export const useDuplicateDashboard = () => {
diff --git a/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsx b/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsx
index 98cc45502ca..9e5c7f1bb72 100644
--- a/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
import { useSearchParams } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const ErrorMessageEffect = () => {
const { enqueueToast } = useToast();
diff --git a/packages/twenty-front/src/modules/error-handler/components/PromiseRejectionEffect.tsx b/packages/twenty-front/src/modules/error-handler/components/PromiseRejectionEffect.tsx
index a219350d522..007b17f1c93 100644
--- a/packages/twenty-front/src/modules/error-handler/components/PromiseRejectionEffect.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/PromiseRejectionEffect.tsx
@@ -1,7 +1,7 @@
import { useCallback, useEffect } from 'react';
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { checkIfItsAViteStaleChunkLazyLoadingError } from '@/error-handler/utils/checkIfItsAViteStaleChunkLazyLoadingError';
+import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import {
CombinedGraphQLErrors,
CombinedProtocolErrors,
@@ -12,7 +12,7 @@ import {
UnconventionalError,
} from '@apollo/client/errors';
import { isDefined, type CustomError } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
const isApolloError = (error: unknown): boolean =>
CombinedGraphQLErrors.is(error) ||
diff --git a/packages/twenty-front/src/modules/error-handler/components/__tests__/PromiseRejectionEffect.test.tsx b/packages/twenty-front/src/modules/error-handler/components/__tests__/PromiseRejectionEffect.test.tsx
index b4488bbd9a6..db1d5be87c7 100644
--- a/packages/twenty-front/src/modules/error-handler/components/__tests__/PromiseRejectionEffect.test.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/__tests__/PromiseRejectionEffect.test.tsx
@@ -8,8 +8,8 @@ jest.mock('@sentry/react', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx b/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
index 3a1c752d4f3..6a01c147426 100644
--- a/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
@@ -1,33 +1,28 @@
import { type AppErrorDisplayProps } from '@/error-handler/types/AppErrorDisplayProps';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { t } from '@lingui/core/macro';
import { IconRefresh } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
export const AppErrorDisplay = ({
resetErrorBoundary,
title = t`Sorry, something went wrong`,
}: AppErrorDisplayProps) => {
return (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="errorIndex" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>{title}</AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{title}</EmptyState.Title>
+ <EmptyState.Description>
{t`Please refresh the page.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
<Button
startIcon={<IconRefresh />}
onClick={resetErrorBoundary}
variant="outline"
>{t`Reload`}</Button>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Root>
);
};
diff --git a/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx b/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx
index 45f22c4aaf7..18644649860 100644
--- a/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx
+++ b/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx
@@ -3,7 +3,7 @@ import { isErrorLike } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
-import { type ToastOptions } from 'twenty-ui/primitives/feedback';
+import { type ToastOptions } from 'twenty-ui/components';
import { getConflictingRecordFromApolloError } from '~/utils/get-conflicting-record-from-apollo-error.util';
import { getErrorMessageFromApolloError } from '~/utils/get-error-message-from-apollo-error.util';
diff --git a/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx b/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
index 256fed80e2f..aac82647e1d 100644
--- a/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
+++ b/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
@@ -1,6 +1,6 @@
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { AvatarOrIcon } from 'twenty-ui/primitives/data-display';
import { IconX } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/file/components/FileIcon.tsx b/packages/twenty-front/src/modules/file/components/FileIcon.tsx
index 6084c4fd555..a6e36040edc 100644
--- a/packages/twenty-front/src/modules/file/components/FileIcon.tsx
+++ b/packages/twenty-front/src/modules/file/components/FileIcon.tsx
@@ -1,12 +1,12 @@
import { type AttachmentFileCategory } from '@/activities/files/types/AttachmentFileCategory';
import { useFileIconColors } from '@/file/hooks/useFileIconColors';
import { IconMapping } from '@/file/utils/fileIconMappings';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext, useState } from 'react';
import { FILE_CATEGORIES, type FileCategory } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { AvatarOrIcon } from 'twenty-ui/primitives/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type FileIconSize = 'small' | 'medium';
diff --git a/packages/twenty-front/src/modules/front-components/components/FrontComponentLoadErrorToastEffect.tsx b/packages/twenty-front/src/modules/front-components/components/FrontComponentLoadErrorToastEffect.tsx
index f9c8341ac76..ba19acf1e12 100644
--- a/packages/twenty-front/src/modules/front-components/components/FrontComponentLoadErrorToastEffect.tsx
+++ b/packages/twenty-front/src/modules/front-components/components/FrontComponentLoadErrorToastEffect.tsx
@@ -1,7 +1,7 @@
import { t } from '@lingui/core/macro';
import { useEffect } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type FrontComponentLoadErrorToastEffectProps = {
errorMessage?: string;
diff --git a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
index 8901a3800d9..c4f1b4cacb6 100644
--- a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
+++ b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
@@ -16,7 +16,7 @@ import { type ReactNode, useCallback, useContext, useMemo } from 'react';
import { FrontComponentRenderer as SharedFrontComponentRenderer } from 'twenty-front-component-renderer';
import { type FrontComponentToolCall } from 'twenty-sdk/front-component';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import {
diff --git a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
index 6e1ad8522a1..b45617e2065 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
+++ b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
@@ -118,8 +118,8 @@ jest.mock(
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
index 76f4b2ee9d0..b72141ab37c 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
+++ b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
@@ -47,7 +47,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { useStore } from 'jotai';
import { CustomError, getAppPath, isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useIcons } from 'twenty-ui/icon';
import { useIsMobile } from 'twenty-ui/utilities';
import { FileFolder } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx b/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
index 0e66cddceeb..a0514dfddb1 100644
--- a/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
+++ b/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
@@ -1,4 +1,3 @@
-import { Tag } from 'twenty-ui/primitives/data-display';
import { type PlaceAutocompleteResult } from '@/geo-map/types/placeApi';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -7,6 +6,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { styled } from '@linaria/react';
import { useMemo, useRef } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Tag } from 'twenty-ui/primitives/data-display';
import { type SelectOption } from 'twenty-ui/primitives/input';
import { ListItem } from 'twenty-ui/primitives/navigation';
const StyledContainer = styled.div<{ fullWidth?: boolean }>`
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
index 2e49a4e4284..7518c8a45da 100644
--- a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
@@ -1,20 +1,20 @@
-import { isDefined } from 'twenty-shared/utils';
-import { BUTTON_INVERTED_CLASS_NAME } from '@/ui/input/styles/ButtonInvertedClassName';
import { InformationBannerComponentInstanceContext } from '@/information-banner/states/contexts/InformationBannerComponentInstanceContext';
import { informationBannerIsOpenComponentState } from '@/information-banner/states/informationBannerIsOpenComponentState';
+import { BUTTON_INVERTED_CLASS_NAME } from '@/ui/input/styles/ButtonInvertedClassName';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { styled } from '@linaria/react';
import { css } from '@linaria/core';
+import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { isDefined } from 'twenty-shared/utils';
+import { IconButton } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { type IconComponent, IconX } from 'twenty-ui/icon';
import {
Banner,
type BannerColor,
type BannerVariant,
} from 'twenty-ui/primitives/feedback';
-import { type IconComponent, IconX } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { IconButton } from 'twenty-ui/components';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledText = styled.div`
diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useEnterLayoutCustomizationMode.test.tsx b/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useEnterLayoutCustomizationMode.test.tsx
index 18d06017256..06f5687bc66 100644
--- a/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useEnterLayoutCustomizationMode.test.tsx
+++ b/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useEnterLayoutCustomizationMode.test.tsx
@@ -15,8 +15,8 @@ jest.mock('@/side-panel/hooks/useNavigateSidePanel', () => ({
}));
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts
index 9299483f3d1..a9f43ebf3a0 100644
--- a/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts
+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts
@@ -18,7 +18,7 @@ import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFla
import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { PermissionFlagType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.ts
index 0bd420948b9..27e68e2682f 100644
--- a/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.ts
+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.ts
@@ -1,13 +1,13 @@
-import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';
-import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
import { useSaveCommandMenuItemsDraft } from '@/command-menu-item/edit/hooks/useSaveCommandMenuItemsDraft';
import { useCommandMenuItemsDraftState } from '@/command-menu-item/hooks/useCommandMenuItemsDraftState';
import { useExitLayoutCustomizationMode } from '@/layout-customization/hooks/useExitLayoutCustomizationMode';
import { activeCustomizationPageLayoutIdsState } from '@/layout-customization/states/activeCustomizationPageLayoutIdsState';
+import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';
import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';
import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';
import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems';
import { useSaveNavigationMenuItemsDraft } from '@/navigation-menu-item/edit/hooks/useSaveNavigationMenuItemsDraft';
+import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
import { useCreatePendingFieldsWidgetViews } from '@/page-layout/hooks/useCreatePendingFieldsWidgetViews';
import { useCreatePendingRecordTableWidgetViews } from '@/page-layout/hooks/useCreatePendingRecordTableWidgetViews';
import { useSavePageLayoutWidgetsData } from '@/page-layout/hooks/useSavePageLayoutWidgetsData';
@@ -24,7 +24,7 @@ import { useLingui } from '@lingui/react/macro';
import { useStore } from 'jotai';
import { useCallback, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
import { logError } from '~/utils/logError';
diff --git a/packages/twenty-front/src/modules/logic-functions/hooks/usePersistLogicFunction.ts b/packages/twenty-front/src/modules/logic-functions/hooks/usePersistLogicFunction.ts
index f7a9a4382c4..9bf563afd55 100644
--- a/packages/twenty-front/src/modules/logic-functions/hooks/usePersistLogicFunction.ts
+++ b/packages/twenty-front/src/modules/logic-functions/hooks/usePersistLogicFunction.ts
@@ -11,7 +11,7 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type CreateOneLogicFunctionMutation,
type CreateOneLogicFunctionMutationVariables,
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/__tests__/useInstallMarketplaceApp.test.tsx b/packages/twenty-front/src/modules/marketplace/hooks/__tests__/useInstallMarketplaceApp.test.tsx
index 27b0f62c4ff..052c8742906 100644
--- a/packages/twenty-front/src/modules/marketplace/hooks/__tests__/useInstallMarketplaceApp.test.tsx
+++ b/packages/twenty-front/src/modules/marketplace/hooks/__tests__/useInstallMarketplaceApp.test.tsx
@@ -18,8 +18,8 @@ const JOB_ID = `install-application.workspace-id.${UNIVERSAL_IDENTIFIER}`;
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts b/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts
index cfdb5d5eaa1..14f01bcea30 100644
--- a/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useInstallMarketplaceApp.ts
@@ -8,7 +8,7 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
FindInstallApplicationJobStatusDocument,
FindOneApplicationByUniversalIdentifierDocument,
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts b/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts
index 77d673ce872..17ad5fb79ec 100644
--- a/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useUpgradeApplication.ts
@@ -2,7 +2,7 @@ import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { UpgradeApplicationDocument } from '~/generated-metadata/graphql';
export const useUpgradeApplication = () => {
diff --git a/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx b/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx
index 0de32e536f6..635bdffa0a9 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx
@@ -2,8 +2,8 @@ import { type MouseEvent } from 'react';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { getAvatarShape } from '@/object-metadata/utils/getAvatarShape';
+import { MenuItemSuggestion } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
-import { MenuItemSuggestion } from 'twenty-ui/primitives/navigation';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
type MentionMenuListItemProps = {
diff --git a/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx b/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx
index 501c1894317..e041a30e4f8 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx
@@ -1,12 +1,10 @@
import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';
-import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import {
- AvatarOrIcon,
- LinkChip,
- Chip,
-} from 'twenty-ui/primitives/data-display';
+import { Chip } from 'twenty-ui/primitives/data-display';
+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
type MentionRecordChipProps = {
recordId: string;
diff --git a/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx b/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
index b9ff28a2103..ed090371772 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
@@ -1,6 +1,6 @@
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { forwardRef } from 'react';
-import { AvatarOrIcon } from 'twenty-ui/primitives/data-display';
-import { MenuItemSuggestion } from 'twenty-ui/primitives/navigation';
+import { MenuItemSuggestion } from 'twenty-ui/components';
import type { MentionSearchResult } from '@/mention/types/MentionSearchResult';
import type { MentionSuggestionMenuProps } from '@/mention/types/MentionSuggestionMenuProps';
diff --git a/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts b/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
index da65ad89666..146f9b4650d 100644
--- a/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
+++ b/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
@@ -8,7 +8,7 @@ import {
WorkspaceMigrationV2ExceptionCode,
} from 'twenty-shared/metadata';
import { CrudOperationType } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useMetadataErrorHandler = () => {
const { enqueueToast } = useToast();
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
index 79c0fc95981..20c023cb512 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
@@ -3,11 +3,9 @@ import { NavigationMenuItemIconWithOverlay } from '@/navigation-menu-item/displa
import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import {
- Avatar,
- getIconTileColorShades,
-} from 'twenty-ui/primitives/data-display';
+import { getIconTileColorShades } from 'twenty-ui/components';
import { IconLink, IconPerspective, IconWorld, useIcons } from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
FeatureFlagKey,
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx
index 1e8398b0161..eb48c401f3e 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import type React from 'react';
-import { IconChevronRight } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconChevronRight } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
// Rotating a wrapper around the button keeps the icon component identity
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
index 08871ff47d3..5bd1028e1af 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
@@ -1,26 +1,26 @@
import { t } from '@lingui/core/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
-import { IconHeartOff } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconHeartOff } from 'twenty-ui/icon';
import {
FeatureFlagKey,
type NavigationMenuItem,
} from '~/generated-metadata/graphql';
import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';
-import { NavigationMenuItemBackButton } from '@/navigation-menu-item/edit/components/NavigationMenuItemBackButton';
+import { useDeleteManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems';
import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';
import { NavigationMenuItemSortableItem } from '@/navigation-menu-item/display/dnd/components/NavigationMenuItemSortableItem';
-import { useDeleteManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems';
-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';
import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';
import { getObjectNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel';
+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';
+import { NavigationMenuItemBackButton } from '@/navigation-menu-item/edit/components/NavigationMenuItemBackButton';
+import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
-import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
type NavigationMenuItemFolderContentProps = {
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx
index d85cc85171c..07b04173348 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx
@@ -1,17 +1,17 @@
import { navigationMenuItemInsertionPreviewState } from '@/navigation-menu-item/common/states/navigationMenuItemInsertionPreviewState';
-import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';
-import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
-import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';
import { NavigationMenuItemFolderChevron } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevron';
import { NavigationMenuItemFolderChevronButton } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton';
+import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';
import { NavigationMenuItemEntrance } from '@/navigation-menu-item/edit/components/NavigationMenuItemEntrance';
+import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';
+import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import React, { Fragment, useContext } from 'react';
import { createPortal } from 'react-dom';
import { isDefined } from 'twenty-shared/utils';
-import { IconHeartOff, IconPlus, useIcons } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconHeartOff, IconPlus, useIcons } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
@@ -41,8 +41,8 @@ import { NavigationMenuItemFolderSubItem } from '@/navigation-menu-item/display/
import { useNavigationMenuItemFolderOpenState } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState';
import { useIsNavigationMenuItemEditHighlighted } from '@/navigation-menu-item/display/hooks/useIsNavigationMenuItemEditHighlighted';
import type { NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';
-import { useFavoritesFolderEdit } from '@/navigation-menu-item/edit/folder/hooks/useFavoritesFolderEdit';
import { NavigationMenuItemAddDropdown } from '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown';
+import { useFavoritesFolderEdit } from '@/navigation-menu-item/edit/folder/hooks/useFavoritesFolderEdit';
import type { EditModeProps } from '@/object-metadata/components/EditModeProps';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx
index b9cd4d994e1..fa7fe80f00d 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx
@@ -2,8 +2,8 @@ import { NavigationMenuItemAddDropdown } from '@/navigation-menu-item/edit/compo
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useCallback, useContext, useMemo } from 'react';
-import { IconHeartOff, IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconHeartOff, IconPlus } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
index 54bee31265b..75a7b3ee06a 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
@@ -4,8 +4,8 @@ import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useNavigate } from 'react-router-dom';
import { NavigationMenuItemType } from 'twenty-shared/types';
-import { IconPlus, IconTool } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconPlus, IconTool } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemRowActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemRowActions.tsx
index 6aaeeac7fc5..93072c6fc0d 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemRowActions.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemRowActions.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode } from 'react';
-import { IconDotsVertical } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconDotsVertical } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledActions = styled.div`
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemEditController.test.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemEditController.test.tsx
index b5713d865f5..0bddfd8c971 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemEditController.test.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemEditController.test.tsx
@@ -39,8 +39,8 @@ jest.mock(
}),
}),
);
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: jest.fn() }),
}));
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions.tsx
index 0869f18a0b7..31b7ec4a261 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions.tsx
@@ -2,6 +2,7 @@ import { useQuery } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { TintedIconTile } from 'twenty-ui/components';
import {
IconBox,
IconFolder,
@@ -10,7 +11,7 @@ import {
IconTable,
useIcons,
} from 'twenty-ui/icon';
-import { Avatar, TintedIconTile } from 'twenty-ui/primitives/data-display';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import {
FindAllStandalonePageLayoutsDocument,
type NavigationMenuItem,
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts
index cdfd726e344..b5a8220e7e6 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts
@@ -13,7 +13,7 @@ import { buildCreateNavigationMenuItemInput } from '@/navigation-menu-item/commo
import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';
import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export type NewNavigationMenuItemInput = {
type: NavigationMenuItemType;
diff --git a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
index 953f71b9218..bf48e1242e4 100644
--- a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
@@ -7,7 +7,7 @@ import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingC
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { useLocation } from 'react-router-dom';
-import { NavigationBar } from 'twenty-ui/primitives/navigation';
+import { NavigationBar } from 'twenty-ui/components';
import { isAiChatPath } from '~/utils/isAiChatPath';
// The bar floats over the page, so the container has to let taps through to
diff --git a/packages/twenty-front/src/modules/object-core/components/cells/CoreObjectNameCell.tsx b/packages/twenty-front/src/modules/object-core/components/cells/CoreObjectNameCell.tsx
index db984c104ea..721343432a1 100644
--- a/packages/twenty-front/src/modules/object-core/components/cells/CoreObjectNameCell.tsx
+++ b/packages/twenty-front/src/modules/object-core/components/cells/CoreObjectNameCell.tsx
@@ -1,9 +1,9 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { TintedIconTile } from 'twenty-ui/primitives/data-display';
+import { TintedIconTile } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { type IconComponent } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { type ThemeColor } from 'twenty-ui/theme';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowFiltersBuilder.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowFiltersBuilder.tsx
index bfcbcea49a9..1d1103772ca 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowFiltersBuilder.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowFiltersBuilder.tsx
@@ -1,8 +1,8 @@
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type StepFilter } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { InputLabel } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { CoreWorkflowFilterAddRuleButton } from '@/object-core/workflows/components/CoreWorkflowFilterAddRuleButton';
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts
index c2b8cb650e8..270fbda46ad 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts
@@ -11,7 +11,7 @@ import { sortedFieldByTableFamilyState } from '@/ui/layout/table/states/sortedFi
import { type TableSortValue } from '@/ui/layout/table/types/TableSortValue';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
CoreWorkflowOrderByDirection,
CoreWorkflowOrderByField,
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts
index 1d5dc054d9c..b4a5374b655 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts
@@ -1,8 +1,8 @@
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useCallback, useState } from 'react';
-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { PermissionFlagType } from 'twenty-shared/constants';
+import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { CREATE_CORE_WORKFLOW } from '@/object-core/workflows/graphql/mutations/createCoreWorkflow';
@@ -12,7 +12,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type CreateCoreWorkflowMutation,
type CreateCoreWorkflowMutationVariables,
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useDeleteSelectedCoreWorkflows.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useDeleteSelectedCoreWorkflows.ts
index cb1f8973dc8..02892964e97 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useDeleteSelectedCoreWorkflows.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useDeleteSelectedCoreWorkflows.ts
@@ -17,7 +17,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type DeleteCoreWorkflowsMutation,
type DeleteCoreWorkflowsMutationVariables,
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useRenameCoreWorkflow.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useRenameCoreWorkflow.ts
index e008561e91d..f593b9f077f 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useRenameCoreWorkflow.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useRenameCoreWorkflow.ts
@@ -1,6 +1,6 @@
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { invalidateCoreWorkflowQueries } from '@/object-core/workflows/utils/invalidateCoreWorkflowQueries';
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useUpdateCoreWorkflowVisibility.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useUpdateCoreWorkflowVisibility.ts
index ddeb2f06c9d..7c1671bead7 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useUpdateCoreWorkflowVisibility.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useUpdateCoreWorkflowVisibility.ts
@@ -1,6 +1,6 @@
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import {
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useValidateCoreWorkflowVersion.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useValidateCoreWorkflowVersion.ts
index f2a0d99ed6d..01d0c8b18b1 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useValidateCoreWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useValidateCoreWorkflowVersion.ts
@@ -1,7 +1,7 @@
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { ValidateCoreWorkflowVersionDocument } from '~/generated/graphql';
diff --git a/packages/twenty-front/src/modules/object-core/workflows/versions/hooks/useRestoreCoreWorkflowVersionAsDraft.ts b/packages/twenty-front/src/modules/object-core/workflows/versions/hooks/useRestoreCoreWorkflowVersionAsDraft.ts
index e376f6421b3..0ff381a6345 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/versions/hooks/useRestoreCoreWorkflowVersionAsDraft.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/versions/hooks/useRestoreCoreWorkflowVersionAsDraft.ts
@@ -6,7 +6,7 @@ import { isDefined } from 'twenty-shared/utils';
import { useCoreWorkflowVersions } from '@/object-core/workflows/versions/hooks/useCoreWorkflowVersions';
import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDraftFromWorkflowVersion';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { CoreWorkflowVersionStatus } from '~/generated/graphql';
import { useNavigateApp } from '~/hooks/useNavigateApp';
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
index 3b7decc485d..285f574ca4d 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
@@ -12,7 +12,7 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useCreateOneFieldMetadataItem = () => {
const [createOneFieldMetadataItemMutation] = useMutation(
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneIndexMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneIndexMetadataItem.ts
index bf553dcb448..8839b9f8ace 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneIndexMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneIndexMetadataItem.ts
@@ -9,7 +9,7 @@ import { useUpdateMetadataStoreDraft } from '@/metadata-store/hooks/useUpdateMet
import { type FlatIndexMetadataItem } from '@/metadata-store/types/FlatIndexMetadataItem';
import { type IndexFieldMetadataItem } from '@/object-metadata/types/IndexFieldMetadataItem';
import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type CreateIndexInput,
CreateOneIndexMetadataItemDocument,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts
index e1f0ea9a78e..125a928fc89 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts
@@ -19,7 +19,7 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useCreateOneObjectMetadataItem = () => {
const [createOneObjectMetadataItemMutation] = useMutation(
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts
index 3e79717d722..8103a235a5d 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts
@@ -13,7 +13,7 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSe
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useDeleteOneFieldMetadataItem = () => {
const [deleteOneFieldMetadataItemMutation] = useMutation(
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneIndexMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneIndexMetadataItem.ts
index 028412bfe26..bf49dd52b3b 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneIndexMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneIndexMetadataItem.ts
@@ -6,7 +6,7 @@ import { CrudOperationType } from 'twenty-shared/types';
import { useMetadataErrorHandler } from '@/metadata-error-handler/hooks/useMetadataErrorHandler';
import { useUpdateMetadataStoreDraft } from '@/metadata-store/hooks/useUpdateMetadataStoreDraft';
import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { DeleteOneIndexMetadataItemDocument } from '~/generated-metadata/graphql';
export const useDeleteOneIndexMetadataItem = () => {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneObjectMetadataItem.ts
index 0e6bdacd23c..165a9456e75 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneObjectMetadataItem.ts
@@ -9,7 +9,7 @@ import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequ
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useDeleteOneObjectMetadataItem = () => {
const [deleteOneObjectMetadataItemMutation] = useMutation(
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneFieldMetadataItem.ts
index 76d4467b8c8..9584fad51f7 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneFieldMetadataItem.ts
@@ -14,7 +14,7 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { v4 as uuidv4 } from 'uuid';
export const useUpdateOneFieldMetadataItem = () => {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts
index 4aaafa843fa..3b49b3c106f 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts
@@ -13,7 +13,7 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
// TODO: Slice the Apollo store synchronously in the update function instead of subscribing, so we can use update after read in the same function call
export const useUpdateOneObjectMetadataItem = () => {
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
index af0e9ca6e6e..ff9b42d4878 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
@@ -1,6 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';
import { useApplyAdvancedFilterCompositeSubField } from '@/object-record/advanced-filter/hooks/useApplyAdvancedFilterCompositeSubField';
@@ -13,6 +10,7 @@ import { areCompositeTypeSubFieldsFilterable } from '@/object-record/record-filt
import { isCompositeTypeNonFilterableByAnySubField } from '@/object-record/record-filter/utils/isCompositeTypeNonFilterableByAnySubField';
import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';
import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -26,7 +24,9 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomC
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
type AdvancedFilterCompositeSubFieldSelectMenuProps = {
recordFilterId: string;
diff --git a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
index baeb6073e77..88562f4674c 100644
--- a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
@@ -1,20 +1,17 @@
-import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';
import { useRecordChipData } from '@/object-record/hooks/useRecordChipData';
import { useResolveOpenRecordIn } from '@/object-record/record-index/hooks/useResolveOpenRecordIn';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { CoreObjectNameSingular, OpenRecordIn } from 'twenty-shared/types';
-import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
+import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
import { t } from '@lingui/core/macro';
import { type MouseEvent } from 'react';
+import { CoreObjectNameSingular, OpenRecordIn } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import {
- AvatarOrIcon,
- LinkChip,
- Chip,
- type ChipSize,
-} from 'twenty-ui/primitives/data-display';
-import { type TriggerEventType } from 'twenty-ui/utilities';
+import { Chip, type ChipSize } from 'twenty-ui/primitives/data-display';
+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
export type RecordChipProps = {
objectNameSingular: string;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useBatchCreateManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useBatchCreateManyRecords.ts
index 4ec3d46861f..61f9a80c9e1 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useBatchCreateManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useBatchCreateManyRecords.ts
@@ -10,7 +10,7 @@ import { useRefetchAggregateQueries } from '@/object-record/hooks/useRefetchAggr
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useBatchCreateManyRecords = <
CreatedObjectRecord extends ObjectRecord = ObjectRecord,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useHandleFindManyRecordsError.ts b/packages/twenty-front/src/modules/object-record/hooks/useHandleFindManyRecordsError.ts
index edc97e2dd8c..8233a119558 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useHandleFindManyRecordsError.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useHandleFindManyRecordsError.ts
@@ -4,7 +4,7 @@ import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsF
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { useCallback } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { logError } from '~/utils/logError';
export const useHandleFindManyRecordsError = ({
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
index b3ff440fe53..0aca08cb7d1 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
@@ -1,8 +1,8 @@
import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';
import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';
+import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
index d59d642d91e..0993f019eda 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
@@ -1,23 +1,15 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { Tag } from 'twenty-ui/primitives/data-display';
-import { useEffect, useMemo, useState } from 'react';
-import { Key } from 'ts-key-enum';
-
import { fieldMetadataItemByIdSelector } from '@/object-metadata/states/fieldMetadataItemByIdSelector';
import { type FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
-import { useOptionsForSelect } from '@/object-record/object-filter-dropdown/hooks/useOptionsForSelect';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
-
-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
-
import { useApplyObjectFilterDropdownFilterValue } from '@/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownFilterValue';
+import { useOptionsForSelect } from '@/object-record/object-filter-dropdown/hooks/useOptionsForSelect';
import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';
import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState';
import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
+import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
@@ -26,8 +18,13 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
+import { useEffect, useMemo, useState } from 'react';
+import { Key } from 'ts-key-enum';
import { MAX_OPTIONS_TO_DISPLAY } from 'twenty-shared/constants';
import { isDefined, parseJson } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { Tag } from 'twenty-ui/primitives/data-display';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { z } from 'zod';
export const EMPTY_FILTER_VALUE = '';
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
index e3207aa34bd..ca2470eb87d 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
@@ -1,7 +1,6 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -10,9 +9,9 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';
import { t } from '@lingui/core/macro';
-import { Pill } from 'twenty-ui/primitives/data-display';
import {
IconCalendarEvent,
IconCalendarMonth,
@@ -20,6 +19,7 @@ import {
IconChevronLeft,
IconTimelineEvent,
} from 'twenty-ui/icon';
+import { Pill } from 'twenty-ui/primitives/data-display';
import { ListItem } from 'twenty-ui/primitives/navigation';
import { ViewCalendarLayout } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
index 4f9ed55b050..245a81ad688 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
@@ -3,8 +3,8 @@ import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { ObjectOptionsDropdownMenuViewName } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
-import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';
+import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -15,18 +15,18 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { viewsFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/viewsFromObjectMetadataItemFamilySelector';
import { ViewKey } from '@/views/types/ViewKey';
import {
- getViewTypeLabel,
ViewType,
+ getViewTypeLabel,
viewTypeIconMapping,
} from '@/views/types/ViewType';
import { useDestroyViewFromCurrentState } from '@/views/view-picker/hooks/useDestroyViewFromCurrentState';
import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
import {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
index 574c2e1b87d..18e6036f797 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
@@ -1,21 +1,20 @@
-import { useLocation } from 'react-router-dom';
-
import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObjectNamePluralFromSingular';
-
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { ViewFieldsHiddenDropdownSection } from '@/views/components/ViewFieldsHiddenDropdownSection';
import { useLingui } from '@lingui/react/macro';
+import { useLocation } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';
-import { ListItem, UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { ListItem } from 'twenty-ui/primitives/navigation';
export const ObjectOptionsDropdownHiddenFieldsContent = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
index 7b375e6ae76..86d12f6a186 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
@@ -1,7 +1,4 @@
-import { useEffect } from 'react';
-
import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObjectNamePluralFromSingular';
-
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { RecordGroupsVisibilityDropdownSection } from '@/object-record/record-group/components/RecordGroupsVisibilityDropdownSection';
import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/useRecordGroupVisibility';
@@ -13,18 +10,20 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenu
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
+import { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
import { VIEW_GROUP_VISIBLE_OPTIONS_MAX } from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';
-import { ListItem, UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { ListItem } from 'twenty-ui/primitives/navigation';
export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
index 67703a8eb9b..31e7157cf19 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
@@ -1,9 +1,8 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useSetViewTypeFromLayoutOptionsMenu } from '@/object-record/object-options-dropdown/hooks/useSetViewTypeFromLayoutOptionsMenu';
import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -28,6 +27,7 @@ import { useLingui } from '@lingui/react/macro';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { SettingsRow } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import {
IconBaselineDensitySmall,
IconCalendar,
@@ -36,7 +36,7 @@ import {
IconLayoutList,
IconTable,
} from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { ViewCalendarLayout } from '~/generated-metadata/graphql';
export const ObjectOptionsDropdownLayoutContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx
index 70feb3824e2..a370c506a67 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx
@@ -1,3 +1,4 @@
+import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useUpdateObjectViewOptions } from '@/object-record/object-options-dropdown/hooks/useUpdateObjectViewOptions';
import { IconPicker } from '@/ui/input/components/IconPicker';
import { TextInput } from '@/ui/input/components/TextInput';
@@ -7,7 +8,6 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomC
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { type View } from '@/views/types/View';
-import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useUpdateViewFromCurrentState } from '@/views/view-picker/hooks/useUpdateViewFromCurrentState';
import { viewPickerIsDirtyComponentState } from '@/views/view-picker/states/viewPickerIsDirtyComponentState';
import { viewPickerIsPersistingComponentState } from '@/views/view-picker/states/viewPickerIsPersistingComponentState';
@@ -15,8 +15,8 @@ import { viewPickerSelectedIconComponentState } from '@/views/view-picker/states
import { styled } from '@linaria/react';
import { useContext, useEffect, useRef, useState } from 'react';
import { Key } from 'ts-key-enum';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
index c9db1010f64..2ad40d9c9df 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
@@ -1,8 +1,4 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { useEffect } from 'react';
-
import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObjectNamePluralFromSingular';
-
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useSearchRecordGroupField } from '@/object-record/object-options-dropdown/hooks/useSearchRecordGroupField';
@@ -10,22 +6,25 @@ import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-gr
import { isRecordGroupingOptionalForViewType } from '@/object-record/record-group/utils/isRecordGroupingOptionalForViewType';
import { useHandleRecordGroupField } from '@/object-record/record-index/hooks/useHandleRecordGroupField';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
+import { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/icon';
-import { ListItem, UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { FieldMetadataType } from '~/generated-metadata/graphql';
export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
index 7839e0f6b9f..5cc1f9deeb8 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
@@ -1,12 +1,10 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { useEffect } from 'react';
-
import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -18,6 +16,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
+import { useEffect } from 'react';
import { isDefined } from 'twenty-shared/utils';
import {
IconChevronLeft,
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
index 47669c620bc..02b2fc5c7ac 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
@@ -2,13 +2,13 @@ import { ListItem } from 'twenty-ui/primitives/navigation';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { availableFieldMetadataItemsForSortFamilySelector } from '@/object-metadata/states/availableFieldMetadataItemsForSortFamilySelector';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { getObjectSortDropdownId } from '@/object-record/object-sort-dropdown/utils/getObjectSortDropdownId';
import { useCloseSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useCloseSortDropdown';
import { useResetRecordSortDropdownSearchInput } from '@/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput';
import { useResetSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useResetSortDropdown';
import { isRecordSortDirectionDropdownMenuUnfoldedComponentState } from '@/object-record/object-sort-dropdown/states/isRecordSortDirectionDropdownMenuUnfoldedComponentState';
import { objectSortDropdownSearchInputComponentState } from '@/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState';
import { selectedRecordSortDirectionComponentState } from '@/object-record/object-sort-dropdown/states/selectedRecordSortDirectionComponentState';
+import { getObjectSortDropdownId } from '@/object-record/object-sort-dropdown/utils/getObjectSortDropdownId';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useUpsertRecordSort } from '@/object-record/record-sort/hooks/useUpsertRecordSort';
@@ -30,8 +30,8 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { Trans, useLingui } from '@lingui/react/macro';
import { findByProperty } from 'twenty-shared/utils';
import { IconX, useIcons } from 'twenty-ui/icon';
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
index eda9d634efb..78a8cdbb889 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
@@ -1,20 +1,20 @@
import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/constants/CommandMenuDropdownClickOutsideId';
import { COMMAND_MENU_CLICK_OUTSIDE_ID } from '@/command-menu/constants/CommandMenuClickOutsideId';
import { RECORD_BOARD_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-board/constants/RecordBoardClickOutsideListenerId';
-import { SIDE_PANEL_CLICK_OUTSIDE_ID } from '@/side-panel/constants/SidePanelClickOutsideId';
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { useActiveRecordBoardCard } from '@/object-record/record-board/hooks/useActiveRecordBoardCard';
import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/useFocusedRecordBoardCard';
import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';
import { RECORD_BOARD_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardClickOutsideId';
import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
+import { SIDE_PANEL_CLICK_OUTSIDE_ID } from '@/side-panel/constants/SidePanelClickOutsideId';
import { DIALOG_BACKDROP_CLICK_OUTSIDE_ID } from '@/ui/layout/dialog/constants/DialogBackdropClickOutsideId';
import { PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID } from '@/ui/layout/page/constants/PageActionContainerClickOutsideId';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@/ui/navigation/link/constants/LinkChipClickOutsideId';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useContext } from 'react';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/primitives/data-display';
export const RecordBoardClickOutsideEffect = () => {
const { recordBoardId } = useContext(RecordBoardContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
index 6d279ecf17e..5a5c32a0760 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
@@ -12,19 +12,20 @@ import { RecordBoardCardCellEditModePortal } from '@/object-record/record-board/
import { RecordBoardCardCellHoveredPortal } from '@/object-record/record-board/record-board-card/anchored-portal/components/RecordBoardCardCellHoveredPortal';
import { RecordBoardCardBody } from '@/object-record/record-board/record-board-card/components/RecordBoardCardBody';
import { RecordBoardCardHeader } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHeader';
-import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
import { RECORD_BOARD_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardClickOutsideId';
import { RECORD_BOARD_CARD_INPUT_ID_PREFIX } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardInputIdPrefix';
import { RecordBoardCardComponentInstanceContext } from '@/object-record/record-board/record-board-card/states/contexts/RecordBoardCardComponentInstanceContext';
import { recordBoardCardIsExpandedComponentState } from '@/object-record/record-board/record-board-card/states/recordBoardCardIsExpandedComponentState';
import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';
import { RecordCard } from '@/object-record/record-card/components/RecordCard';
+import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';
import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
+import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
@@ -34,10 +35,9 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSe
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { styled } from '@linaria/react';
import { useContext } from 'react';
+import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseInOut } from 'twenty-ui/primitives/layout';
import { useDebouncedCallback } from 'use-debounce';
-import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';
const StyledCardContainer = styled.div<{ isPrimaryMultiDrag?: boolean }>`
position: relative;
@@ -193,12 +193,12 @@ export const RecordBoardCard = () => {
isDragging={isDraggingThisCard}
>
<RecordBoardCardHeader />
- <AnimatedEaseInOut
- isOpen={recordBoardCardIsExpanded || !isCompactModeActive}
+ <AnimatedExpandableContainer
+ isExpanded={recordBoardCardIsExpanded || !isCompactModeActive}
initial={false}
>
<RecordBoardCardBody />
- </AnimatedEaseInOut>
+ </AnimatedExpandableContainer>
</RecordCard>
</StyledCardContainer>
{!isDragOverlay && (
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
index 11dbde5dc94..97fb434bcb6 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
@@ -1,8 +1,8 @@
-import { t } from '@lingui/core/macro';
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';
import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';
+import { t } from '@lingui/core/macro';
import { RecordChip } from '@/object-record/components/RecordChip';
import { useActiveRecordBoardCard } from '@/object-record/record-board/hooks/useActiveRecordBoardCard';
@@ -17,14 +17,14 @@ import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/us
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
-import { OpenRecordIn } from 'twenty-shared/types';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { OpenRecordIn } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import { IconEye, IconEyeOff } from 'twenty-ui/icon';
import { Checkbox } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile, useIsTouchDevice } from 'twenty-ui/utilities';
const StyledCompactIconContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
index 8402781d968..7ab5a0d8f22 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
@@ -3,36 +3,36 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
-import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
-import { RecordBoardColumnDropdownMenu } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu';
-import { DragDropItemSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle';
import { RECORD_BOARD_COLUMN_WIDTH } from '@/object-record/record-board/constants/RecordBoardColumnWidth';
import { RECORD_BOARD_COLUMN_WIDTH_CSS_VARIABLE_NAME } from '@/object-record/record-board/constants/RecordBoardColumnWidthCssVariableName';
+import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
+import { RecordBoardColumnDropdownMenu } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu';
import { RecordBoardColumnResizeHandler } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnResizeHandler';
import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
+import { isRecordBoardCellsNonEditableComponentState } from '@/object-record/record-board/states/isRecordBoardCellsNonEditableComponentState';
+import { isRecordBoardViewSettingsReadOnlyComponentState } from '@/object-record/record-board/states/isRecordBoardViewSettingsReadOnlyComponentState';
import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';
import { RecordGroupAggregateDropdown } from '@/object-record/record-group/components/RecordGroupAggregateDropdown';
import { RecordGroupChip } from '@/object-record/record-group/components/RecordGroupChip';
-import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';
import { recordIndexAggregateDisplayLabelComponentState } from '@/object-record/record-index/states/recordIndexAggregateDisplayLabelComponentState';
import { recordIndexAggregateDisplayValueForGroupValueComponentFamilyState } from '@/object-record/record-index/states/recordIndexAggregateDisplayValueForGroupValueComponentFamilyState';
-import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
import { useIsRecordTableWidgetAggregateNonInteractive } from '@/object-record/record-table-widget/hooks/useIsRecordTableWidgetAggregateNonInteractive';
-import { isRecordBoardCellsNonEditableComponentState } from '@/object-record/record-board/states/isRecordBoardCellsNonEditableComponentState';
-import { isRecordBoardViewSettingsReadOnlyComponentState } from '@/object-record/record-board/states/isRecordBoardViewSettingsReadOnlyComponentState';
+import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';
import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
+import { DragDropItemSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle';
+import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isDefined } from 'twenty-shared/utils';
-import { IconDotsVertical, IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconDotsVertical, IconPlus } from 'twenty-ui/icon';
const StyledHeader = styled.div<{ isReadOnly: boolean }>`
align-items: center;
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
index eece0b1735c..cf0b3ad4e18 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
@@ -3,21 +3,21 @@ import { styled } from '@linaria/react';
import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/constants/CommandMenuDropdownClickOutsideId';
import { COMMAND_MENU_CLICK_OUTSIDE_ID } from '@/command-menu/constants/CommandMenuClickOutsideId';
-import { RecordCalendarGrid } from '@/object-record/record-calendar/grid/components/RecordCalendarGrid';
+import { RecordCalendarEscapeHotkeyEffect } from '@/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect';
import { RecordCalendarTopBar } from '@/object-record/record-calendar/components/RecordCalendarTopBar';
import { RECORD_CALENDAR_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-calendar/constants/RecordCalendarClickOutsideListenerId';
-import { RecordCalendarEscapeHotkeyEffect } from '@/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect';
+import { RecordCalendarGrid } from '@/object-record/record-calendar/grid/components/RecordCalendarGrid';
import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';
-import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
import { useRecordCalendarSelection } from '@/object-record/record-calendar/states/selectors/useRecordCalendarSelection';
+import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';
import { DIALOG_BACKDROP_CLICK_OUTSIDE_ID } from '@/ui/layout/dialog/constants/DialogBackdropClickOutsideId';
import { PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID } from '@/ui/layout/page/constants/PageActionContainerClickOutsideId';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@/ui/navigation/link/constants/LinkChipClickOutsideId';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useEffect } from 'react';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainerContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts
index 3a0eff6052e..b45e0349c38 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts
@@ -21,7 +21,7 @@ import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resol
import { useAtomComponentFamilySelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorCallbackState';
import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { logError } from '~/utils/logError';
type DragStartPayload = DragDropProviderDragStartEvent<DragDropItemData>;
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
index dad42870305..1941400fb4c 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
@@ -5,13 +5,13 @@ import { RecordCalendarCardCellEditModePortal } from '@/object-record/record-cal
import { RecordCalendarCardCellHoveredPortal } from '@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal';
import { RecordCalendarCardBody } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody';
import { RecordCalendarCardHeader } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader';
-import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';
import { RecordCalendarCardComponentInstanceContext } from '@/object-record/record-calendar/record-calendar-card/states/contexts/RecordCalendarCardComponentInstanceContext';
-import { getRecordCalendarCardInstanceIdPrefix } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardInstanceIdPrefix';
import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
+import { getRecordCalendarCardInstanceIdPrefix } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardInstanceIdPrefix';
import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
import { RecordCard } from '@/object-record/record-card/components/RecordCard';
+import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';
import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';
import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragMultipleComponentFamilyState';
import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';
@@ -25,9 +25,9 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hoo
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import { styled } from '@linaria/react';
-import { AnimatedEaseInOut } from 'twenty-ui/primitives/layout';
+import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
display: flex;
@@ -159,8 +159,8 @@ export const RecordCalendarCard = ({
isDragging={isDraggingThisCard}
>
<RecordCalendarCardHeader recordId={recordId} />
- <AnimatedEaseInOut
- isOpen={!isCompactModeActive}
+ <AnimatedExpandableContainer
+ isExpanded={!isCompactModeActive}
initial={false}
>
<RecordCalendarCardBody
@@ -168,7 +168,7 @@ export const RecordCalendarCard = ({
calendarDay={calendarDay}
isRecordReadOnly={false}
/>
- </AnimatedEaseInOut>
+ </AnimatedExpandableContainer>
</RecordCard>
</StyledCardContainer>
</StyledRecordCardContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
index 85bb7a83e5b..6bf20ff7a34 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
@@ -78,13 +78,13 @@ jest.mock('@/object-record/record-card/components/RecordCard', () => ({
),
}));
jest.mock('twenty-ui/primitives/layout', () => ({
- AnimatedEaseInOut: ({
+ AnimatedExpandableContainer: ({
children,
- isOpen,
+ isExpanded,
}: {
children: React.ReactNode;
- isOpen: boolean;
- }) => (isOpen ? children : null),
+ isExpanded: boolean;
+ }) => (isExpanded ? children : null),
}));
describe('RecordCalendarCard', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
index bb7f7fd9e29..afa7007e9be 100644
--- a/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-drag/components/RecordDragMultiDragCounterChip.tsx
@@ -1,7 +1,7 @@
import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
-import { NotificationCounter } from 'twenty-ui/primitives/data-display';
+import { NotificationCounter } from 'twenty-ui/components';
const StyledNotificationCounterContainer = styled.div`
position: absolute;
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
index 8775eff2d52..edc1d794dd4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
@@ -1,17 +1,17 @@
import { ToastOnQueryErrorEffect } from '@/apollo/components/ToastOnQueryErrorEffect';
-import { useOpenMergeRecordsPageInSidePanel } from '@/side-panel/hooks/useOpenMergeRecordsPageInSidePanel';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { RecordChip } from '@/object-record/components/RecordChip';
import { useFindDuplicateRecords } from '@/object-record/hooks/useFindDuplicateRecords';
import { RecordDetailRecordsListContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListContainer';
import { RecordDetailRecordsListItemContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListItemContainer';
import { RecordDetailSectionContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer';
+import { useOpenMergeRecordsPageInSidePanel } from '@/side-panel/hooks/useOpenMergeRecordsPageInSidePanel';
import { t } from '@lingui/core/macro';
import { isNonEmptyArray } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { IconArrowMerge } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconArrowMerge } from 'twenty-ui/icon';
export const RecordDetailDuplicatesSection = ({
objectRecordId,
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx
index d6d0ef6896c..13345cf16eb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx
@@ -21,8 +21,8 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconForbid, IconPencil } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconForbid, IconPencil } from 'twenty-ui/icon';
type RecordDetailMorphRelationSectionDropdownManyToOneProps = {
dropdownTriggerClickableComponent?: ReactNode;
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
index e0ab51d29f4..59577924bcb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
@@ -23,8 +23,8 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { FieldMetadataType } from 'twenty-shared/types';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconPlus } from 'twenty-ui/icon';
type RecordDetailMorphRelationSectionDropdownOneToManyProps = {
dropdownTriggerClickableComponent?: ReactNode;
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
index 7090dc77817..eca7a57dc0b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
@@ -1,11 +1,5 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { styled } from '@linaria/react';
-import { motion } from 'framer-motion';
-import { useCallback, useContext } from 'react';
-
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
import { RecordChip } from '@/object-record/components/RecordChip';
import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
@@ -20,22 +14,27 @@ import { singleRecordPickerSelectedIdComponentState } from '@/object-record/reco
import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { getForeignKeyNameFromRelationFieldName } from '@/object-record/utils/getForeignKeyNameFromRelationFieldName';
+import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
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 { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
-import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
-import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
+import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Trans } from '@lingui/react/macro';
+import { motion } from 'framer-motion';
+import { useCallback, useContext } from 'react';
import { createPortal } from 'react-dom';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
import {
- computeMorphRelationGqlFieldName,
CustomError,
+ computeMorphRelationGqlFieldName,
} from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import {
IconChevronDown,
IconDotsVertical,
@@ -43,8 +42,8 @@ import {
IconUnlink,
type IconComponent,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { AnimatedEaseInOut } from 'twenty-ui/primitives/layout';
+import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
const StyledClickableZone = styled.div`
@@ -264,7 +263,10 @@ export const RecordDetailRelationRecordsListItem = ({
/>
)}
</RecordDetailRecordsListItemContainer>
- <AnimatedEaseInOut isOpen={isExpanded}>
+ <AnimatedExpandableContainer
+ containAnimation={false}
+ isExpanded={isExpanded}
+ >
<RecordFieldList
instanceId={`${scopeInstanceId}-relation-${relationRecord.id}`}
objectNameSingular={relationObjectMetadataNameSingular}
@@ -274,7 +276,7 @@ export const RecordDetailRelationRecordsListItem = ({
excludeCreatedAtAndUpdatedAt={true}
excludeFieldMetadataIds={[relationFieldMetadataId]}
/>
- </AnimatedEaseInOut>
+ </AnimatedExpandableContainer>
{createPortal(
<ConfirmationDialog
dialogId={getDeleteRelationModalId(relationRecord.id)}
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
index c24bb0be0bf..a135995e4f7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
@@ -30,8 +30,8 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconPlus } from 'twenty-ui/icon';
type RecordDetailRelationSectionDropdownToManyProps = {
dropdownTriggerClickableComponent?: ReactNode;
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx
index 02211fc380e..202d282d9f4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx
@@ -2,7 +2,6 @@ import { t } from '@lingui/core/macro';
import { type ReactNode, useCallback, useContext } from 'react';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular, FieldMetadataType } from 'twenty-shared/types';
import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
@@ -18,17 +17,18 @@ import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { dropdownPlacementComponentState } from '@/ui/layout/dropdown/states/dropdownPlacementComponentState';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
+import { CoreObjectNameSingular, FieldMetadataType } from 'twenty-shared/types';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { getFieldMetadataItemById } from '@/object-metadata/utils/getFieldMetadataItemById';
import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconForbid, IconPencil } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconForbid, IconPencil } from 'twenty-ui/icon';
type RecordDetailRelationSectionDropdownToOneProps = {
dropdownTriggerClickableComponent?: ReactNode;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx
index bfbed807bbc..97482f8679a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconCopy } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconCopy } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
index 4684c853b3e..9c20095b931 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
@@ -1,8 +1,8 @@
import { createContext, type MouseEvent } from 'react';
-import { type TriggerEventType } from 'twenty-ui/utilities';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
export type RecordUpdateHookParams = {
variables: {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx
index f509de7c0a3..3b37f186b4f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiRecordPicker.tsx
@@ -24,8 +24,8 @@ import { isNonEmptyArray } from '@sniptt/guards';
import { useContext, useId, useState } from 'react';
import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';
import { isDefined, isValidUuid } from 'twenty-shared/utils';
+import { useToast } from 'twenty-ui/components';
import { IconChevronDown } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Field } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRecordRichTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRecordRichTextFieldInput.tsx
index e7d4f71ba1b..1f2c6776c30 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRecordRichTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRecordRichTextFieldInput.tsx
@@ -2,7 +2,7 @@ import { useCreateBlockNote } from '@blocknote/react';
import { useLingui } from '@lingui/react/macro';
import { useEffect, useId, useState } from 'react';
import { isNonEmptyArray } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { Field } from 'twenty-ui/primitives/input';
import { BLOCK_SCHEMA } from '@/blocknote-editor/blocks/Schema';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/RelativeDateFilterRangeHint.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/RelativeDateFilterRangeHint.tsx
index 7a8415aa6d1..c9754f2b96a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/RelativeDateFilterRangeHint.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/RelativeDateFilterRangeHint.tsx
@@ -1,5 +1,5 @@
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { InputHint } from 'twenty-ui/primitives/input';
+import { InputHint } from '@/ui/input/components/internal/InputHint/InputHint';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Temporal } from 'temporal-polyfill';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useCreateJunctionRecordWithNestedTarget.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useCreateJunctionRecordWithNestedTarget.ts
index d6496a3ebc6..26c5c9458cc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useCreateJunctionRecordWithNestedTarget.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useCreateJunctionRecordWithNestedTarget.ts
@@ -18,7 +18,7 @@ import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { buildRecordLabelPayload } from '@/object-record/utils/buildRecordLabelPayload';
import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type UseCreateJunctionRecordWithNestedTargetArgs = {
sourceRecordId: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx
index 792140847b7..6262ea48981 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx
@@ -1,5 +1,5 @@
import { useAddressFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useAddressFieldDisplay';
-import { TextDisplay } from 'twenty-ui/primitives/data-display';
+import { TextDisplay } from '@/ui/field/display/components/TextDisplay/TextDisplay';
import { formatAddressDisplay } from '~/utils/formatAddressDisplay';
export const AddressFieldDisplay = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FullNameFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FullNameFieldDisplay.tsx
index 8b0254dc8c9..f1b81d58950 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FullNameFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FullNameFieldDisplay.tsx
@@ -1,7 +1,7 @@
import { isNonEmptyString } from '@sniptt/guards';
import { useFullNameFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useFullNameFieldDisplay';
-import { TextDisplay } from 'twenty-ui/primitives/data-display';
+import { TextDisplay } from '@/ui/field/display/components/TextDisplay/TextDisplay';
export const FullNameFieldDisplay = () => {
const { fieldValue } = useFullNameFieldDisplay();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/JsonFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/JsonFieldDisplay.tsx
index 9b510c01507..1ae8a0b85ba 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/JsonFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/JsonFieldDisplay.tsx
@@ -1,13 +1,10 @@
import { useJsonFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useJsonFieldDisplay';
-import { JsonDisplay } from 'twenty-ui/primitives/data-display';
+import { JsonDisplay } from '@/ui/field/display/components/JsonDisplay/JsonDisplay';
import { ExpandedFieldDisplay } from '@/ui/layout/expandable-list/components/ExpandedFieldDisplay';
import { t } from '@lingui/core/macro';
import { useRef, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import {
- isTwoFirstDepths,
- JsonTree,
-} from 'twenty-ui/primitives/json-visualizer';
+import { JsonTree } from 'twenty-ui/components';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
export const JsonFieldDisplay = () => {
@@ -46,7 +43,6 @@ export const JsonFieldDisplay = () => {
>
<JsonTree
value={fieldValue}
- shouldExpandNodeInitially={isTwoFirstDepths}
emptyArrayLabel={t`Empty Array`}
emptyObjectLabel={t`Empty Object`}
emptyStringLabel={t`[empty string]`}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/NumberFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/NumberFieldDisplay.tsx
index f12649260ef..a66ad0449db 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/NumberFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/NumberFieldDisplay.tsx
@@ -1,7 +1,7 @@
import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
import { useNumberFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useNumberFieldDisplay';
-import { NumberDisplay } from 'twenty-ui/primitives/data-display';
import { formatToShortNumber, isDefined } from 'twenty-shared/utils';
+import { Text } from 'twenty-ui/primitives/typography';
export const NumberFieldDisplay = () => {
const { fieldValue, fieldDefinition } = useNumberFieldDisplay();
@@ -10,7 +10,7 @@ export const NumberFieldDisplay = () => {
const { formatNumber } = useNumberFormat();
if (!isDefined(fieldValue)) {
- return <NumberDisplay value={null} />;
+ return <Text truncate />;
}
const numericValue = Number(fieldValue);
@@ -24,5 +24,5 @@ export const NumberFieldDisplay = () => {
formattedValue = formatNumber(numericValue, { decimals });
}
- return <NumberDisplay value={formattedValue} />;
+ return <Text truncate>{formattedValue}</Text>;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/SelectFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/SelectFieldDisplay.tsx
index 9d67ef4b858..28ba14f55fb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/SelectFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/SelectFieldDisplay.tsx
@@ -1,5 +1,5 @@
import { useSelectFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useSelectFieldDisplay';
-import { SelectDisplay } from 'twenty-ui/primitives/data-display';
+import { SelectDisplay } from '@/ui/field/display/components/SelectDisplay/SelectDisplay';
import { isDefined } from 'twenty-shared/utils';
export const SelectFieldDisplay = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/TextFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/TextFieldDisplay.tsx
index 98e18898a40..f34903f3367 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/TextFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/TextFieldDisplay.tsx
@@ -1,6 +1,6 @@
import { useTextFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useTextFieldDisplay';
import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';
-import { TextDisplay } from 'twenty-ui/primitives/data-display';
+import { TextDisplay } from '@/ui/field/display/components/TextDisplay/TextDisplay';
export const TextFieldDisplay = () => {
const { fieldValue, fieldDefinition, displayedMaxRows } =
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/UuidFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/UuidFieldDisplay.tsx
index 778d1b0378c..bd5920a2d74 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/UuidFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/UuidFieldDisplay.tsx
@@ -1,5 +1,5 @@
import { useUuidField } from '@/object-record/record-field/ui/meta-types/hooks/useUuidField';
-import { TextDisplay } from 'twenty-ui/primitives/data-display';
+import { TextDisplay } from '@/ui/field/display/components/TextDisplay/TextDisplay';
export const UuidFieldDisplay = () => {
const { fieldValue } = useUuidField();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useUploadFilesFieldFile.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useUploadFilesFieldFile.ts
index d927bbe99a7..514fa6d138d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useUploadFilesFieldFile.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useUploadFilesFieldFile.ts
@@ -1,6 +1,6 @@
import { useDirectFileUpload } from '@/file/hooks/useDirectFileUpload';
import { useLingui } from '@lingui/react/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { FileFolder } from '~/generated-metadata/graphql';
const DEFAULT_VALUE_BEFORE_SERVER_RESPONSE =
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx
index 1810d1cea54..de025bb6579 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx
@@ -18,7 +18,7 @@ import { useLingui } from '@lingui/react/macro';
import { useCallback, useContext, useMemo, useState } from 'react';
import { MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES } from 'twenty-shared/constants';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { FieldMetadataType } from '~/generated-metadata/graphql';
export const FilesFieldInput = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
index 9db65e2db6b..8a127c8cd58 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
@@ -1,10 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { t } from '@lingui/core/macro';
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { Key } from 'ts-key-enum';
-import { useDebounce } from 'use-debounce';
-
import {
MultiItemBaseInput,
type MultiItemBaseInputProps,
@@ -23,10 +16,16 @@ import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotke
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+import { Key } from 'ts-key-enum';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconCheck, IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { IconCheck, IconPlus } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
+import { useDebounce } from 'use-debounce';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { moveArrayItem } from '~/utils/array/moveArrayItem';
import { toSpliced } from '~/utils/array/toSpliced';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
index 7ddca937177..93e7dab915d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
@@ -1,24 +1,18 @@
-import { styled } from '@linaria/react';
-
import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
+import { useJsonField } from '@/object-record/record-field/ui/meta-types/hooks/useJsonField';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
-
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
+import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useRef, useState } from 'react';
import { Key } from 'ts-key-enum';
-import { IconPencil } from 'twenty-ui/icon';
+import { IconButton, JsonTree } from 'twenty-ui/components';
import { CodeEditor } from 'twenty-ui/components/code-editor';
-import { IconButton } from 'twenty-ui/components';
-import {
- JsonTree,
- isTwoFirstDepths,
-} from 'twenty-ui/primitives/json-visualizer';
+import { IconPencil } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
-import { useJsonField } from '@/object-record/record-field/ui/meta-types/hooks/useJsonField';
const CONTAINER_HEIGHT = 300;
@@ -199,7 +193,6 @@ export const RawJsonFieldInput = () => {
emptyStringLabel={t`[empty string]`}
arrowButtonCollapsedLabel={t`Expand`}
arrowButtonExpandedLabel={t`Collapse`}
- shouldExpandNodeInitially={isTwoFirstDepths}
onNodeValueClick={copyToClipboard}
/>
</StyledJsonTreeContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx
index cfd8bcd9c66..1d1f2022048 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx
@@ -1,20 +1,18 @@
import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';
-import { useOpenRichTextInSidePanel } from '@/side-panel/hooks/useOpenRichTextInSidePanel';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';
-import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
-
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-
+import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';
+import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { type FieldRichTextMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { useOpenRichTextInSidePanel } from '@/side-panel/hooks/useOpenRichTextInSidePanel';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Suspense, lazy, useContext, useRef } from 'react';
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
-import { IconLayoutSidebarLeftCollapse } from 'twenty-ui/icon';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
import { IconButton } from 'twenty-ui/components';
+import { IconLayoutSidebarLeftCollapse } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const ActivityRichTextEditor = lazy(() =>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useOpenFilesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useOpenFilesFieldInput.tsx
index 1aeac3234dc..9b2c6886ddf 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useOpenFilesFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useOpenFilesFieldInput.tsx
@@ -12,7 +12,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES } from 'twenty-shared/constants';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useOpenFilesFieldInput = () => {
const { openFileUpload } = useFileUpload();
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx
index 35404522c01..62990ba402c 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx
@@ -9,9 +9,8 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton, MenuItemDraggable } from 'twenty-ui/components';
import { IconEye, IconEyeOff } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { MenuItemDraggable } from 'twenty-ui/primitives/navigation';
type RecordGroupMenuItemDraggableProps = {
recordGroupId: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx
index 87d3dd18d67..1f214d9a7d5 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx
@@ -1,13 +1,9 @@
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
- type AnimatedPlaceholderType,
-} from 'twenty-ui/primitives/feedback';
+
+import { type AnimatedPlaceholderType } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/types/AnimatedPlaceholderType';
import { type IconComponent } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
@@ -36,14 +32,12 @@ export const RecordIndexEmptyStateDisplay = ({
width,
}: RecordIndexEmptyStateDisplayProps) => (
<StyledEmptyStateContainer>
- <AnimatedPlaceholderEmptyContainer width={width}>
+ <EmptyState.Root width={width}>
<AnimatedPlaceholder type={animatedPlaceholderType} />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>{title}</AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
- {subTitle}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
+ <EmptyState.Content>
+ <EmptyState.Title>{title}</EmptyState.Title>
+ <EmptyState.Description>{subTitle}</EmptyState.Description>
+ </EmptyState.Content>
{isDefined(onButtonClick) && (
<Button
startIcon={isDefined(ButtonIcon) ? <ButtonIcon /> : undefined}
@@ -53,6 +47,6 @@ export const RecordIndexEmptyStateDisplay = ({
{buttonTitle}
</Button>
)}
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Root>
</StyledEmptyStateContainer>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx
index dadbff7657f..08063d55640 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx
@@ -1,15 +1,10 @@
import { type NonReadableViewFieldInfo } from '@/object-record/record-index/hooks/useHasCurrentViewNonReadableFields';
import { getNonReadableViewFieldSubTitle } from '@/object-record/record-index/utils/getNonReadableViewFieldSubTitle';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
const StyledEmptyPlaceholderOuterContainer = styled.div`
height: 100%;
@@ -25,21 +20,21 @@ export const RecordIndexEmptyStateNotShared = ({
}: RecordIndexEmptyStateNotSharedProps) => {
return (
<StyledEmptyPlaceholderOuterContainer>
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="notShared" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>
{isDefined(nonReadableViewFieldInfo)
? t`View not shared`
: t`Object not shared`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ </EmptyState.Title>
+ <EmptyState.Description>
{isDefined(nonReadableViewFieldInfo)
? getNonReadableViewFieldSubTitle(nonReadableViewFieldInfo)
: t`You don't have access to this object.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
</StyledEmptyPlaceholderOuterContainer>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
index 9cb1109d78f..f7131e862a4 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
@@ -1,6 +1,6 @@
+import { FieldDescriptionTooltip } from '@/object-record/record-field/ui/components/FieldDescriptionTooltip';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { FieldDescriptionTooltip } from '@/object-record/record-field/ui/components/FieldDescriptionTooltip';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
@@ -10,10 +10,8 @@ import { RecordInlineCellValue } from '@/object-record/record-inline-cell/compon
import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
-import {
- Tooltip,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { useRecordInlineCellContext } from './RecordInlineCellContext';
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
index 8587b5d7f4e..6a47ff1e053 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
@@ -1,8 +1,8 @@
+import { AnimatedContainer } from '@/ui/layout/animation/components/internal/AnimatedContainer/AnimatedContainer';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { type IconComponent } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/components';
-import { AnimatedContainer } from 'twenty-ui/primitives/layout';
+import { type IconComponent } from 'twenty-ui/icon';
const StyledInlineCellButtonContainer = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx
index c548e6f7799..3c3d8c5651f 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListAddNew.tsx
@@ -12,7 +12,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { logError } from '~/utils/logError';
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
index d169333a8d8..cbf753b4ad2 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
@@ -1,5 +1,5 @@
-import { RecordChip } from '@/object-record/components/RecordChip';
import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';
+import { RecordChip } from '@/object-record/components/RecordChip';
import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { isFieldValueEmpty } from '@/object-record/record-field/ui/utils/isFieldValueEmpty';
@@ -12,6 +12,7 @@ import { useRecordListContextOrThrow } from '@/object-record/record-list/context
import { recordListRowWidthComponentState } from '@/object-record/record-list/states/recordListRowWidthComponentState';
import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
@@ -19,7 +20,7 @@ import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { Chip, LinkChip } from 'twenty-ui/primitives/data-display';
+import { Chip } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRowContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts
index 68407f7e3cf..1d5a11a969f 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts
@@ -8,7 +8,7 @@ import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { AppPath } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateApp } from '~/hooks/useNavigateApp';
type UseMergeRecordsActionsProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts
index 370794f0f82..31b5f78aa99 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts
@@ -8,7 +8,7 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useU
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useEffect, useState } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type UseMergePreviewProps = {
objectNameSingular: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
index e44e3ad830c..840c071abb5 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
@@ -1,8 +1,7 @@
-import { t } from '@lingui/core/macro';
-
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getAvatarShape } from '@/object-metadata/utils/getAvatarShape';
import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext';
+import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
import { multipleRecordPickerIsSelectedComponentFamilySelector } from '@/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerIsSelectedComponentFamilySelector';
import { getMultipleRecordPickerSelectableListId } from '@/object-record/record-picker/multiple-record-picker/utils/getMultipleRecordPickerSelectableListId';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
@@ -12,11 +11,10 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { t } from '@lingui/core/macro';
import { capitalize } from 'twenty-shared/utils';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { ListItem } from 'twenty-ui/primitives/navigation';
-
-import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
import { type SearchRecord } from '~/generated/graphql';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx
index ef840cdcaea..9fa70dda9fe 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx
@@ -1,5 +1,3 @@
-import { useMemo } from 'react';
-
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getAvatarShape } from '@/object-metadata/utils/getAvatarShape';
import { searchRecordStoreFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState';
@@ -13,6 +11,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
+import { useMemo } from 'react';
import { capitalize, isDefined } from 'twenty-shared/utils';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { ListItem } from 'twenty-ui/primitives/navigation';
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarTitle.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarTitle.tsx
index d0b46fc726a..992259f405f 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarTitle.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarTitle.tsx
@@ -3,11 +3,11 @@ import { useRecordIdentifierTitle } from '@/object-record/record-show/hooks/useR
import { RecordTitleCell } from '@/object-record/record-title-cell/components/RecordTitleCell';
import { RecordTitleCellContainerType } from '@/object-record/record-title-cell/types/RecordTitleCellContainerType';
import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { styled } from '@linaria/react';
import { useRef, type ChangeEvent, type MouseEvent } from 'react';
import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { useNavigateApp } from '~/hooks/useNavigateApp';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
index f301c66e505..58ec5c6ab6e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
@@ -9,7 +9,7 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
import { type RecordGqlOperationFilter } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { logError } from '~/utils/logError';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx
index 1036a9aa147..fc3401a204a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx
@@ -1,11 +1,11 @@
+import { AnimatedContainer } from '@/ui/layout/animation/components/internal/AnimatedContainer/AnimatedContainer';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import { type IconComponent } from 'twenty-ui/icon';
import { ButtonGroup } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
-import { isDefined } from 'twenty-shared/utils';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedContainer } from 'twenty-ui/primitives/layout';
const StyledButtonContainer = styled.div`
/* Buttons stay concentric with the frame: its radius minus the 1px border.
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDragAndDrop.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDragAndDrop.tsx
index 49135ab4411..b45fff6c9d8 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDragAndDrop.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDragAndDrop.tsx
@@ -2,13 +2,13 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH_CLASS_NAME } from '@/object-record/record-table/constants/RecordTableColumnDragAndDropWidthClassName';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import { RECORD_TABLE_ROW_HEIGHT } from '@/object-record/record-table/constants/RecordTableRowHeight';
import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';
import { useRecordTableRowDraggableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowDraggableContext';
import { RecordTableCellStyleWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellStyleWrapper';
+import { IconListViewGrip } from '@/object-record/record-table/record-table-cell/components/internal/IconListViewGrip/IconListViewGrip';
import { DragDropItemSortableHandleRefContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemSortableHandleRefContext';
-import { IconListViewGrip } from 'twenty-ui/primitives/input';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
border-color: transparent;
diff --git a/packages/twenty-ui/src/primitives/input/IconListViewGrip/IconListViewGrip.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/internal/IconListViewGrip/IconListViewGrip.tsx
similarity index 65%
rename from packages/twenty-ui/src/primitives/input/IconListViewGrip/IconListViewGrip.tsx
rename to packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/internal/IconListViewGrip/IconListViewGrip.tsx
index 4b60c016bac..4829a934186 100644
--- a/packages/twenty-ui/src/primitives/input/IconListViewGrip/IconListViewGrip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/internal/IconListViewGrip/IconListViewGrip.tsx
@@ -1,5 +1,5 @@
-import IconListViewGripRaw from '@assets/misc/list-view-grip.svg?react';
-import { type IconComponentProps } from '@ui/icon/types/IconComponent';
+import { type IconComponentProps } from 'twenty-ui/icon';
+import IconListViewGripRaw from './list-view-grip.svg?react';
type IconListViewGripProps = Pick<IconComponentProps, 'size' | 'stroke'>;
diff --git a/packages/twenty-ui/src/assets/misc/list-view-grip.svg b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/internal/IconListViewGrip/list-view-grip.svg
similarity index 100%
rename from packages/twenty-ui/src/assets/misc/list-view-grip.svg
rename to packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/internal/IconListViewGrip/list-view-grip.svg
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
index 37c26182f6d..03bf1ee7f28 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
@@ -2,9 +2,9 @@ import { RECORD_TABLE_ROW_HEIGHT } from '@/object-record/record-table/constants/
import { useAggregateRecordsForRecordTableColumnFooter } from '@/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter';
import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledText = styled.span`
align-items: center;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx
index 5a80d48a9be..8d862704a7b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx
@@ -1,4 +1,3 @@
-import { t } from '@lingui/core/macro';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
@@ -7,9 +6,10 @@ import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/can
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { LightIconButton } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { LightIconButton } from 'twenty-ui/components';
import { useIsMobile } from 'twenty-ui/utilities';
const StyledHeaderIcon = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
index 3efaccb2d31..ff9ac66e6a3 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
@@ -1,25 +1,25 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { useCallback, useState } from 'react';
-import { useLocation } from 'react-router-dom';
-
import { useActiveFieldMetadataItems } from '@/object-metadata/hooks/useActiveFieldMetadataItems';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { useChangeRecordFieldVisibility } from '@/object-record/record-field/hooks/useChangeRecordFieldVisibility';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { type ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
+import { useCallback, useState } from 'react';
+import { useLocation } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconSettings, useIcons } from 'twenty-ui/icon';
-import { ListItem, UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { ListItem } from 'twenty-ui/primitives/navigation';
export const RecordTableHeaderPlusButtonContent = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx
index 75439b663b3..291de7fb4b1 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx
@@ -8,7 +8,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDiv = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx
index 88ee5e47233..6aedcf22514 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx
@@ -1,10 +1,10 @@
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { type RecordTitleCellContainerType } from '@/object-record/record-title-cell/types/RecordTitleCellContainerType';
+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDiv = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
index 173a7b1032b..d2dfcd365a0 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
@@ -8,7 +8,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDiv = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
index 82070e8bca4..5b1795d8f2c 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
@@ -11,7 +11,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const UPDATE_MULTIPLE_RECORDS_CONFIRMATION_MODAL_ID =
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts
index 4fe22de4f9b..35988a7cd23 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts
@@ -12,7 +12,7 @@ import { useOpenSpreadsheetImportDialog } from '@/spreadsheet-import/hooks/useOp
import { spreadsheetImportCreatedRecordsProgressState } from '@/spreadsheet-import/states/spreadsheetImportCreatedRecordsProgressState';
import { type SpreadsheetImportDialogOptions } from '@/spreadsheet-import/types';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useOpenObjectRecordsSpreadsheetImportDialog = (
objectNameSingular: string,
diff --git a/packages/twenty-front/src/modules/onboarding/components/BookCallOnboardingStepActions.tsx b/packages/twenty-front/src/modules/onboarding/components/BookCallOnboardingStepActions.tsx
index 1dad8aae80b..01234fd2475 100644
--- a/packages/twenty-front/src/modules/onboarding/components/BookCallOnboardingStepActions.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/BookCallOnboardingStepActions.tsx
@@ -4,7 +4,7 @@ import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsF
import { OnboardingSkipButton } from '@/onboarding/components/OnboardingSkipButton';
import { BookCallBookingSuccessEffect } from '@/onboarding/effect-components/BookCallBookingSuccessEffect';
import { useCompleteBookCallOnboardingStep } from '@/onboarding/hooks/useCompleteBookCallOnboardingStep';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const BookCallOnboardingStepActions = () => {
const { enqueueToast } = useToast();
diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx
index 9632410f07f..87c0fb1baa8 100644
--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx
@@ -2,8 +2,8 @@ import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/Onboardin
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, IconCoins, IconInfoCircle } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconChevronLeft, IconCoins, IconInfoCircle } from 'twenty-ui/icon';
import {
MOBILE_VIEWPORT,
themeCssVariables,
diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsx
index 32dcabc28d1..0d2a6df04fc 100644
--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsx
@@ -9,7 +9,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useRef } from 'react';
import { FileFolder } from 'twenty-shared/types';
import { getImageAbsoluteURI, isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconUserCircle } from 'twenty-ui/icon';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
diff --git a/packages/twenty-front/src/modules/onboarding/components/__tests__/BookCallOnboardingStepActions.test.tsx b/packages/twenty-front/src/modules/onboarding/components/__tests__/BookCallOnboardingStepActions.test.tsx
index d2b525f37d8..1e230717009 100644
--- a/packages/twenty-front/src/modules/onboarding/components/__tests__/BookCallOnboardingStepActions.test.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/__tests__/BookCallOnboardingStepActions.test.tsx
@@ -20,8 +20,8 @@ jest.mock('@/onboarding/hooks/useCompleteBookCallOnboardingStep', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/onboarding/components/__tests__/OnboardingStepLayout.test.tsx b/packages/twenty-front/src/modules/onboarding/components/__tests__/OnboardingStepLayout.test.tsx
index c863cdacf1f..9e31ed06812 100644
--- a/packages/twenty-front/src/modules/onboarding/components/__tests__/OnboardingStepLayout.test.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/__tests__/OnboardingStepLayout.test.tsx
@@ -10,11 +10,11 @@ import { onboardingConfigState } from '@/client-config/states/onboardingConfigSt
import { type OnboardingConfig } from '@/client-config/types/OnboardingConfig';
import { OnboardingStepLayout } from '@/onboarding/components/OnboardingStepLayout';
import { onboardingFreeCreditsState } from '@/onboarding/states/onboardingFreeCreditsState';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
import {
jotaiStore,
resetJotaiStore,
} from '@/ui/utilities/state/jotai/jotaiStore';
+import { ToastProvider } from 'twenty-ui/components';
import { messages } from '~/locales/generated/en';
jest.mock(
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useGoBackToPreviousOnboardingStep.test.tsx b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useGoBackToPreviousOnboardingStep.test.tsx
index 715bbeac374..91b8807c035 100644
--- a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useGoBackToPreviousOnboardingStep.test.tsx
+++ b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useGoBackToPreviousOnboardingStep.test.tsx
@@ -20,8 +20,8 @@ import { mockedUserData } from '~/testing/mock-data/users';
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useInviteTeam.test.ts b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useInviteTeam.test.ts
index 2083abc1a47..d134a29458d 100644
--- a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useInviteTeam.test.ts
+++ b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useInviteTeam.test.ts
@@ -38,8 +38,8 @@ jest.mock('@apollo/client/react', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useGoBackToPreviousOnboardingStep.ts b/packages/twenty-front/src/modules/onboarding/hooks/useGoBackToPreviousOnboardingStep.ts
index 0c20f6301a5..d052ab977e8 100644
--- a/packages/twenty-front/src/modules/onboarding/hooks/useGoBackToPreviousOnboardingStep.ts
+++ b/packages/twenty-front/src/modules/onboarding/hooks/useGoBackToPreviousOnboardingStep.ts
@@ -7,7 +7,7 @@ import { useMutation } from '@apollo/client/react';
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { GoBackToPreviousOnboardingStepDocument } from '~/generated-metadata/graphql';
import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.ts b/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.ts
index 682babf9e3b..5c065997a44 100644
--- a/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.ts
+++ b/packages/twenty-front/src/modules/onboarding/hooks/useInviteTeam.ts
@@ -17,7 +17,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { type SubmitHandler, useFieldArray, useForm } from 'react-hook-form';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { z } from 'zod';
import { GetInviteSuggestionsDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx
index 65dcbc396e4..1953538325c 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx
@@ -1,33 +1,10 @@
-import { t } from '@lingui/core/macro';
-import { styled } from '@linaria/react';
-import { type MouseEvent, useContext, useState } from 'react';
-
import { TabAvatar } from '@/ui/layout/tab-list/components/TabAvatar';
import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';
-import { IconPencil } from 'twenty-ui/icon';
+import { t } from '@lingui/core/macro';
+import { type MouseEvent, useState } from 'react';
import { LightIconButton } from 'twenty-ui/components';
-import {
- StyledHoverableMenuItemBase,
- StyledMenuItemIconCheck,
- StyledMenuItemLabel,
- StyledMenuItemLeftContent,
-} from 'twenty-ui/primitives/navigation';
-import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';
-const StyledTextContainer = styled.div`
- align-items: center;
- display: flex;
- flex: 1 0 0;
- gap: ${themeCssVariables.spacing[1]};
- max-width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
-`;
-
-const StyledRightContent = styled.div`
- align-items: center;
- display: flex;
- gap: ${themeCssVariables.spacing[1]};
-`;
+import { IconPencil } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
type PageLayoutTabMenuItemSelectAvatarProps = {
tab: SingleTabProps;
@@ -48,49 +25,39 @@ export const PageLayoutTabMenuItemSelectAvatar = ({
onEditClick,
testId,
}: PageLayoutTabMenuItemSelectAvatarProps) => {
- const { theme } = useContext(ThemeContext);
const [isHovered, setIsHovered] = useState(false);
return (
- <StyledHoverableMenuItemBase
+ <ListItem
onClick={onClick}
disabled={disabled}
data-testid={testId}
role="option"
aria-selected={selected}
aria-disabled={disabled}
- isIconDisplayedOnHoverOnly={showEditButton}
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
+ startIcon={<TabAvatar tab={tab} />}
+ selected={selected && !isHovered}
+ indicator="check"
+ actions={
+ isHovered &&
+ showEditButton && (
+ <LightIconButton
+ size="sm"
+ emphasis="subtle"
+ aria-label={t`Edit tab icon`}
+ onClick={(event) => {
+ event.stopPropagation();
+ onEditClick?.(tab.id);
+ }}
+ >
+ <IconPencil />
+ </LightIconButton>
+ )
+ }
>
- <StyledMenuItemLeftContent>
- <TabAvatar tab={tab} />
- <StyledTextContainer>
- <StyledMenuItemLabel>{tab.title}</StyledMenuItemLabel>
- </StyledTextContainer>
- </StyledMenuItemLeftContent>
-
- <StyledRightContent>
- {selected && !isHovered && (
- <StyledMenuItemIconCheck size={theme.icon.size.md} />
- )}
-
- {isHovered && showEditButton && (
- <div className="hoverable-buttons">
- <LightIconButton
- size="sm"
- emphasis="subtle"
- onClick={(event) => {
- event.stopPropagation();
- onEditClick?.(tab.id);
- }}
- aria-label={t`Edit tab icon`}
- >
- <IconPencil />
- </LightIconButton>
- </div>
- )}
- </StyledRightContent>
- </StyledHoverableMenuItemBase>
+ {tab.title}
+ </ListItem>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutTabToDefault.ts b/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutTabToDefault.ts
index b32b71b2853..5c4e715b667 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutTabToDefault.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutTabToDefault.ts
@@ -7,7 +7,7 @@ import { CrudOperationType } from 'twenty-shared/types';
import { useMetadataErrorHandler } from '@/metadata-error-handler/hooks/useMetadataErrorHandler';
import { RESET_PAGE_LAYOUT_TAB_TO_DEFAULT } from '@/page-layout/graphql/mutations/resetPageLayoutTabToDefault';
import { useRefreshPageLayoutAfterReset } from '@/page-layout/hooks/useRefreshPageLayoutAfterReset';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useResetPageLayoutTabToDefault = (
pageLayoutIdFromProps: string,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutToDefault.ts b/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutToDefault.ts
index af541e37c27..a340e2b5a3e 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutToDefault.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutToDefault.ts
@@ -10,7 +10,7 @@ import { useMetadataErrorHandler } from '@/metadata-error-handler/hooks/useMetad
import { useInvalidateMetadataStore } from '@/metadata-store/hooks/useInvalidateMetadataStore';
import { RESET_PAGE_LAYOUT_TO_DEFAULT } from '@/page-layout/graphql/mutations/resetPageLayoutToDefault';
import { pageLayoutIsInitializedComponentState } from '@/page-layout/states/pageLayoutIsInitializedComponentState';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useResetPageLayoutToDefault = () => {
const [resetMutation] = useMutation(RESET_PAGE_LAYOUT_TO_DEFAULT);
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutWidgetToDefault.ts b/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutWidgetToDefault.ts
index 6126528c264..c0e5f8d5fc5 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutWidgetToDefault.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useResetPageLayoutWidgetToDefault.ts
@@ -7,7 +7,7 @@ import { ResetPageLayoutWidgetToDefaultDocument } from '~/generated-metadata/gra
import { useMetadataErrorHandler } from '@/metadata-error-handler/hooks/useMetadataErrorHandler';
import { useRefreshPageLayoutAfterReset } from '@/page-layout/hooks/useRefreshPageLayoutAfterReset';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useResetPageLayoutWidgetToDefault = (
pageLayoutIdFromProps: string,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutWithTabsAndWidgets.ts b/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutWithTabsAndWidgets.ts
index 8790bc4cab0..3eb9f2efc04 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutWithTabsAndWidgets.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutWithTabsAndWidgets.ts
@@ -9,7 +9,7 @@ import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequ
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { CrudOperationType } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useUpdatePageLayoutWithTabsAndWidgets = () => {
const [updatePageLayoutWithTabsAndWidgetsMutation] = useMutation(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/components/CallRecordingWidgetEmptyStateDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/components/CallRecordingWidgetEmptyStateDisplay.tsx
index 4febbbf0aa4..960d502ab39 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/components/CallRecordingWidgetEmptyStateDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/components/CallRecordingWidgetEmptyStateDisplay.tsx
@@ -1,11 +1,7 @@
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
- type AnimatedPlaceholderType,
-} from 'twenty-ui/primitives/feedback';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
+
+import { type AnimatedPlaceholderType } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/types/AnimatedPlaceholderType';
type CallRecordingWidgetEmptyStateDisplayProps = {
animatedPlaceholderType: AnimatedPlaceholderType;
@@ -18,13 +14,11 @@ export const CallRecordingWidgetEmptyStateDisplay = ({
title,
subTitle,
}: CallRecordingWidgetEmptyStateDisplayProps) => (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type={animatedPlaceholderType} />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>{title}</AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
- {subTitle}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Content>
+ <EmptyState.Title>{title}</EmptyState.Title>
+ <EmptyState.Description>{subTitle}</EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx
index 0afa5bf53f6..e043d19b719 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx
@@ -5,18 +5,13 @@ import { PageLayoutComponentInstanceContext } from '@/page-layout/states/context
import { WidgetCard } from '@/page-layout/widgets/widget-card/components/WidgetCard';
import { WidgetCardHeader } from '@/page-layout/widgets/widget-card/components/WidgetCardHeader';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import { Trans } from '@lingui/react/macro';
import { SidePanelPages } from 'twenty-shared/types';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
export const DashboardWidgetPlaceholder = () => {
const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
@@ -65,17 +60,17 @@ export const DashboardWidgetPlaceholder = () => {
title={t`Add Widget`}
isEmpty
/>
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noWidgets" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>
<Trans>Add widget</Trans>
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ </EmptyState.Title>
+ <EmptyState.Description>
<Trans>Click to add your first widget</Trans>
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
</WidgetCard>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
index 8037c7caed7..40cca9fe4da 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
@@ -8,13 +8,13 @@ import { type WidgetInsertionContext } from '@/page-layout/states/widgetInsertio
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { MenuItem } from 'twenty-ui/components';
import {
IconListDetails,
IconListSearch,
IconNotes,
IconPlus,
} from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetInsertionSeparator.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetInsertionSeparator.tsx
index 540d166d791..448d5a5b2ef 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetInsertionSeparator.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetInsertionSeparator.tsx
@@ -3,8 +3,8 @@ import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { css } from '@linaria/core';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/components';
+import { IconPlus } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const INSERT_BUTTON_CLASS_NAME = css`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx
index c28c29f9e6f..8bdc0e0f849 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx
@@ -1,13 +1,8 @@
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
const StyledPlaceholderContainer = styled.div`
background: ${themeCssVariables.background.secondary};
@@ -23,17 +18,17 @@ const StyledPlaceholderContainer = styled.div`
export const StandaloneWidgetPlaceholder = () => {
return (
<StyledPlaceholderContainer className="widget">
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noWidgets" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>
<Trans>Nothing to see</Trans>
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ </EmptyState.Title>
+ <EmptyState.Description>
<Trans>This page has no content</Trans>
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
</StyledPlaceholderContainer>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx
index f1b661c9751..c0b633e2e24 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx
@@ -1,3 +1,4 @@
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { useCallback, useState } from 'react';
import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
@@ -9,24 +10,18 @@ import { type EmailDraftPrefill } from '@/activities/emails/types/EmailDraftPref
import { type EmailThreadMessageWithSender } from '@/activities/emails/types/EmailThreadMessageWithSender';
import { getEmailDraftPrefillFromMessage } from '@/activities/emails/utils/getEmailDraftPrefillFromMessage';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
+import { WidgetRelationsHeader } from '@/page-layout/widgets/components/WidgetRelationsHeader';
+import { EmailThreadComposer } from '@/page-layout/widgets/email-thread/components/EmailThreadComposer';
+import { EmailThreadIntermediaryMessages } from '@/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
import {
StyledWidgetContentContainer,
StyledWidgetScrollContainer,
} from '@/ui/layout/components/WidgetContentContainer';
-import { EmailThreadComposer } from '@/page-layout/widgets/email-thread/components/EmailThreadComposer';
-import { EmailThreadIntermediaryMessages } from '@/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages';
-import { WidgetRelationsHeader } from '@/page-layout/widgets/components/WidgetRelationsHeader';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
type EmailThreadWidgetProps = {
widget: PageLayoutWidget;
@@ -114,17 +109,15 @@ export const EmailThreadWidget = ({
<StyledWidgetContentContainer>
<WidgetRelationsHeader />
<StyledWidgetScrollContainer>
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="emptyInbox" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No messages to show`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No messages to show`}</EmptyState.Title>
+ <EmptyState.Description>
{t`The messages in this thread are missing or incomplete.`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
</StyledWidgetScrollContainer>
</StyledWidgetContentContainer>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
index 49096c1d938..f14cde64830 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
@@ -14,15 +14,17 @@ import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { FieldWidgetDisplay } from '@/page-layout/widgets/field/components/FieldWidgetDisplay';
import { FieldWidgetJunctionRelationCard } from '@/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard';
import { FieldWidgetJunctionRelationField } from '@/page-layout/widgets/field/components/FieldWidgetJunctionRelationField';
-import { FieldWidgetRichTextEditor } from '@/page-layout/widgets/field/components/FieldWidgetRichTextEditor';
import { FieldWidgetMorphRelationCard } from '@/page-layout/widgets/field/components/FieldWidgetMorphRelationCard';
import { FieldWidgetMorphRelationField } from '@/page-layout/widgets/field/components/FieldWidgetMorphRelationField';
import { FieldWidgetRelationCard } from '@/page-layout/widgets/field/components/FieldWidgetRelationCard';
import { FieldWidgetRelationField } from '@/page-layout/widgets/field/components/FieldWidgetRelationField';
import { FieldWidgetRelationTable } from '@/page-layout/widgets/field/components/FieldWidgetRelationTable';
+import { FieldWidgetRichTextEditor } from '@/page-layout/widgets/field/components/FieldWidgetRichTextEditor';
+import { FieldWidgetTextEditor } from '@/page-layout/widgets/field/components/FieldWidgetTextEditor';
import { assertFieldWidgetOrThrow } from '@/page-layout/widgets/field/utils/assertFieldWidgetOrThrow';
import { getFieldWidgetEffectiveDisplayMode } from '@/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode';
-import { FieldWidgetTextEditor } from '@/page-layout/widgets/field/components/FieldWidgetTextEditor';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
@@ -30,13 +32,7 @@ import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/use
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
+
import { FieldDisplayMode } from '~/generated-metadata/graphql';
const StyledContainer = styled.div`
@@ -77,17 +73,15 @@ export const FieldWidget = ({ widget }: FieldWidgetProps) => {
return (
<SidePanelProvider value={{ isInSidePanel }}>
<StyledContainer>
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noRecord" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No field configured`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No field configured`}</EmptyState.Title>
+ <EmptyState.Description>
{t`Select a field to display in this widget`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
</StyledContainer>
</SidePanelProvider>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx
index d244ba59570..7a7f0a62d8a 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx
@@ -5,8 +5,8 @@ import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldCont
import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell';
import { useOpenFieldWidgetFieldInputEditMode } from '@/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode';
import { WidgetCardHeaderHoverReveal } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderHoverReveal';
-import { IconPencil } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconPencil } from 'twenty-ui/icon';
export const FieldWidgetEditAction = () => {
const { recordId, fieldDefinition } = useContext(FieldContext);
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.tsx
index da339bbf7b0..b79c655e346 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
@@ -28,8 +28,8 @@ import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/Dra
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useLingui } from '@lingui/react/macro';
import { Fragment, useState } from 'react';
+import { MenuItem } from 'twenty-ui/components';
import { IconNewSection } from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
const StyledGroupsDroppable = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx
index b7df5df1b28..a41ec9f4379 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx
@@ -1,9 +1,8 @@
-import { t } from '@lingui/core/macro';
-import { LightIconButton } from 'twenty-ui/components';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type FieldsConfigurationFieldItem } from '@/page-layout/types/FieldsConfiguration';
+import { t } from '@lingui/core/macro';
+import { LightIconButton, MenuItemDraggable } from 'twenty-ui/components';
import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/icon';
-import { MenuItemDraggable } from 'twenty-ui/primitives/navigation';
type FieldsConfigurationFieldEditorProps = {
field: FieldsConfigurationFieldItem;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx
index e50e3fbc1b2..3f684b5c2d4 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { IconGripVertical } from 'twenty-ui/icon';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
@@ -41,7 +41,13 @@ export const FieldsConfigurationGroupDraggableHeader = ({
color={themeCssVariables.font.color.tertiary}
/>
</StyledIconContainer>
- <Label>{text}</Label>
+ <StyledDisplayLabel>{text}</StyledDisplayLabel>
</StyledContainer>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
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.tsx
index bbb54dba50c..6f1194452e6 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
@@ -3,8 +3,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { Fragment, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { MenuItem } from 'twenty-ui/components';
import { IconNewSection } from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
import { FieldsConfigurationFieldEditor } from '@/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor';
import { FIELDS_CONFIGURATION_FIELD_DND_TYPE } from '@/page-layout/widgets/fields/constants/FieldsConfigurationFieldDndType';
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.tsx
index 64b97f76d6e..6ca55966e41 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
@@ -1,27 +1,23 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { RecordFieldListComponentInstanceContext } from '@/object-record/record-field-list/states/contexts/RecordFieldListComponentInstanceContext';
+import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';
import { FieldsWidgetCellEditModePortal } from '@/page-layout/widgets/fields/components/FieldsWidgetCellEditModePortal';
import { FieldsWidgetCellHoveredPortal } from '@/page-layout/widgets/fields/components/FieldsWidgetCellHoveredPortal';
import { FieldsWidgetFieldList } from '@/page-layout/widgets/fields/components/FieldsWidgetFieldList';
import { FieldsWidgetGroupContainer } from '@/page-layout/widgets/fields/components/FieldsWidgetGroupContainer';
import { useFieldsWidgetGroupsForDisplay } from '@/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsForDisplay';
import { useFieldsWidgetHiddenFieldsForDisplay } from '@/page-layout/widgets/fields/hooks/useFieldsWidgetHiddenFieldsForDisplay';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
+import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/primitives/feedback';
+
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type FieldsConfiguration } from '~/generated-metadata/graphql';
@@ -105,17 +101,15 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {
return (
<SidePanelProvider value={{ isInSidePanel }}>
<StyledWidgetScrollContainer>
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="noRecord" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No fields to display`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No fields to display`}</EmptyState.Title>
+ <EmptyState.Description>
{t`Configure this widget to display fields`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
</StyledWidgetScrollContainer>
</SidePanelProvider>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx
index a3a1bf5d48d..f6abf4f9dec 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx
@@ -1,4 +1,3 @@
-import { t } from '@lingui/core/macro';
import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';
import { GraphWidgetLegendDot } from '@/page-layout/widgets/graph/components/GraphWidgetLegendDot';
import { LEGEND_HIGHLIGHT_DIMMED_OPACITY } from '@/page-layout/widgets/graph/constants/LegendHighlightDimmedOpacity.constant';
@@ -12,11 +11,12 @@ import { NodeDimensionEffect } from '@/ui/utilities/dimensions/components/NodeDi
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { AnimatePresence, motion } from 'framer-motion';
import { useContext, useRef, useState } from 'react';
-import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { LightIconButton } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type GraphWidgetLegendItem = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx
index 78fae6fdac5..e0982c2649f 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx
@@ -6,15 +6,15 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hoo
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode, useContext } from 'react';
-import { IconTrash } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/components';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { IconTrash } from 'twenty-ui/icon';
import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';
import { WidgetGrip } from '@/page-layout/widgets/widget-card/components/WidgetGrip';
import { AnimatePresence, motion } from 'framer-motion';
import { isDefined } from 'twenty-shared/utils';
-import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type WidgetCardHeaderProps = {
variant: WidgetCardVariant;
widgetId: string;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton.tsx
index e51b18ba3f4..afdcaaf823b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton.tsx
@@ -1,5 +1,5 @@
-import { type IconComponent } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { type IconComponent } from 'twenty-ui/icon';
type WidgetCardHeaderActionButtonProps = {
Icon: IconComponent;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx
index 51273863c41..967edd2ed99 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx
@@ -1,12 +1,12 @@
-import { t } from '@lingui/core/macro';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type BlocklistItem } from '@/accounts/types/BlocklistItem';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { formatToHumanReadableDate } from '~/utils/date-utils';
+import { t } from '@lingui/core/macro';
import { IconButton } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconX } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { formatToHumanReadableDate } from '~/utils/date-utils';
type SettingsAccountsBlocklistTableRowProps = {
blocklistItem: BlocklistItem;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
index 3f02a66af6d..0f197080fd1 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
@@ -5,6 +5,7 @@ import { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicros
import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
import { SettingsCard } from '@/settings/components/SettingsCard';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
@@ -12,7 +13,6 @@ import { useContext } from 'react';
import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconAt, IconGoogle, IconMicrosoft } from 'twenty-ui/icon';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCardsContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
index e25abff08a7..69765fe932b 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
@@ -2,12 +2,12 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { SettingsCard } from '@/settings/components/SettingsCard';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
import { IconCalendarEvent, IconMailCog } from 'twenty-ui/icon';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import {
MOBILE_VIEWPORT,
ThemeContext,
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
index 072671965de..9c2275a31c8 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
@@ -15,13 +15,11 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { Checkbox } from 'twenty-ui/primitives/input';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledTreeList = styled.ul`
list-style: none;
margin: 0;
@@ -144,11 +142,11 @@ export const SettingsAccountsMessageFoldersCard = () => {
/>
</StyledSearchInputContainer>
<StyledLabelContainer>
- <Label>{t`Folders`}</Label>
+ <StyledDisplayLabel>{t`Folders`}</StyledDisplayLabel>
</StyledLabelContainer>
<StyledSectionHeader>
- <Label>{t`Toggle all folders`}</Label>
+ <StyledDisplayLabel>{t`Toggle all folders`}</StyledDisplayLabel>
<TableCell
align="right"
padding={`0 ${themeCssVariables.spacing[1]} 0 ${themeCssVariables.spacing[2]}`}
@@ -176,3 +174,9 @@ export const SettingsAccountsMessageFoldersCard = () => {
</Section.Root>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/settings/accounts/hooks/useCreateEmailGroupChannel.ts b/packages/twenty-front/src/modules/settings/accounts/hooks/useCreateEmailGroupChannel.ts
index b9348cdea30..abd54276ca7 100644
--- a/packages/twenty-front/src/modules/settings/accounts/hooks/useCreateEmailGroupChannel.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/useCreateEmailGroupChannel.ts
@@ -5,7 +5,7 @@ import {
type MessageChannelType,
type MessageChannelVisibility,
} from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { CREATE_EMAIL_GROUP_CHANNEL } from '@/settings/accounts/graphql/mutations/createEmailGroupChannel';
diff --git a/packages/twenty-front/src/modules/settings/accounts/hooks/useImapSmtpCaldavConnectionForm.ts b/packages/twenty-front/src/modules/settings/accounts/hooks/useImapSmtpCaldavConnectionForm.ts
index 9af8ebc3690..44284b68210 100644
--- a/packages/twenty-front/src/modules/settings/accounts/hooks/useImapSmtpCaldavConnectionForm.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/useImapSmtpCaldavConnectionForm.ts
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo } from 'react';
import { useForm } from 'react-hook-form';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
index 6dccb80d58a..f938cff3920 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
@@ -1,47 +1,46 @@
import { NavigationButton } from '@/ui/input/components/NavigationButton';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { useMemo, useState } from 'react';
+import { Section, useToast } from 'twenty-ui/components';
import { useMutation, useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
+import { AI_MODEL_TIERS, type AiModelTier } from 'twenty-shared/ai';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { AI_MODEL_TIERS, type AiModelTier } from 'twenty-shared/ai';
import { IconMessage } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { getAiModelTierLabel } from '@/ai/utils/getAiModelTierLabel';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { billingState } from '@/client-config/states/billingState';
import { useClientConfig } from '@/client-config/hooks/useClientConfig';
-import { getAiModelTierLabel } from '@/ai/utils/getAiModelTierLabel';
-import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
+import { billingState } from '@/client-config/states/billingState';
import { SettingsAdminAiProviderListCard } from '@/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard';
-import { useCustomAiProviderAccess } from '@/settings/admin-panel/ai/hooks/useCustomAiProviderAccess';
import { AI_PROVIDER_SOURCE } from '@/settings/admin-panel/ai/constants/AiProviderSource';
import { SET_ADMIN_DEFAULT_AI_MODEL } from '@/settings/admin-panel/ai/graphql/mutations/setAdminDefaultAiModel';
import { GET_ADMIN_AI_MODELS } from '@/settings/admin-panel/ai/graphql/queries/getAdminAiModels';
import { GET_ADMIN_AI_USAGE_BY_WORKSPACE } from '@/settings/admin-panel/ai/graphql/queries/getAdminAiUsageByWorkspace';
import { GET_AI_PROVIDERS } from '@/settings/admin-panel/ai/graphql/queries/getAiProviders';
+import { useCustomAiProviderAccess } from '@/settings/admin-panel/ai/hooks/useCustomAiProviderAccess';
import { type GetAiProvidersResult } from '@/settings/admin-panel/ai/types/GetAiProvidersResult';
import { parseProviderItems } from '@/settings/admin-panel/ai/utils/parseProviderItems';
-import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
-import { SettingsEnterpriseFeatureGateCard } from '@/settings/components/SettingsEnterpriseFeatureGateCard';
+import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { AiModelPinSelect } from '@/settings/ai/components/AiModelPinSelect';
+import { SettingsEnterpriseFeatureGateCard } from '@/settings/components/SettingsEnterpriseFeatureGateCard';
import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';
import { StyledSettingsSelectGroup } from '@/settings/components/SettingsOptions/StyledSettingsSelectGroup';
+import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { useUsageValueFormatter } from '@/settings/usage/hooks/useUsageValueFormatter';
import { getPeriodDates } from '@/settings/usage/utils/getPeriodDates';
import { getPeriodOptions } from '@/settings/usage/utils/getPeriodOptions';
import { type PeriodPreset } from '@/settings/usage/utils/periodPreset';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Select } from '@/ui/input/components/Select';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import {
type AdminAiModelConfig,
type AdminAiModelTierDefault,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
index 6ddd9f2957c..6fee8b7c577 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
@@ -21,7 +21,12 @@ import {
getSettingsPath,
isDefined,
} from 'twenty-shared/utils';
-import { SettingsRow, Section } from 'twenty-ui/components';
+import {
+ SearchInput,
+ Section,
+ SettingsRow,
+ useToast,
+} from 'twenty-ui/components';
import {
IconChevronRight,
IconDotsVertical,
@@ -29,8 +34,7 @@ import {
IconRefresh,
} from 'twenty-ui/icon';
import { Tag } from 'twenty-ui/primitives/data-display';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { Button, SearchInput } from 'twenty-ui/primitives/input';
+import { Button } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebounce } from 'use-debounce';
import {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx
index 44f53e82fa5..03e7d8ad356 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsFilterDropdown.tsx
@@ -1,7 +1,9 @@
import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
import { SettingsRow } from 'twenty-ui/components';
+
import { IconAlertTriangle, IconMessage, IconSparkles } from 'twenty-ui/icon';
+
import { type AdminChatsFilterState } from '@/settings/admin-panel/chats/types/AdminChatsFilterState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsTableRow.tsx b/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsTableRow.tsx
index a284a549a9d..eb8c60e2285 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/chats/components/SettingsAdminChatsTableRow.tsx
@@ -1,11 +1,11 @@
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { Tag } from 'twenty-ui/primitives/data-display';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SETTINGS_ADMIN_CHATS_TABLE_GRID } from '@/settings/admin-panel/chats/constants/SettingsAdminChatsTableGrid';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/chats/hooks/useAdminChatThreads.ts b/packages/twenty-front/src/modules/settings/admin-panel/chats/hooks/useAdminChatThreads.ts
index 474e6197b48..f8dfc38e8ac 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/chats/hooks/useAdminChatThreads.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/chats/hooks/useAdminChatThreads.ts
@@ -13,7 +13,7 @@ import { GET_ADMIN_CHAT_THREADS } from '@/settings/admin-panel/graphql/queries/g
import { sortedFieldByTableFamilyState } from '@/ui/layout/table/states/sortedFieldByTableFamilyState';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
AdminChatThreadScope,
type GetAdminChatThreadsQuery,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatToolCallPart.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatToolCallPart.tsx
index 208fad3f688..ce6733cb601 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatToolCallPart.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatToolCallPart.tsx
@@ -1,12 +1,12 @@
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/primitives/data-display';
+import { JsonTree } from 'twenty-ui/components';
import { IconChevronDown, IconChevronUp, IconTool } from 'twenty-ui/icon';
-import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
+import { Tag } from 'twenty-ui/primitives/data-display';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
index f72da84f394..e0691f85d0d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
@@ -1,9 +1,9 @@
import { canManageFeatureFlagsState } from '@/client-config/states/canManageFeatureFlagsState';
import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
-import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { SettingsAdminServerAdmins } from '@/settings/admin-panel/components/SettingsAdminServerAdmins';
import { SettingsAdminVersionContainer } from '@/settings/admin-panel/components/SettingsAdminVersionContainer';
+import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
@@ -15,15 +15,15 @@ import { useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
-import { useDebounce } from 'use-debounce';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { useDebounce } from 'use-debounce';
import { currentUserState } from '@/auth/states/currentUserState';
import { Section } from 'twenty-ui/components';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronRight } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
AdminPanelRecentUsersDocument,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
index 6bbc3d63fd9..385ad56ffe5 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
@@ -1,24 +1,23 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { TwoFactorAuthenticationVerificationCodeDash } from '@/settings/two-factor-authentication/components/TwoFactorAuthenticationVerificationCodeDash';
import { TwoFactorAuthenticationVerificationCodeSlot } from '@/settings/two-factor-authentication/components/TwoFactorAuthenticationVerificationCodeSlot';
+import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
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 { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
-import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation, useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { OTPInput } from 'input-otp';
import { useState } from 'react';
+import { LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical } from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { LightIconButton } from 'twenty-ui/components';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
GetServerAdminsDocument,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
index 0ad81ae7e02..91cfc3105ee 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
@@ -12,8 +12,8 @@ import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronRight } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { GetServerAdminsDocument } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
index d9690a1bc46..3b000906d1e 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
@@ -3,6 +3,8 @@ import { type WorkspaceInfo } from '@/settings/admin-panel/types/WorkspaceInfo';
import { getUpgradeHealthStatusBadge } from '@/settings/admin-panel/utils/getUpgradeHealthStatusBadge';
import { getWorkspaceSchemaName } from '@/settings/admin-panel/utils/getWorkspaceSchemaName';
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { UserContext } from '@/users/contexts/UserContext';
@@ -16,13 +18,8 @@ import {
getSettingsPath,
isDefined,
} from 'twenty-shared/utils';
-import { type GetUpgradeStatusQuery } from '~/generated-admin/graphql';
import { Section } from 'twenty-ui/components';
-import {
- AvatarOrIcon,
- LinkChip,
- Status,
-} from 'twenty-ui/primitives/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import {
IconCalendar,
IconHome,
@@ -31,8 +28,9 @@ import {
IconStatusChange,
IconUser,
} from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { Status } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { type GetUpgradeStatusQuery } from '~/generated-admin/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
index 52d4994c33f..df138aba51f 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
@@ -1,4 +1,3 @@
-import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { CREDIT_GRANT_EXPIRY_OPTIONS } from '@/settings/admin-panel/constants/CreditGrantExpiryOptions';
import { CREDIT_GRANT_TYPE_LABELS } from '@/settings/admin-panel/constants/CreditGrantTypeLabels';
@@ -7,20 +6,20 @@ import { GRANT_WORKSPACE_CREDITS } from '@/settings/admin-panel/graphql/mutation
import { GET_WORKSPACE_BILLING_ADMIN_PANEL } from '@/settings/admin-panel/graphql/queries/getWorkspaceBillingAdminPanel';
import { Select } from '@/ui/input/components/Select';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
+import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { Section } from 'twenty-ui/components';
-import { Dialog } from 'twenty-ui/primitives/surfaces';
+import { Section, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 } from 'uuid';
import { BillingCreditGrantType } from '~/generated-admin/graphql';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
type SettingsAdminWorkspaceCreditGrantModalProps = {
modalInstanceId: string;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantsTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantsTable.tsx
index a86484be7a1..9c0503d0b81 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantsTable.tsx
@@ -4,8 +4,9 @@ import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { useToast } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { Tag } from 'twenty-ui/primitives/data-display';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { type ThemeColor } from 'twenty-ui/theme';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
@@ -23,7 +24,7 @@ import {
import { SettingsTableListSection } from '@/settings/components/SettingsTableListSection';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
-import { useToast } from 'twenty-ui/primitives/feedback';
+
import { type WorkspaceBillingAdminPanelQuery } from '~/generated-admin/graphql';
import { beautifyExactDate } from '~/utils/date-utils';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsx
index 984f2341976..50345f4da1d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableSearchInput.tsx
@@ -1,5 +1,5 @@
import { t } from '@lingui/core/macro';
-import { SearchInput } from 'twenty-ui/primitives/input';
+import { SearchInput } from 'twenty-ui/components';
type ConfigVariableSearchInputProps = {
value: string;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobDetailsExpandable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobDetailsExpandable.tsx
index 36b0627e562..2ee2e6672f1 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobDetailsExpandable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobDetailsExpandable.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
+import { JsonTree } from 'twenty-ui/components';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type QueueJob } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
index f685b33ccf3..20b1175a577 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
@@ -2,8 +2,7 @@ import { SettingsAdminIndicatorHealthContext } from '@/settings/admin-panel/heal
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import { Section } from 'twenty-ui/components';
-import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
+import { JsonTree, Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AdminPanelHealthServiceStatus } from '~/generated-admin/graphql';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useDeleteJobs.ts b/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useDeleteJobs.ts
index 6717dfb2a6a..e7aa8cf4ffc 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useDeleteJobs.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useDeleteJobs.ts
@@ -4,7 +4,7 @@ import { useMutation } from '@apollo/client/react';
import { plural, t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { DeleteJobsDocument } from '~/generated-admin/graphql';
import { getErrorMessageFromApolloError } from '~/utils/get-error-message-from-apollo-error.util';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useRetryJobs.ts b/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useRetryJobs.ts
index c8644af2c70..d3c5f5129a5 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useRetryJobs.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/hooks/useRetryJobs.ts
@@ -4,7 +4,7 @@ import { useMutation } from '@apollo/client/react';
import { plural, t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { RetryJobsDocument } from '~/generated-admin/graphql';
import { getErrorMessageFromApolloError } from '~/utils/get-error-message-from-apollo-error.util';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
index 5b805d472e6..9afbc51791c 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
@@ -6,6 +6,7 @@ import { adminPanelMaintenanceModeState } from '@/settings/admin-panel/health-st
import { SettingsDatePickerInput } from '@/settings/components/SettingsDatePickerInput';
import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSwitch';
import { TextInput } from '@/ui/input/components/TextInput';
+import { InputHint } from '@/ui/input/components/internal/InputHint/InputHint';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -16,15 +17,12 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconLink, IconTool } from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
-import { InputHint } from 'twenty-ui/primitives/input';
import { Card, CardContent } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledFormContainer = styled.div`
display: flex;
flex-direction: column;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useHandleImpersonate.ts b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useHandleImpersonate.ts
index cd46f27f787..dcefca0ef7d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useHandleImpersonate.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useHandleImpersonate.ts
@@ -10,7 +10,7 @@ import { currentUserState } from '@/auth/states/currentUserState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { ImpersonateDocument } from '~/generated-metadata/graphql';
import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
index d6476a02ad2..df0d364bdec 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
@@ -12,9 +12,9 @@ import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Tag, type TagColor } from 'twenty-ui/primitives/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconCopy } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { Tag, type TagColor } from 'twenty-ui/primitives/data-display';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/hooks/useRevokeSigningKey.ts b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/hooks/useRevokeSigningKey.ts
index b0eb6836a23..6c5df4722ee 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/hooks/useRevokeSigningKey.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/hooks/useRevokeSigningKey.ts
@@ -4,7 +4,7 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { RevokeSigningKeyDocument } from '~/generated-admin/graphql';
import { getErrorMessageFromApolloError } from '~/utils/get-error-message-from-apollo-error.util';
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
index 4f00deae08a..476cfa4a01d 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
@@ -6,6 +6,7 @@ import { plural, t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { isDefined, isSafeUrl } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import {
IconAlertTriangle,
IconBrandNpm,
@@ -21,7 +22,6 @@ import {
IconWorld,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type DeveloperLinks = {
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotLightbox.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotLightbox.tsx
index 74f226e63ee..f596df525f5 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotLightbox.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotLightbox.tsx
@@ -1,11 +1,11 @@
-import { Dialog } from 'twenty-ui/primitives/surfaces';
import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Key } from 'ts-key-enum';
-import { IconChevronLeft, IconChevronRight, IconX } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/components';
+import { IconChevronLeft, IconChevronRight, IconX } from 'twenty-ui/icon';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsApplicationScreenshotLightboxProps = {
diff --git a/packages/twenty-front/src/modules/settings/applications/hooks/__tests__/useUninstallApplication.test.tsx b/packages/twenty-front/src/modules/settings/applications/hooks/__tests__/useUninstallApplication.test.tsx
index ddd11475317..b71c71a6d98 100644
--- a/packages/twenty-front/src/modules/settings/applications/hooks/__tests__/useUninstallApplication.test.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/hooks/__tests__/useUninstallApplication.test.tsx
@@ -18,8 +18,8 @@ const JOB_ID = `uninstall-application.workspace-id.${UNIVERSAL_IDENTIFIER}-5c98b
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/settings/applications/hooks/useUninstallApplication.ts b/packages/twenty-front/src/modules/settings/applications/hooks/useUninstallApplication.ts
index c284ac1830e..70391482d15 100644
--- a/packages/twenty-front/src/modules/settings/applications/hooks/useUninstallApplication.ts
+++ b/packages/twenty-front/src/modules/settings/applications/hooks/useUninstallApplication.ts
@@ -8,7 +8,7 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
FindUninstallApplicationJobStatusDocument,
JobState,
diff --git a/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx b/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx
index 8c51fd33a43..0a960ee1f35 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx
@@ -17,7 +17,7 @@ import {
import { useState } from 'react';
import { useLocation } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { Info, useToast } from 'twenty-ui/primitives/feedback';
+import { Info, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { CreateBillingPaymentMethodSetupIntentDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
index 297b4232e51..125ea1f8e74 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
@@ -3,8 +3,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
index ffd79d0d89e..20f46d85f85 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx
@@ -1,11 +1,3 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/primitives/data-display';
-import { IconChevronLeft } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
-
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { SettingsBillingLimitNestedSelect } from '@/settings/billing/components/internal/SettingsBillingLimitNestedSelect';
import { AVATAR_SPENDER_TYPES } from '@/settings/billing/constants/AvatarSpenderTypes';
@@ -18,14 +10,21 @@ import {
} from '@/settings/billing/hooks/useUsageLimitSpenderOptions';
import { type UsageLimitSpenderType } from '@/settings/billing/types/UsageLimitSpenderType';
import { getUsageLimitSpenderGroups } from '@/settings/billing/utils/getUsageLimitSpenderGroups';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { useLingui } from '@lingui/react/macro';
+import { useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { IconChevronLeft } from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
const SPENDER_DROPDOWN_ID = 'usage-limit-spender';
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
index 31051aa5a46..2fff9e34a7d 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitUsageSelect.tsx
@@ -1,21 +1,20 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
-
import { SettingsBillingLimitNestedSelect } from '@/settings/billing/components/internal/SettingsBillingLimitNestedSelect';
import { USAGE_LIMIT_OPERATION_TYPE_ICONS } from '@/settings/billing/constants/UsageLimitOperationTypeIcons';
import { USAGE_LIMIT_RESOURCE_TYPE_ICONS } from '@/settings/billing/constants/UsageLimitResourceTypeIcons';
import { USAGE_LIMIT_RESOURCE_TYPE_LABELS } from '@/settings/billing/constants/UsageLimitResourceTypeLabels';
import { getUsageLimitOperationTypes } from '@/settings/billing/utils/getUsageLimitOperationTypes';
import { USAGE_OPERATION_TYPE_LABELS } from '@/settings/usage/constants/UsageOperationTypeLabels';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { useLingui } from '@lingui/react/macro';
+import { useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { IconChevronLeft } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import {
type UsageOperationType,
type UsageQuotaDefinitionsQuery,
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsTable.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsTable.tsx
index 56840a9e0f7..13e25e98c0c 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsTable.tsx
@@ -3,13 +3,13 @@ import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useContext, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { SearchInput } from 'twenty-ui/primitives/input';
+import { SearchInput } from 'twenty-ui/components';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsBillingLimitSpenderCell } from '@/settings/billing/components/SettingsBillingLimitSpenderCell';
-import { SettingsBillingLimitAmount } from '@/settings/billing/components/internal/SettingsBillingLimitAmount';
import { SettingsBillingLimitsFilterDropdown } from '@/settings/billing/components/SettingsBillingLimitsFilterDropdown';
+import { SettingsBillingLimitAmount } from '@/settings/billing/components/internal/SettingsBillingLimitAmount';
import { useUsageLimitRows } from '@/settings/billing/hooks/useUsageLimitRows';
import { type UsageLimitRow } from '@/settings/billing/types/UsageLimitRow';
import { type UsageQuotaWithConsumption } from '@/settings/billing/types/UsageQuotaWithConsumption';
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx
index d65d40813be..3a1b2d37baf 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx
@@ -1,11 +1,7 @@
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { ErrorState } from '@/ui/feedback/empty-state/components/ErrorState';
import { useLingui } from '@lingui/react/macro';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderErrorContainer,
- AnimatedPlaceholderErrorSubTitle,
- AnimatedPlaceholderErrorTextContainer,
- AnimatedPlaceholderErrorTitle,
-} from 'twenty-ui/primitives/feedback';
+
import { IconRefresh } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
@@ -19,21 +15,19 @@ export const SettingsBillingPlansErrorState = ({
const { t } = useLingui();
return (
- <AnimatedPlaceholderErrorContainer>
+ <ErrorState.Root>
<AnimatedPlaceholder type="errorIndex" />
- <AnimatedPlaceholderErrorTextContainer>
- <AnimatedPlaceholderErrorTitle>
- {t`We couldn't load the plans`}
- </AnimatedPlaceholderErrorTitle>
- <AnimatedPlaceholderErrorSubTitle>
+ <ErrorState.Content>
+ <ErrorState.Title>{t`We couldn't load the plans`}</ErrorState.Title>
+ <ErrorState.Description>
{t`Something went wrong while contacting our billing service.`}
- </AnimatedPlaceholderErrorSubTitle>
- </AnimatedPlaceholderErrorTextContainer>
+ </ErrorState.Description>
+ </ErrorState.Content>
<Button
startIcon={<IconRefresh />}
onClick={onRetry}
variant="outline"
>{t`Try again`}</Button>
- </AnimatedPlaceholderErrorContainer>
+ </ErrorState.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
index a63d44185ee..ccd3b2d1d94 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
@@ -7,8 +7,8 @@ import { SettingsBillingSubscriptionInfoModals } from '@/settings/billing/compon
import { BILLING_MODAL_IDS } from '@/settings/billing/constants/BillingModalIds';
import { useApplyBillingSubscriptionChange } from '@/settings/billing/hooks/useApplyBillingSubscriptionChange';
import { useApplyCurrentWorkspaceBillingUpdate } from '@/settings/billing/hooks/useApplyCurrentWorkspaceBillingUpdate';
-import { useBillingSubscriptionCost } from '@/settings/billing/hooks/useBillingSubscriptionCost';
import { useBillingSubscriptionChangeWording } from '@/settings/billing/hooks/useBillingSubscriptionChangeWording';
+import { useBillingSubscriptionCost } from '@/settings/billing/hooks/useBillingSubscriptionCost';
import { useBillingWording } from '@/settings/billing/hooks/useBillingWording';
import { useCurrentBillingFlags } from '@/settings/billing/hooks/useCurrentBillingFlags';
import { useCurrentPlan } from '@/settings/billing/hooks/useCurrentPlan';
@@ -30,7 +30,7 @@ import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconClockPlay, IconCoins, IconTag } from 'twenty-ui/icon';
import {
BillingPlanKey,
@@ -41,8 +41,6 @@ import {
} from '~/generated-metadata/graphql';
import { beautifyExactDate } from '~/utils/date-utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
export const SettingsBillingSubscriptionInfo = ({
currentWorkspace,
currentBillingSubscription,
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx
index 303b5950754..ea6ae2f7475 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx
@@ -7,7 +7,7 @@ import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
+import { InlineBanner } from 'twenty-ui/components';
import {
BillingPlanKey,
BillingPortalSessionDocument,
diff --git a/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
index a145312475e..51cb5849bc2 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
@@ -1,16 +1,15 @@
-import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { AddPaymentMethodForm } from '@/settings/billing/components/AddPaymentMethodForm';
import { useMarkBillingPaymentMethodAsAdded } from '@/settings/billing/hooks/useMarkBillingPaymentMethodAsAdded';
import { useWaitForPaymentRecovery } from '@/settings/billing/hooks/useWaitForPaymentRecovery';
import { isSubscriptionPaymentOverdue } from '@/settings/billing/utils/isSubscriptionPaymentOverdue';
+import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { Section } from 'twenty-ui/components';
-import { Dialog } from 'twenty-ui/primitives/surfaces';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type UpdatePaymentMethodModalProps = {
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
index dfa5df6f358..cb9b26201a8 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
@@ -1,12 +1,13 @@
-import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { AnimatedFormattedNumber } from '@/settings/billing/components/internal/AnimatedFormattedNumber';
import { BILLING_MODAL_IDS } from '@/settings/billing/constants/BillingModalIds';
+import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { AnimatePresence, motion } from 'framer-motion';
import { type ElementType, type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import {
IconCoins,
IconHistory,
@@ -14,10 +15,7 @@ import {
IconSparkles,
} from 'twenty-ui/icon';
import { Button, Slider } from 'twenty-ui/primitives/input';
-import {
- Dialog,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/primitives/surfaces';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
const PACKAGE_SUMMARY_ROW_HEIGHT = 24;
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
index 1c3d823b78c..5f8a35a357c 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
@@ -1,4 +1,3 @@
-import { useToast } from 'twenty-ui/primitives/feedback';
import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
import { ResourceCreditPackagePickerModal } from '@/settings/billing/components/internal/ResourceCreditPackagePickerModal';
import { BILLING_MODAL_IDS } from '@/settings/billing/constants/BillingModalIds';
@@ -14,6 +13,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { useToast } from 'twenty-ui/components';
import {
IconAdjustments,
IconArrowUp,
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx
index 07c516ae3d3..41ce6020d79 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingCardField.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { type TablerIconsProps } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
const StyledBillingFieldRow = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/billing/effect-components/EndTrialAfterPaymentMethodEffect.tsx b/packages/twenty-front/src/modules/settings/billing/effect-components/EndTrialAfterPaymentMethodEffect.tsx
index e26b27f2662..7b4c6fa62b2 100644
--- a/packages/twenty-front/src/modules/settings/billing/effect-components/EndTrialAfterPaymentMethodEffect.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/effect-components/EndTrialAfterPaymentMethodEffect.tsx
@@ -10,7 +10,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useCallback, useEffect } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { SubscriptionStatus } from '~/generated-metadata/graphql';
export const EndTrialAfterPaymentMethodEffect = () => {
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useApplyBillingSubscriptionChange.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useApplyBillingSubscriptionChange.ts
index 04de508daec..22c7e70cfa6 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useApplyBillingSubscriptionChange.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useApplyBillingSubscriptionChange.ts
@@ -1,5 +1,4 @@
import { useApplyCurrentWorkspaceBillingUpdate } from '@/settings/billing/hooks/useApplyCurrentWorkspaceBillingUpdate';
-import { assertUnreachable } from 'twenty-shared/utils';
import { useBillingWording } from '@/settings/billing/hooks/useBillingWording';
import { useGetResourceCreditUsage } from '@/settings/billing/hooks/useGetResourceCreditUsage';
import { type BillingSubscriptionChange } from '@/settings/billing/types/BillingSubscriptionChange';
@@ -9,7 +8,8 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { assertUnreachable } from 'twenty-shared/utils';
+import { useToast } from 'twenty-ui/components';
import {
CancelSwitchBillingIntervalDocument,
CancelSwitchBillingPlanDocument,
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPortalSession.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPortalSession.ts
index d9f0c257ce1..367ffad9a6e 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPortalSession.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPortalSession.ts
@@ -4,7 +4,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useLazyQuery } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { BillingPortalSessionDocument } from '~/generated-metadata/graphql';
export const useBillingPortalSession = (returnUrlPath: string) => {
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useCreditUpgradeAction.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useCreditUpgradeAction.ts
index ebedb0f93a5..002bb5d0185 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useCreditUpgradeAction.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useCreditUpgradeAction.ts
@@ -5,7 +5,7 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
SetResourceCreditSubscriptionPriceDocument,
SubscriptionInterval,
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useEndSubscriptionTrialPeriod.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useEndSubscriptionTrialPeriod.ts
index 8b4f40b0e18..c37ac54f088 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useEndSubscriptionTrialPeriod.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useEndSubscriptionTrialPeriod.ts
@@ -8,7 +8,7 @@ import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { useLocation } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
BillingPortalSessionDocument,
EndSubscriptionTrialPeriodDocument,
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useHandleCheckoutSession.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useHandleCheckoutSession.ts
index 8836f88666e..9659e83f372 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useHandleCheckoutSession.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useHandleCheckoutSession.ts
@@ -2,7 +2,7 @@ import { useRedirect } from '@/domain-manager/hooks/useRedirect';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type BillingPlanKey,
type SubscriptionInterval,
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useSubmitSubscriptionPayment.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useSubmitSubscriptionPayment.ts
index f2602a5e131..316cf9dd8f5 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useSubmitSubscriptionPayment.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useSubmitSubscriptionPayment.ts
@@ -6,7 +6,7 @@ import { useElements, useStripe } from '@stripe/react-stripe-js';
import { useState } from 'react';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type BillingPlanKey,
type SubscriptionInterval,
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx b/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx
index 7323cd63198..337d0e5b586 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx
@@ -9,7 +9,7 @@ import { useApolloClient } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { GetCurrentUserDocument } from '~/generated-metadata/graphql';
import { logError } from '~/utils/logError';
import { sleep } from '~/utils/sleep';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx
index d530678126c..412346e6d3b 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx
@@ -1,11 +1,11 @@
import { styled } from '@linaria/react';
-import { type ReactNode, useContext } from 'react';
import { t } from '@lingui/core/macro';
-import { Card, CardContent } from 'twenty-ui/primitives/surfaces';
+import { type ReactNode, useContext } from 'react';
+import { isDefined } from 'twenty-shared/utils';
import { IconChevronRight } from 'twenty-ui/icon';
import { Pill } from 'twenty-ui/primitives/data-display';
-import { isDefined } from 'twenty-shared/utils';
+import { Card, CardContent } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsCardProps = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCardFooter.tsx b/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCardFooter.tsx
index 29a1f114d50..a7b616bab75 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCardFooter.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCardFooter.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
import { type ReactNode, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { type IconComponent } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContent = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx
index 71a8d0ea759..46cafbf4b71 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx
@@ -7,9 +7,9 @@ import {
} from '@/settings/components/SettingsOptions/SettingsCardContentBase';
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
import { styled } from '@linaria/react';
-import { type IconComponent } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { type IconComponent } from 'twenty-ui/icon';
type SettingsOptionCardContentButtonProps = {
Icon?: IconComponent;
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx
index 1168be697bf..81e2ec5299c 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx
@@ -7,8 +7,8 @@ import {
StyledSettingsCardTitle,
} from '@/settings/components/SettingsOptions/SettingsCardContentBase';
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { type IconComponent } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
type SettingsOptionCardContentCounterProps = {
Icon?: IconComponent;
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx
index 1d9601697f6..72cec014ef8 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx
@@ -1,3 +1,4 @@
+import { Separator } from '@/settings/components/Separator';
import {
StyledSettingsCardContent,
StyledSettingsCardDescription,
@@ -5,12 +6,11 @@ import {
StyledSettingsCardTextContainer,
StyledSettingsCardTitle,
} from '@/settings/components/SettingsOptions/SettingsCardContentBase';
-import { Separator } from '@/settings/components/Separator';
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
import { styled } from '@linaria/react';
-import { type IconComponent } from 'twenty-ui/icon';
import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { type IconComponent } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsOptionCardContentSelectProps = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSwitch.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSwitch.tsx
index 12d1b4a227d..a741db0f464 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSwitch.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSwitch.tsx
@@ -8,8 +8,8 @@ import {
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
import { styled } from '@linaria/react';
import { useId } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { type IconComponent } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { Switch } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx
index 4e9a416b4c3..0f715632c33 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx
@@ -3,11 +3,9 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { type IconComponent } from 'twenty-ui/icon';
-import {
- Card,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/primitives/surfaces';
+import { Card } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type TableItem = {
diff --git a/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx b/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx
index 34c5e54598a..471d29edecb 100644
--- a/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx
+++ b/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx
@@ -1,8 +1,8 @@
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
-import { IconChevronLeft } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsWizardStepBarProps = {
diff --git a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
index 0bda71f71ae..a9e7fc9dea1 100644
--- a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
+++ b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
@@ -4,9 +4,8 @@ import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type Dispatch, type SetStateAction, useState } from 'react';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconCheck, IconPencil, IconX } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx
index 66c37e8fa3d..a999ad9a40c 100644
--- a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx
+++ b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx
@@ -1,14 +1,14 @@
-import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { TableBody } from '@/ui/layout/table/components/TableBody';
import { Table } from '@/ui/layout/table/components/Table';
-import { styled } from '@linaria/react';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { TableBody } from '@/ui/layout/table/components/TableBody';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { TableCell } from '@/ui/layout/table/components/TableCell';
-import { IconChevronRight } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { useContext } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTableBodyContainer = styled.div`
border-bottom: 1px solid ${themeCssVariables.border.color.light};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
index f37a2d1b20f..f079ebafa10 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
@@ -10,6 +10,7 @@ import { useSelectSettingsFormInitialValues } from '@/settings/data-model/fields
import { type FieldType } from '@/settings/data-model/types/FieldType';
import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
@@ -18,7 +19,6 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
import { IconSearch } from 'twenty-ui/icon';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { type SettingsDataModelFieldTypeFormValues } from '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx
index 34010d70bec..986deb27571 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx
@@ -1,9 +1,9 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconPlus } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
type AddSelectOptionMenuItemProps = {
name: string;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
index bf616b79f11..856628ca575 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
@@ -7,9 +7,9 @@ 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 { useContext } from 'react';
import { t } from '@lingui/core/macro';
-import { ColorSample } from 'twenty-ui/primitives/data-display';
+import { useContext } from 'react';
+import { LightIconButton, type ColorLabels } from 'twenty-ui/components';
import {
IconCheck,
IconDotsVertical,
@@ -17,11 +17,11 @@ import {
IconTrash,
IconX,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { ListItem, type ColorLabels } from 'twenty-ui/primitives/navigation';
-import { computeOptionValueFromLabel } from '~/pages/settings/data-model/utils/computeOptionValueFromLabel';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { ColorSample } from 'twenty-ui/primitives/data-display';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { MAIN_COLOR_NAMES } from 'twenty-ui/theme';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { computeOptionValueFromLabel } from '~/pages/settings/data-model/utils/computeOptionValueFromLabel';
const useColorLabels = (): ColorLabels => ({
gray: t`Gray`,
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
index f1ae8139cbd..1160d834a61 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
@@ -1,10 +1,10 @@
-import { NavigationButton } from '@/ui/input/components/NavigationButton';
-import { t } from '@lingui/core/macro';
import { SettingsDataModelOverviewEffect } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewEffect';
import { SettingsDataModelOverviewObject } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject';
import { SettingsDataModelOverviewRelationMarkers } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewRelationMarkers';
import { calculateHandlePosition } from '@/settings/data-model/graph-overview/utils/calculateHandlePosition';
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import {
Background,
type Edge,
@@ -24,6 +24,7 @@ import {
import { useCallback, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import {
IconLock,
IconLockOpen,
@@ -32,7 +33,6 @@ import {
IconPlus,
IconX,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
import { ButtonGroup } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
index 83a25102021..44788e1fa84 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
@@ -1,9 +1,9 @@
+import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { useDeleteOneFieldMetadataItem } from '@/object-metadata/hooks/useDeleteOneFieldMetadataItem';
import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
import { useGetIsMetadataItemCustom } from '@/object-metadata/hooks/useGetIsMetadataItemCustom';
import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
-import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
import { SettingsNameCellSecondaryLabel } from '@/settings/components/SettingsNameCellSecondaryLabel';
@@ -13,22 +13,22 @@ import { settingsObjectFieldsFamilyState } from '@/settings/data-model/object-de
import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { useContext, useMemo } from 'react';
-import { styled } from '@linaria/react';
-import { useLingui } from '@lingui/react/macro';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
+import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { useContext, useMemo } from 'react';
import { FieldMetadataType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import {
IconChevronRight,
IconMinus,
IconPlus,
useIcons,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { RelationType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx
index f684ec9e798..2b0aac6060e 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx
@@ -1,10 +1,10 @@
+import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { useDeleteOneFieldMetadataItem } from '@/object-metadata/hooks/useDeleteOneFieldMetadataItem';
import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
import { useGetIsMetadataItemCustom } from '@/object-metadata/hooks/useGetIsMetadataItemCustom';
import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
import { SettingsNameCellSecondaryLabel } from '@/settings/components/SettingsNameCellSecondaryLabel';
@@ -13,8 +13,9 @@ import { RELATION_TYPES } from '@/settings/data-model/constants/RelationTypes';
import { SettingsObjectFieldInactiveActionDropdown } from '@/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { styled } from '@linaria/react';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type MouseEvent, useContext, useMemo } from 'react';
import { FieldMetadataType, SettingsPath } from 'twenty-shared/types';
@@ -24,7 +25,6 @@ import {
IconRelationManyToMany,
useIcons,
} from 'twenty-ui/icon';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
index ecab1ce1a07..61f785e3108 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
@@ -1,7 +1,8 @@
-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';
+import { StyledSettingsDataModelTableBodyContainer } from '@/settings/data-model/components/SettingsDataModelTableBodyContainer';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -11,23 +12,22 @@ import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { type TableMetadata } from '@/ui/layout/table/types/TableMetadata';
import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { StyledSettingsDataModelTableBodyContainer } from '@/settings/data-model/components/SettingsDataModelTableBodyContainer';
import { styled } from '@linaria/react';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
import { FieldMetadataType } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
import { SettingsRow } from 'twenty-ui/components';
import { IconArchive, IconFilter, IconSearch } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { isDefined } from 'twenty-shared/utils';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
-import { TableRow } from '@/ui/layout/table/components/TableRow';
import {
OBJECT_RELATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS,
SettingsObjectRelationItemTableRow,
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
index aa1c261cff0..9e724491527 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
@@ -16,14 +16,12 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconArchive, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
type ObjectSettingsProps = {
objectMetadataItem: EnrichedObjectMetadataItem;
isDeleting: boolean;
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
index aa582c83e15..b4bf01e58d5 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
@@ -1,15 +1,15 @@
-import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { useDeleteOneIndexMetadataItem } from '@/object-metadata/hooks/useDeleteOneIndexMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getCompositeSubFieldLabel } from '@/object-record/object-filter-dropdown/utils/getCompositeSubFieldLabel';
import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';
import { type CompositeFieldType } from '@/settings/data-model/types/CompositeFieldType';
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
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 { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
-import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
@@ -17,10 +17,9 @@ import { type ReactNode, useMemo, useState } from 'react';
import { MAX_CUSTOM_INDEXES_PER_OBJECT } from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { SettingsRow } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { SearchInput, SettingsRow, useToast } from 'twenty-ui/components';
import { IconEyeOff, IconPlus } from 'twenty-ui/icon';
-import { Button, SearchInput } from 'twenty-ui/primitives/input';
+import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsObjectIndexTable } from '~/pages/settings/data-model/SettingsObjectIndexTable';
import { type SettingsObjectIndexesTableItem } from '~/pages/settings/data-model/types/SettingsObjectIndexesTableItem';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
index 95765d7a8b6..ed8896a9e63 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
@@ -1,15 +1,12 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { useUpdateOneFieldMetadataItem } from '@/object-metadata/hooks/useUpdateOneFieldMetadataItem';
import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { SEARCH_VECTOR_FIELD_NAME } from '@/object-record/constants/SearchVectorFieldName';
import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSwitch';
-
-import { SettingsObjectFieldDataType } from '@/settings/data-model/object-details/components/SettingsObjectFieldDataType';
import { canBeSearchable } from '@/settings/data-model/fields/forms/utils/canBeSearchable';
-
+import { SettingsObjectFieldDataType } from '@/settings/data-model/object-details/components/SettingsObjectFieldDataType';
import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -23,9 +20,7 @@ import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useMemo, useState } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
-
+import { LightIconButton, useToast } from 'twenty-ui/components';
import {
IconEye,
IconPlus,
@@ -34,9 +29,10 @@ import {
useIcons,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { Card } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
type SettingsObjectSearchSectionProps = {
objectMetadataItem: EnrichedObjectMetadataItem;
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx
index 8cbc1c2bfc1..32c2a956024 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx
@@ -5,8 +5,8 @@ import { useContext } from 'react';
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconBox } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type SettingsDataModelObjectPreviewProps = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
index a17351c9dac..8c05c2bdccc 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
@@ -1,6 +1,6 @@
-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
import { useGetIsMetadataItemCustom } from '@/object-metadata/hooks/useGetIsMetadataItemCustom';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';
import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSwitch';
import { OBJECT_NAME_MAXIMUM_LENGTH } from '@/settings/data-model/constants/ObjectNameMaximumLength';
@@ -16,9 +16,9 @@ import { useContext } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { capitalize, isDefined } from 'twenty-shared/utils';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
+import { InlineBanner } from 'twenty-ui/components';
import { IconInfoCircle, IconLink, IconRefresh } from 'twenty-ui/icon';
-import { Tooltip, Card } from 'twenty-ui/primitives/surfaces';
+import { Card, Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type StringKeyOf } from 'type-fest';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
index 2e687721e83..ed6795cd8f1 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
@@ -3,10 +3,10 @@ import { styled } from '@linaria/react';
import { WEBHOOK_TABLE_ROW_GRID_TEMPLATE_COLUMNS } from '@/settings/developers/constants/WebhookTableRowGridTemplateColumns';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { useContext } from 'react';
import { getUrlHostnameOrThrow, isValidUrl } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronRight } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type Webhook } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx b/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx
index c2660dc7dfa..a3b783a133b 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsDevelopersWebhookForm.stories.tsx
@@ -4,7 +4,7 @@ import { expect, within } from 'storybook/test';
import { SettingsDevelopersWebhookForm } from '@/settings/developers/components/SettingsDevelopersWebhookForm';
import { WebhookFormMode } from '@/settings/developers/constants/WebhookFormMode';
-import { Toaster } from 'twenty-ui/primitives/feedback';
+import { Toaster } from 'twenty-ui/components';
import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
diff --git a/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx b/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx
index 8cc5273765f..9bdec665d71 100644
--- a/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx
@@ -20,8 +20,8 @@ jest.mock('~/hooks/useNavigateSettings', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.ts b/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.ts
index a67cc4b002e..a1d5c40437f 100644
--- a/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.ts
+++ b/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.ts
@@ -17,7 +17,7 @@ import {
import { useMutation, useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
CreateWebhookDocument,
DeleteWebhookDocument,
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
index 80ec13c32a9..1f607447e7b 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
@@ -1,24 +1,23 @@
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
+import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { CheckPublicDomainValidRecordsEffect } from '@/settings/domains/components/CheckPublicDomainValidRecordsEffect';
import { SettingsDomainRecords } from '@/settings/domains/components/SettingsDomainRecords';
import { useCheckPublicDomainValidRecords } from '@/settings/domains/hooks/useCheckPublicDomainValidRecords';
import { getDomainValidationSchema } from '@/settings/domains/utils/getDomainValidationSchema';
import { TextInput } from '@/ui/input/components/TextInput';
import { useMutation, useQuery } from '@apollo/client/react';
-import { isNonEmptyString } from '@sniptt/guards';
import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconReload, IconTrash } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
index b9900e28584..8d2ed458248 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
@@ -1,4 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -6,9 +5,9 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useMutation, useQuery } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
+import { LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { LightIconButton } from 'twenty-ui/components';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import {
type PublicDomain,
DeletePublicDomainDocument,
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx
index c505294a616..8511d142a93 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx
@@ -2,14 +2,14 @@ import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { isCloudflareIntegrationEnabledState } from '@/client-config/states/isCloudflareIntegrationEnabledState';
import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
import { SettingsCard } from '@/settings/components/SettingsCard';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Status } from 'twenty-ui/primitives/data-display';
import { IconWorld, IconWorldWww } from 'twenty-ui/icon';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { Status } from 'twenty-ui/primitives/data-display';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/domains/hooks/useCheckCustomDomainValidRecords.ts b/packages/twenty-front/src/modules/settings/domains/hooks/useCheckCustomDomainValidRecords.ts
index 40e2fc68d2c..850b6c43d12 100644
--- a/packages/twenty-front/src/modules/settings/domains/hooks/useCheckCustomDomainValidRecords.ts
+++ b/packages/twenty-front/src/modules/settings/domains/hooks/useCheckCustomDomainValidRecords.ts
@@ -4,7 +4,7 @@ import { customDomainRecordsState } from '@/settings/domains/states/customDomain
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useMutation } from '@apollo/client/react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { CheckCustomDomainValidRecordsDocument } from '~/generated-metadata/graphql';
export const useCheckCustomDomainValidRecords = () => {
diff --git a/packages/twenty-front/src/modules/settings/domains/hooks/useCheckPublicDomainValidRecords.ts b/packages/twenty-front/src/modules/settings/domains/hooks/useCheckPublicDomainValidRecords.ts
index 4d526cd9097..fbe967cb031 100644
--- a/packages/twenty-front/src/modules/settings/domains/hooks/useCheckPublicDomainValidRecords.ts
+++ b/packages/twenty-front/src/modules/settings/domains/hooks/useCheckPublicDomainValidRecords.ts
@@ -3,7 +3,7 @@ import { publicDomainRecordsState } from '@/settings/domains/states/publicDomain
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useMutation } from '@apollo/client/react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { CheckPublicDomainValidRecordsDocument } from '~/generated-metadata/graphql';
export const useCheckPublicDomainValidRecords = () => {
diff --git a/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsCustomDomain.ts b/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsCustomDomain.ts
index 2f0c20fff22..d94d539115c 100644
--- a/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsCustomDomain.ts
+++ b/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsCustomDomain.ts
@@ -9,7 +9,7 @@ import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
export const useSettingsCustomDomain = () => {
diff --git a/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsSubdomain.ts b/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsSubdomain.ts
index ceddf5ac4fe..60c1bfc09d2 100644
--- a/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsSubdomain.ts
+++ b/packages/twenty-front/src/modules/settings/domains/hooks/useSettingsSubdomain.ts
@@ -9,7 +9,7 @@ import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
export const SUBDOMAIN_CHANGE_CONFIRMATION_MODAL_ID =
diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
index f121d7a9cc8..ca95eb63fc5 100644
--- a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
+++ b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
@@ -5,7 +5,7 @@ import { Button } from 'twenty-ui/primitives/input';
import { VerifyEmailingDomainDocument } from '~/generated-metadata/graphql';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type SettingsEmailingDomainVerifyButtonProps = {
emailingDomainId: string;
diff --git a/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx b/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
index 82daae57c3e..66adc5776a0 100644
--- a/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
+++ b/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
@@ -1,17 +1,17 @@
-import { Dialog } from 'twenty-ui/primitives/surfaces';
-import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { SubTitle } from '@/auth/components/SubTitle';
import { Title } from '@/auth/components/Title';
import { SubscriptionBenefit } from '@/settings/billing/components/SubscriptionBenefit';
import { ENTERPRISE_CHECKOUT_SESSION } from '@/settings/enterprise/graphql/queries/enterpriseCheckoutSession';
+import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useApolloClient } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { Loader, useToast } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/components';
-import { CardPicker, RadioGroup } from 'twenty-ui/primitives/input';
+import { CardPicker, MainButton, useToast } from 'twenty-ui/components';
+import { Loader } from 'twenty-ui/primitives/feedback';
+import { RadioGroup } from 'twenty-ui/primitives/input';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCheckoutButton = styled(MainButton)`
diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx
index 029ae4174ee..e950a023c61 100644
--- a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx
+++ b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx
@@ -1,13 +1,14 @@
import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { type EventLogFiltersState } from '@/settings/event-logs/types/EventLogFiltersState';
-import { InputLabel, type SelectOption } from 'twenty-ui/primitives/input';
import { Select } from '@/ui/input/components/Select';
import { TextInput } from '@/ui/input/components/TextInput';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { IconBox, IconUser, useIcons } from 'twenty-ui/icon';
+import { type SelectOption } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { EventLogTable } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogJsonCell.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogJsonCell.tsx
index e5592b2dbfc..7eb87c08a20 100644
--- a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogJsonCell.tsx
+++ b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogJsonCell.tsx
@@ -2,15 +2,12 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useRef, useState } from 'react';
-import { JsonDisplay } from 'twenty-ui/primitives/data-display';
+import { JsonDisplay } from '@/ui/field/display/components/JsonDisplay/JsonDisplay';
import { ExpandedFieldDisplay } from '@/ui/layout/expandable-list/components/ExpandedFieldDisplay';
-import { type JsonValue } from 'type-fest';
import { isDefined } from 'twenty-shared/utils';
-import {
- isTwoFirstDepths,
- JsonTree,
-} from 'twenty-ui/primitives/json-visualizer';
+import { JsonTree } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { type JsonValue } from 'type-fest';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
type EventLogJsonCellProps = {
@@ -54,7 +51,6 @@ export const EventLogJsonCell = ({ value }: EventLogJsonCellProps) => {
>
<JsonTree
value={value as JsonValue}
- shouldExpandNodeInitially={isTwoFirstDepths}
emptyArrayLabel={t`Empty Array`}
emptyObjectLabel={t`Empty Object`}
emptyStringLabel={t`[empty string]`}
diff --git a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
index 509aac02112..8f77bbdbacf 100644
--- a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
+++ b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
@@ -13,7 +13,6 @@ import {
import { currentUserState } from '@/auth/states/currentUserState';
import { billingState } from '@/client-config/states/billingState';
import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
import {
jotaiStore,
resetJotaiStore,
@@ -22,6 +21,7 @@ import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { Provider as JotaiProvider } from 'jotai';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
+import { ToastProvider } from 'twenty-ui/components';
import { messages } from '~/locales/generated/en';
i18n.load({
diff --git a/packages/twenty-front/src/modules/settings/legal/components/DpaNotice.tsx b/packages/twenty-front/src/modules/settings/legal/components/DpaNotice.tsx
index e9e488148d4..a45d4b627d2 100644
--- a/packages/twenty-front/src/modules/settings/legal/components/DpaNotice.tsx
+++ b/packages/twenty-front/src/modules/settings/legal/components/DpaNotice.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { Info } from 'twenty-ui/primitives/feedback';
+import { Info } from 'twenty-ui/components';
const StyledFullWidthInfo = styled.div`
& > * {
diff --git a/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementsTable.tsx b/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementsTable.tsx
index f8ce847fa47..62b0db9c091 100644
--- a/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementsTable.tsx
@@ -12,7 +12,7 @@ import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
const StyledTableBodyContainer = styled.div`
border-bottom: 1px solid ${themeCssVariables.border.color.light};
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx
index a394d27f456..b8973369379 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx
@@ -7,7 +7,7 @@ import { SettingsLogicFunctionWorkflowActionTriggerSection } from '@/settings/lo
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Callout } from 'twenty-ui/primitives/feedback';
+import { Callout } from 'twenty-ui/components';
import { IconInfoCircle } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx
index b26a9e9308e..167bae6884c 100644
--- a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx
+++ b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx
@@ -3,9 +3,9 @@ import { isDefined } from 'twenty-shared/utils';
import { type McpSetupCard } from '@/settings/mcp-and-apis/types/McpSetup';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
-import { Pill } from 'twenty-ui/primitives/data-display';
import { IconExternalLink } from 'twenty-ui/icon';
-import { Tooltip, Card, CardContent } from 'twenty-ui/primitives/surfaces';
+import { Pill } from 'twenty-ui/primitives/data-display';
+import { Card, CardContent, Tooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
const StyledCardContent = styled(CardContent)`
diff --git a/packages/twenty-front/src/modules/settings/mcp-and-apis/hooks/useOpenPlayground.ts b/packages/twenty-front/src/modules/settings/mcp-and-apis/hooks/useOpenPlayground.ts
index e7a5645c7c6..7f8ac70fe32 100644
--- a/packages/twenty-front/src/modules/settings/mcp-and-apis/hooks/useOpenPlayground.ts
+++ b/packages/twenty-front/src/modules/settings/mcp-and-apis/hooks/useOpenPlayground.ts
@@ -11,7 +11,7 @@ import {
import { type PlaygroundSchemas } from '@/settings/mcp-and-apis/types/PlaygroundSchemas';
import { PlaygroundTypes } from '@/settings/mcp-and-apis/types/PlaygroundTypes';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { GeneratePlaygroundTokenDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
index d80d00c83f1..f75e4638852 100644
--- a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
+++ b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
@@ -10,9 +10,8 @@ import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconArrowUpRight, IconUser, useIcons } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { UpdateWorkspaceMemberRoleDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
index 76aada533a8..deb71b782a0 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
@@ -10,8 +10,7 @@ import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx
index 3c763b2848b..9497e460344 100644
--- a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu.tsx
@@ -1,14 +1,12 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { useMutation } from '@apollo/client/react';
-import { t } from '@lingui/core/macro';
-
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 { useToast } from 'twenty-ui/primitives/feedback';
+import { useMutation } from '@apollo/client/react';
+import { t } from '@lingui/core/macro';
+import { LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical, IconLogout } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import {
CurrentUserSessionsDocument,
RevokeUserSessionDocument,
diff --git a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
index 5583d156bb1..f9eee32ed1e 100644
--- a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
@@ -8,8 +8,7 @@ import { SettingsListCard } from '@/settings/components/SettingsListCard';
import { SettingsDeviceSessionRowRightComponent } from '@/settings/profile/devices/components/SettingsDeviceSessionRowRightComponent';
import { parseUserAgentDescription } from '@/settings/profile/devices/utils/parseUserAgentDescription';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { IconDeviceDesktop, IconLogout } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/profile/hooks/useUpdateEmail.ts b/packages/twenty-front/src/modules/settings/profile/hooks/useUpdateEmail.ts
index eb478db5610..0a67ad7cd5f 100644
--- a/packages/twenty-front/src/modules/settings/profile/hooks/useUpdateEmail.ts
+++ b/packages/twenty-front/src/modules/settings/profile/hooks/useUpdateEmail.ts
@@ -6,7 +6,7 @@ import { currentUserState } from '@/auth/states/currentUserState';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { UpdateUserEmailDocument } from '~/generated-metadata/graphql';
export const useUpdateEmail = () => {
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
index 65d20dd5990..fdec830095a 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
@@ -1,17 +1,17 @@
+import { SettingsRolesTableHeader } from '@/settings/roles/components/SettingsRolesTableHeader';
+import { SettingsRolesTableRow } from '@/settings/roles/components/SettingsRolesTableRow';
+import { useSettingsAllRoles } from '@/settings/roles/hooks/useSettingsAllRoles';
+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
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 { Table } from '@/ui/layout/table/components/Table';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { SettingsRolesTableHeader } from '@/settings/roles/components/SettingsRolesTableHeader';
-import { SettingsRolesTableRow } from '@/settings/roles/components/SettingsRolesTableRow';
-import { useSettingsAllRoles } from '@/settings/roles/hooks/useSettingsAllRoles';
-import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
-import { TableCell } from '@/ui/layout/table/components/TableCell';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
-import { SettingsRow, Section } from 'twenty-ui/components';
+import { Section, SettingsRow } from 'twenty-ui/components';
import {
IconFilter,
IconKey,
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
index cb80bb756ef..81892406d50 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
@@ -1,20 +1,20 @@
import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { UserContext } from '@/users/contexts/UserContext';
-import { useContext } from 'react';
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import { t } from '@lingui/core/macro';
+import { useContext } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconKey, useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type Agent, type ApiKeyForRole } from '~/generated-metadata/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
import { formatDateString } from '~/utils/string/formatDateString';
-import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
const StyledIconWrapper = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
index 550648bfa39..ac0a65f45b3 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
@@ -1,10 +1,11 @@
import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { ListItem, MenuItemAvatar } from 'twenty-ui/primitives/navigation';
+import { MenuItemAvatar } from 'twenty-ui/components';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { type SearchRecord } from '~/generated/graphql';
-import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
type SettingsRoleAssignmentWorkspaceMemberPickerDropdownContentProps = {
loading: boolean;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx
index 909044c0e89..b5e03ff4da1 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx
@@ -11,7 +11,7 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledNameLabel = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
index 23b848fdd5e..c7eae039e20 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
@@ -3,10 +3,11 @@ 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 { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { t } from '@lingui/core/macro';
-import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/components';
-import { ListItem, UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
type SettingsRolePermissionsObjectLevelTableRowOptionsDropdownProps = {
roleId: string;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx
index 3194abf9f78..ef0870a5e66 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx
@@ -10,7 +10,7 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledSectionHeader = styled.div`
@@ -102,7 +102,7 @@ export const SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHead
return (
<>
<StyledSectionHeader>
- <Label>{t`All`}</Label>
+ <StyledDisplayLabel>{t`All`}</StyledDisplayLabel>
<div></div>
<>
{shouldShowEmptyTableHeader && <div />}
@@ -131,3 +131,9 @@ export const SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHead
</>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx
index f8ee385c38d..6c419d3bd26 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx
@@ -1,9 +1,9 @@
+import { AnimatedRotate } from '@/settings/roles/role-permissions/object-level-permissions/object-form/components/internal/AnimatedRotate/AnimatedRotate';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { IconReload, IconX } from 'twenty-ui/icon';
import { Checkbox } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedRotate } from 'twenty-ui/primitives/layout';
export type OverridableCheckboxType = 'default' | 'override' | 'no_cta';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/internal/AnimatedRotate/AnimatedRotate.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/internal/AnimatedRotate/AnimatedRotate.tsx
new file mode 100644
index 00000000000..a854a930dea
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/internal/AnimatedRotate/AnimatedRotate.tsx
@@ -0,0 +1,67 @@
+import { css } from '@linaria/core';
+import { clsx } from 'clsx';
+import { type JSX } from 'react';
+
+import { type AnimationDuration } from 'twenty-ui/theme';
+
+const styles = {
+ container: css`
+ & {
+ --animated-rotate-duration: calc(var(--t-animation-duration-fast) * 1s);
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ animation: animated-rotate-animatedRotateIn
+ var(--animated-rotate-duration) ease;
+ }
+ &[data-duration='instant'] {
+ --animated-rotate-duration: calc(
+ var(--t-animation-duration-instant) * 1s
+ );
+ }
+ &[data-duration='normal'] {
+ --animated-rotate-duration: calc(var(--t-animation-duration-normal) * 1s);
+ }
+ &[data-duration='slow'] {
+ --animated-rotate-duration: calc(var(--t-animation-duration-slow) * 1s);
+ }
+
+ @keyframes animated-rotate-animatedRotateIn {
+ from {
+ opacity: 0;
+ transform: rotate(-90deg);
+ }
+ to {
+ opacity: 1;
+ transform: rotate(0deg);
+ }
+ }
+ `,
+ animateOnHover: css`
+ & {
+ transition: transform calc(var(--t-animation-duration-fast) * 1s) ease;
+ }
+ &:hover {
+ transform: rotate(45deg);
+ }
+ `,
+};
+
+type AnimatedRotateProps = {
+ children?: React.ReactNode;
+ duration?: AnimationDuration;
+ animateOnHover?: boolean;
+};
+
+export const AnimatedRotate = ({
+ children,
+ duration = 'fast',
+ animateOnHover,
+}: AnimatedRotateProps): JSX.Element => (
+ <div
+ className={clsx(styles.container, animateOnHover && styles.animateOnHover)}
+ data-duration={duration}
+ >
+ {children}
+ </div>
+);
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
index 31cd067bf9a..56fa4985a7f 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
@@ -3,8 +3,8 @@ import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
/* @license Enterprise */
import {
- compositeTypeDefinitions,
FieldMetadataType,
+ compositeTypeDefinitions,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
@@ -28,8 +28,8 @@ import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/Gene
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
type SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenuProps =
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
index 23621ce9210..2c9d8e8380d 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
@@ -6,9 +6,9 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import {
- compositeTypeDefinitions,
- FieldMetadataType,
CoreObjectNameSingular,
+ FieldMetadataType,
+ compositeTypeDefinitions,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { IconUserCircle, IconX, useIcons } from 'twenty-ui/icon';
diff --git a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx
index 975b282f1a9..5e5128b1e23 100644
--- a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx
@@ -22,7 +22,7 @@ import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconLock, IconSettings, IconUserPlus } from 'twenty-ui/icon';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx
index a751f013357..cb6adf72c32 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx
@@ -9,7 +9,7 @@ import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { capitalize } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconGoogle, IconMicrosoft, IconPassword } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx
index 7b84a0fdc45..80dcc5457c5 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx
@@ -13,7 +13,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { ConnectedAccountProvider } from 'twenty-shared/types';
import { capitalize } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
IconGoogle,
IconLink,
@@ -29,8 +29,8 @@ import {
WorkspaceDiscoverability,
} from '~/generated-metadata/graphql';
-import { TwoFactorAuthenticationSwitch } from './TwoFactorAuthenticationSwitch';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { TwoFactorAuthenticationSwitch } from './TwoFactorAuthenticationSwitch';
const StyledSettingsSecurityOptionsList = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
index 94b37b85ffc..4465581a518 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
@@ -1,8 +1,8 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { EDITABLE_PROFILE_FIELDS_DROPDOWN_ID } from '@/settings/security/constants/EditableProfileFields.constants';
import { SelectControl } from '@/ui/input/components/SelectControl';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -11,7 +11,7 @@ import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
IconMail,
IconPhoto,
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
index 0ca5fe02b3f..4723ac95362 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
@@ -19,7 +19,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconClockHour8, IconHistory, IconTrash } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -29,8 +29,6 @@ import { OrganizationAdornment } from '~/pages/settings/enterprise/components/Or
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledContainer = styled.div`
width: 100%;
`;
diff --git a/packages/twenty-front/src/modules/settings/security/components/TwoFactorAuthenticationSwitch.tsx b/packages/twenty-front/src/modules/settings/security/components/TwoFactorAuthenticationSwitch.tsx
index 0dbdfc60c30..3f9ca6aed17 100644
--- a/packages/twenty-front/src/modules/settings/security/components/TwoFactorAuthenticationSwitch.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/TwoFactorAuthenticationSwitch.tsx
@@ -5,7 +5,7 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconLifebuoy } from 'twenty-ui/icon';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
index 72662308fb1..23356547aa1 100644
--- a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
@@ -1,4 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { approvedAccessDomainsState } from '@/settings/security/states/ApprovedAccessDomainsState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -8,9 +7,9 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton, useToast } from 'twenty-ui/components';
import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { LightIconButton } from 'twenty-ui/components';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import {
type ApprovedAccessDomain,
DeleteApprovedAccessDomainDocument,
diff --git a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainValidationEffect.tsx b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainValidationEffect.tsx
index dfd587bc3e0..edcc45f9c5d 100644
--- a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainValidationEffect.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainValidationEffect.tsx
@@ -5,7 +5,7 @@ import { t } from '@lingui/core/macro';
import { useEffect } from 'react';
import { useSearchParams } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { ValidateApprovedAccessDomainDocument } from '~/generated-metadata/graphql';
export const SettingsSecurityApprovedAccessDomainValidationEffect = () => {
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx
index 233f2fe9774..4d49d591b74 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx
@@ -1,4 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { useDeleteSsoIdentityProvider } from '@/settings/security/hooks/useDeleteSsoIdentityProvider';
import { useUpdateSsoIdentityProvider } from '@/settings/security/hooks/useUpdateSsoIdentityProvider';
import { type SsoIdentityProvider } from '@/settings/security/types/SsoIdentityProvider';
@@ -8,9 +7,9 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { LightIconButton, useToast } from 'twenty-ui/components';
import { IconArchive, IconDotsVertical, IconTrash } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { SsoIdentityProviderStatus } from '~/generated-metadata/graphql';
type SettingsSecuritySsoRowDropdownMenuProps = {
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
index 35e9e8e1f3a..a0de017c883 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
@@ -5,7 +5,7 @@ import { useLingui } from '@lingui/react/macro';
import { type ChangeEvent, useContext, useRef } from 'react';
import { useFormContext } from 'react-hook-form';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconCheck, IconCopy, IconDownload, IconUpload } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
@@ -14,8 +14,6 @@ import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
/* @license Enterprise */
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledUploadFileContainer = styled.div`
align-items: center;
display: flex;
diff --git a/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx b/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx
index 0340960e10a..739299a7855 100644
--- a/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx
+++ b/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx
@@ -1,4 +1,3 @@
-import { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';
import { MetadataTranslationValueCell } from '@/settings/translations/components/MetadataTranslationValueCell';
import {
type MetadataTranslationRow,
@@ -15,11 +14,11 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Section, LightIconButton } from 'twenty-ui/components';
+import { LightIconButton, Section } from 'twenty-ui/components';
import { IconRestore } from 'twenty-ui/icon';
-
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { MetadataTranslationProvenance } from '~/generated-metadata/graphql';
+import { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';
const TRANSLATIONS_ROW_GRID_TEMPLATE_COLUMNS = '112px 1fr 24px';
diff --git a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
index 28a84d8871f..66fa11b0612 100644
--- a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
+++ b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
@@ -11,8 +11,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { DeleteTwoFactorAuthenticationMethodDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/TwoFactorAuthenticationSetupForSettingsEffect.tsx b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/TwoFactorAuthenticationSetupForSettingsEffect.tsx
index 8ee9ecf2874..b33c6cef46d 100644
--- a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/TwoFactorAuthenticationSetupForSettingsEffect.tsx
+++ b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/TwoFactorAuthenticationSetupForSettingsEffect.tsx
@@ -6,7 +6,7 @@ import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { useEffect } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { InitiateOtpProvisioningForAuthenticatedUserDocument } from '~/generated-metadata/graphql';
export const TwoFactorAuthenticationSetupForSettingsEffect = () => {
diff --git a/packages/twenty-front/src/modules/settings/two-factor-authentication/hooks/useTwoFactorVerificationForSettings.ts b/packages/twenty-front/src/modules/settings/two-factor-authentication/hooks/useTwoFactorVerificationForSettings.ts
index 95bb4819402..1fc10dfa22c 100644
--- a/packages/twenty-front/src/modules/settings/two-factor-authentication/hooks/useTwoFactorVerificationForSettings.ts
+++ b/packages/twenty-front/src/modules/settings/two-factor-authentication/hooks/useTwoFactorVerificationForSettings.ts
@@ -6,7 +6,7 @@ import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { useForm } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
export const useTwoFactorVerificationForSettings = () => {
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx
index 4b960638bce..84b7cbb826a 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { useDebounce } from 'use-debounce';
import { isDefined } from 'twenty-shared/utils';
+import { useDebounce } from 'use-debounce';
import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';
import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';
@@ -10,12 +10,12 @@ import { SettingsPaginationControls } from '@/settings/components/SettingsPagina
import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { SettingsTableListSection } from '@/settings/components/SettingsTableListSection';
import { SettingsUnsubscribersFilterDropdown } from '@/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown';
-import { SETTINGS_UNSUBSCRIBERS_ALL_FILTER } from '@/settings/unsubscribers/constants/SettingsUnsubscribersAllFilter';
import { MESSAGE_SUPPRESSIONS_PAGE_SIZE } from '@/settings/unsubscribers/constants/MessageSuppressionsPageSize';
+import { SETTINGS_UNSUBSCRIBERS_ALL_FILTER } from '@/settings/unsubscribers/constants/SettingsUnsubscribersAllFilter';
import { useMessageSuppressions } from '@/settings/unsubscribers/hooks/useMessageSuppressions';
import { getMessageSuppressionReasonBadge } from '@/settings/unsubscribers/utils/getMessageSuppressionReasonBadge';
+import { SearchInput } from 'twenty-ui/components';
import { Status } from 'twenty-ui/primitives/data-display';
-import { SearchInput } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
MessageSuppressionReason,
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
index 5d90f1f51e7..f3ddba4a15b 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
@@ -9,10 +9,9 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
-import { Section } from 'twenty-ui/components';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import { SearchInput, Section } from 'twenty-ui/components';
import { IconChevronRight } from 'twenty-ui/icon';
-import { SearchInput } from 'twenty-ui/primitives/input';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type UsageOperationType } from '~/generated-metadata/graphql';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
diff --git a/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsx b/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsx
index b9c8d88faa8..9d949917693 100644
--- a/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsx
@@ -10,7 +10,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useMutation } from '@apollo/client/react';
import { FileFolder } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { UploadWorkspaceMemberProfilePictureDocument } from '~/generated-metadata/graphql';
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/ImpersonationSwitch.tsx b/packages/twenty-front/src/modules/settings/workspace/components/ImpersonationSwitch.tsx
index ac6c03deef8..a3caba381ba 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/ImpersonationSwitch.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/ImpersonationSwitch.tsx
@@ -9,7 +9,7 @@ import { IconLifebuoy } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const ImpersonationSwitch = () => {
const { enqueueToast } = useToast();
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx
index 205a8e3391f..4c68c8bcb79 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { type MessageChannel } from '@/accounts/types/MessageChannel';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledNameCell = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx
index 16a7374dae9..77c8a7535b2 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx
@@ -5,8 +5,7 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { IconMail } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
index c49ab0eaca7..c17d15927f5 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
@@ -8,9 +8,8 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { IconButton, MenuItem } from 'twenty-ui/components';
import { IconChevronLeft } from 'twenty-ui/icon';
-import { IconButton } from 'twenty-ui/components';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledNavigationIcon = styled.div`
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx
index 841feb7af65..5051b65a3cd 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx
@@ -3,7 +3,7 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { Fragment } from 'react/jsx-runtime';
import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type SidePanelNavigationStackItem } from '@/side-panel/states/sidePanelNavigationStackState';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx
index ce535ca22c6..3afa383e6e0 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import React from 'react';
-import { Label } from 'twenty-ui/primitives/typography';
import { isDefined } from 'twenty-shared/utils';
+import { Text } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledGroupHeadingContainer = styled.div`
@@ -31,9 +31,15 @@ export const SidePanelGroup = ({ heading, children }: SidePanelGroupProps) => {
return (
<>
<StyledGroupHeadingContainer>
- <Label>{heading}</Label>
+ <StyledDisplayLabel>{heading}</StyledDisplayLabel>
</StyledGroupHeadingContainer>
<StyledGroup>{children}</StyledGroup>
</>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner.tsx
new file mode 100644
index 00000000000..e751c72c40a
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner.tsx
@@ -0,0 +1,74 @@
+import { css } from '@linaria/core';
+import { clsx } from 'clsx';
+import { isDefined } from 'twenty-ui/utilities';
+
+import { IconAlertTriangle, IconInfoCircle } from 'twenty-ui/icon';
+import { Tooltip } from 'twenty-ui/primitives/surfaces';
+
+const styles = {
+ banner: css`
+ & {
+ align-items: center;
+ background-color: var(--t-accent-secondary);
+ border-radius: var(--t-border-radius-md);
+ box-sizing: border-box;
+ display: flex;
+ gap: var(--t-spacing-2);
+ padding: var(--t-spacing-2);
+ width: 100%;
+ }
+ `,
+ iconContainer: css`
+ & {
+ align-items: center;
+ color: var(--t-color-blue);
+ display: flex;
+ flex-shrink: 0;
+ height: 16px;
+ justify-content: center;
+ width: 16px;
+ }
+ `,
+ message: css`
+ & {
+ color: var(--t-color-blue);
+ flex-grow: 1;
+ font-family: var(--t-font-family);
+ font-size: var(--t-font-size-sm);
+ font-style: normal;
+ font-weight: var(--t-font-weight-medium);
+ line-height: 1.4;
+ margin: 0;
+ min-width: 0;
+ }
+ `,
+};
+
+import { type SidePanelInformationBannerProps } from './types/SidePanelInformationBannerProps';
+
+export const SidePanelInformationBanner = ({
+ message,
+ className,
+ variant = 'default',
+ tooltipMessage,
+}: SidePanelInformationBannerProps) => {
+ return (
+ <Tooltip
+ content={tooltipMessage}
+ disabled={!isDefined(tooltipMessage)}
+ side="bottom"
+ delay={500}
+ >
+ <div className={clsx(styles.banner, className)}>
+ <div className={styles.iconContainer}>
+ {variant === 'default' ? (
+ <IconInfoCircle size={16} />
+ ) : (
+ <IconAlertTriangle size={16} />
+ )}
+ </div>
+ <p className={styles.message}>{message}</p>
+ </div>
+ </Tooltip>
+ );
+};
diff --git a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
similarity index 80%
rename from packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
rename to packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
index d318279f060..ac31d380722 100644
--- a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
@@ -1,6 +1,9 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
-import { SidePanelInformationBanner } from '@ui/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner';
+import {
+ A11Y_DEFER_COLOR_CONTRAST,
+ ComponentDecorator,
+} from 'twenty-ui/testing';
+import { SidePanelInformationBanner } from '@/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner';
const meta: Meta<typeof SidePanelInformationBanner> = {
title: 'UI/Feedback/SidePanelInformationBanner',
diff --git a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/types/SidePanelInformationBannerProps.ts b/packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/types/SidePanelInformationBannerProps.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/types/SidePanelInformationBannerProps.ts
rename to packages/twenty-front/src/modules/side-panel/components/SidePanelInformationBanner/types/SidePanelInformationBannerProps.ts
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
index df67b93b527..fed7e158cdc 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
@@ -1,11 +1,3 @@
-import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
-import { OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS } from 'twenty-shared/constants';
-import { SettingsRow } from 'twenty-ui/components';
-import { TintedIconTile } from 'twenty-ui/primitives/data-display';
-import { IconCube } from 'twenty-ui/icon';
-import { ListItem } from 'twenty-ui/primitives/navigation';
-
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';
import { OBJECT_FILTER_DROPDOWN_ID } from '@/side-panel/components/SidePanelObjectFilterDropdown';
@@ -21,6 +13,12 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
+import { useLingui } from '@lingui/react/macro';
+import { useState } from 'react';
+import { OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS } from 'twenty-shared/constants';
+import { SettingsRow, TintedIconTile } from 'twenty-ui/components';
+import { IconCube } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
const ALL_OBJECTS_ITEM_ID = 'all-objects';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
index d083bb9b228..2d5545381e8 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
@@ -12,10 +12,9 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { IconButton, useToast } from 'twenty-ui/components';
import { IconCalendarEvent, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { IconButton } from 'twenty-ui/components';
import { getOsControlSymbol } from 'twenty-ui/utilities';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsx
index ea03ac78b9f..28d60db3c3c 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { IconFrame, IconSquare } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconFrame, IconSquare } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { StyledEmailFieldLabel } from '@/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsx
index 5ba37dc2cbd..437c89c2d39 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsx
@@ -2,12 +2,12 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type Editor } from '@tiptap/core';
import {
+ TIPTAP_NODE_TYPES,
isDefined,
resolveCanvasTheme,
- TIPTAP_NODE_TYPES,
} from 'twenty-shared/utils';
-import { IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconTrash } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { activeEmailEditorState } from '@/activities/emails/states/activeEmailEditorState';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
index eca4f453e64..910cd2a3eb4 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
@@ -1,7 +1,7 @@
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { SidePanelInformationBanner } from '@/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
-import { SidePanelInformationBanner } from 'twenty-ui/primitives/feedback';
type ChartFiltersDeletedFieldsWarningProps = {
validFieldMetadataIds: Set<string>;
};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
index 0d839116d13..608e31fe0e6 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
@@ -13,7 +13,7 @@ import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/reco
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx
index b450600bd1a..664c1d6c3f1 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx
@@ -1,6 +1,6 @@
+import { SidePanelInformationBanner } from '@/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner';
import { getChartLimitMessage } from '@/side-panel/pages/page-layout/utils/getChartLimitMessage';
import { t } from '@lingui/core/macro';
-import { SidePanelInformationBanner } from 'twenty-ui/primitives/feedback';
import { type WidgetConfigurationType } from '~/generated-metadata/graphql';
type ChartLimitInfoBannerProps = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartTypeSelectionSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartTypeSelectionSection.tsx
index 388018298aa..b931a513b8a 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartTypeSelectionSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartTypeSelectionSection.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { GraphType } from '@/side-panel/pages/page-layout/types/GraphType';
import { t } from '@lingui/core/macro';
-import { MenuPicker } from 'twenty-ui/primitives/navigation';
+import { MenuPicker } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const graphTypeOptions = [
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
index 7455cd39ccb..a15b6650201 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
@@ -4,10 +4,10 @@ import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
-import { getManualSortOrderFromConfig } from '@/side-panel/pages/page-layout/utils/getManualSortOrderFromConfig';
-import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { sortOptionsForManualOrder } from '@/page-layout/widgets/graph/utils/sortOptionsForManualOrder';
+import { getManualSortOrderFromConfig } from '@/side-panel/pages/page-layout/utils/getManualSortOrderFromConfig';
+import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
@@ -15,9 +15,9 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/primitives/data-display';
+import { MenuItemDraggable } from 'twenty-ui/components';
import { IconChevronLeft } from 'twenty-ui/icon';
-import { MenuItemDraggable } from 'twenty-ui/primitives/navigation';
+import { Tag } from 'twenty-ui/primitives/data-display';
import { type WidgetConfiguration } from '~/generated-metadata/graphql';
import { moveArrayItem } from '~/utils/array/moveArrayItem';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx
index f9a533b6802..f1e1bec28ac 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx
@@ -1,4 +1,3 @@
-import { Tag } from 'twenty-ui/primitives/data-display';
import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
@@ -9,6 +8,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { Tag } from 'twenty-ui/primitives/data-display';
import { ListItem } from 'twenty-ui/primitives/navigation';
import { type ThemeColor } from 'twenty-ui/theme';
import { AggregateOperations } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx
index 853db9ab53d..a89067c2f74 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx
@@ -1,7 +1,8 @@
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { useState } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { ChartManualSortSubMenuContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent';
import { AGGREGATE_SORT_BY_OPTIONS } from '@/side-panel/pages/page-layout/constants/AggregateSortByOptions';
import { useGraphGroupBySortOptionLabels } from '@/side-panel/pages/page-layout/hooks/useGraphGroupBySortOptionLabels';
@@ -12,7 +13,6 @@ import { filterSortOptionsByFieldType } from '@/side-panel/pages/page-layout/uti
import { getDefaultManualSortOrder } from '@/side-panel/pages/page-layout/utils/getDefaultManualSortOrder';
import { getSortIconForFieldType } from '@/side-panel/pages/page-layout/utils/getSortIconForFieldType';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx
index e99d98730de..fb527c08052 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx
@@ -1,7 +1,8 @@
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { useState } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { ChartManualSortSubMenuContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent';
import { X_SORT_BY_OPTIONS } from '@/side-panel/pages/page-layout/constants/XSortByOptions';
import { useGraphXSortOptionLabels } from '@/side-panel/pages/page-layout/hooks/useGraphXSortOptionLabels';
@@ -12,7 +13,6 @@ import { filterSortOptionsByFieldType } from '@/side-panel/pages/page-layout/uti
import { getDefaultManualSortOrder } from '@/side-panel/pages/page-layout/utils/getDefaultManualSortOrder';
import { getSortIconForFieldType } from '@/side-panel/pages/page-layout/utils/getSortIconForFieldType';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
index d74838f8d57..55456a8793b 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
@@ -1,12 +1,10 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { LightIconButton } from 'twenty-ui/components';
import { useActiveFieldMetadataItems } from '@/object-metadata/hooks/useActiveFieldMetadataItems';
import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
import { useUpdateRecordField } from '@/object-record/record-field/hooks/useUpdateRecordField';
import { useUpsertRecordField } from '@/object-record/record-field/hooks/useUpsertRecordField';
import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';
import { type RecordField } from '@/object-record/record-field/types/RecordField';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -14,7 +12,9 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import { IconChevronLeft, IconEye, useIcons } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { v4 } from 'uuid';
import { sortByProperty } from '~/utils/array/sortByProperty';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
index 8b08f4c8b0d..6a2ba6f2ff2 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
@@ -1,4 +1,3 @@
-import { LightIconButton } from 'twenty-ui/components';
import { useGetFieldMetadataItemByIdOrThrow } from '@/object-metadata/hooks/useGetFieldMetadataItemById';
import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
@@ -7,15 +6,16 @@ import { useUpdateRecordField } from '@/object-record/record-field/hooks/useUpda
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
+import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
-import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton, MenuItemDraggable } from 'twenty-ui/components';
import { IconEyeOff, useIcons } from 'twenty-ui/icon';
-import { MenuItemDraggable, ListItem } from 'twenty-ui/primitives/navigation';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { sortByProperty } from '~/utils/array/sortByProperty';
type RecordTableFieldsDropdownVisibleFieldsContentProps = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx
index 11d0efb82ef..80009fae3f6 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx
@@ -1,5 +1,3 @@
-import { t } from '@lingui/core/macro';
-import { LightIconButton } from 'twenty-ui/components';
import { useRecordTableWidgetViewFieldItems } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewFieldItems';
import { useReorderRecordTableWidgetFields } from '@/page-layout/widgets/record-table/hooks/useReorderRecordTableWidgetFields';
import { useToggleRecordTableWidgetFieldVisibility } from '@/page-layout/widgets/record-table/hooks/useToggleRecordTableWidgetFieldVisibility';
@@ -7,9 +5,10 @@ import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableIt
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { useMemo } from 'react';
+import { LightIconButton, MenuItemDraggable } from 'twenty-ui/components';
import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/icon';
-import { MenuItemDraggable } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledFieldListContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFilters.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFilters.tsx
index 16b202f778a..19617eb9fb7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFilters.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFilters.tsx
@@ -6,7 +6,7 @@ import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/u
import { useRecordTableWidgetFilterCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetFilterCallbacks';
import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';
import { RecordTableSettingsFiltersInitializeStateEffect } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFiltersInitializeStateEffect';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx
index ea91d849121..7f42949e8dd 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx
@@ -2,15 +2,16 @@ import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMeta
import { filterSortableFieldMetadataItems } from '@/object-metadata/utils/filterSortableFieldMetadataItems';
import { RecordSortsComponentInstanceContext } from '@/object-record/record-sort/states/context/RecordSortsComponentInstanceContext';
import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';
-import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';
import { useRecordTableWidgetSortCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetSortCallbacks';
+import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';
import { RecordTableSettingsSortsContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent';
import { RecordTableSettingsSortsInitializeStateEffect } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsInitializeStateEffect';
-import { InputLabel, type SelectOption } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
import { useIcons } from 'twenty-ui/icon';
+import { type SelectOption } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { ViewSortDirection } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
index 9431df90181..ea93bf8e2d6 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
@@ -9,8 +9,8 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { IconClock, IconSend } from 'twenty-ui/icon';
import { Button, type SelectOption } from 'twenty-ui/primitives/input';
+import { Text } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { Label } from 'twenty-ui/primitives/typography';
import { useCampaignAudiencePreview } from '@/activities/emails/hooks/useCampaignAudiencePreview';
import { useSendMessageCampaign } from '@/activities/emails/hooks/useSendMessageCampaign';
@@ -192,7 +192,7 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
<StyledContainer>
<StyledContent>
<StyledSection>
- <Label>{t`Recipients`}</Label>
+ <StyledDisplayLabel>{t`Recipients`}</StyledDisplayLabel>
{isDefined(audiencePreview) ? (
<>
<StyledRecipientCount>
@@ -221,7 +221,7 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
)}
</StyledSection>
<StyledSection>
- <Label>{t`List`}</Label>
+ <StyledDisplayLabel>{t`List`}</StyledDisplayLabel>
{isDefined(list) ? (
<RecordChip
record={list}
@@ -232,19 +232,19 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
)}
</StyledSection>
<StyledSection>
- <Label>{t`From`}</Label>
+ <StyledDisplayLabel>{t`From`}</StyledDisplayLabel>
<StyledValue $isEmpty={!isNonEmptyString(fromAddress)}>
{isNonEmptyString(fromAddress) ? fromAddress : t`No sender`}
</StyledValue>
</StyledSection>
<StyledSection>
- <Label>{t`Subject`}</Label>
+ <StyledDisplayLabel>{t`Subject`}</StyledDisplayLabel>
<StyledValue $isEmpty={!isNonEmptyString(subject)}>
{isNonEmptyString(subject) ? subject : t`No subject`}
</StyledValue>
</StyledSection>
<StyledSection>
- <Label>{t`Delivery`}</Label>
+ <StyledDisplayLabel>{t`Delivery`}</StyledDisplayLabel>
<StyledDeliveryFields>
<Select
dropdownId="send-campaign-delivery-timing"
@@ -289,3 +289,9 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
</StyledContainer>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx
index 8b6cd2bde14..99cd46aaa2d 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx
@@ -1,7 +1,7 @@
import { type WorkflowActionType } from '@/workflow/types/Workflow';
import { getActionIconColorOrThrow } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIconColorOrThrow';
+import { MenuItem } from 'twenty-ui/components';
import { useIcons } from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
type Action = {
defaultLabel: string;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsx
index 2c19da87553..997276da65c 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsx
@@ -1,7 +1,7 @@
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { STEP_RETRY_DELAYS_MS } from 'twenty-shared/workflow';
-import { InputLabel } from 'twenty-ui/primitives/input';
import { FormBooleanFieldSwitchInput } from '@/object-record/record-field/ui/form-types/components/FormBooleanFieldSwitchInput';
import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx
index 5666c91c8ff..fe8f03cf9e3 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx
@@ -1,6 +1,6 @@
-import { useSidePanelWorkflowNavigation } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation';
-import { useSidePanelWorkflowIdOrThrow } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowIdOrThrow';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { useSidePanelWorkflowIdOrThrow } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowIdOrThrow';
+import { useSidePanelWorkflowNavigation } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useFlowOrThrow } from '@/workflow/hooks/useFlowOrThrow';
import {
@@ -15,11 +15,11 @@ import { OTHER_TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/Other
import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';
import { getTriggerDefaultDefinition } from '@/workflow/workflow-trigger/utils/getTriggerDefaultDefinition';
import { t } from '@lingui/core/macro';
+import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
+import { MenuItem } from 'twenty-ui/components';
import { useIcons } from 'twenty-ui/icon';
-import { useContext } from 'react';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
import { ThemeContext } from 'twenty-ui/theme-constants';
export const SidePanelWorkflowSelectTriggerTypeContent = () => {
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
index 1938097576a..98f4bb56039 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { TintedIconTile } from 'twenty-ui/primitives/data-display';
+import { LightIconButton, TintedIconTile } from 'twenty-ui/components';
import {
IconBuildingSkyscraper,
IconDotsVertical,
@@ -8,7 +8,6 @@ import {
IconPlus,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
import { BackgroundMockTable } from '@/sign-in-background-mock/components/BackgroundMockTable';
import { BackgroundMockViewBar } from '@/sign-in-background-mock/components/BackgroundMockViewBar';
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx
index c1e519ff4cf..d3ffa288d20 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx
@@ -5,8 +5,8 @@ import { BackgroundMockTableRow } from '@/sign-in-background-mock/components/Bac
import { BACKGROUND_MOCK_COLUMNS } from '@/sign-in-background-mock/constants/BackgroundMockColumns';
import { BACKGROUND_MOCK_COMPANIES } from '@/sign-in-background-mock/constants/BackgroundMockCompanies';
import { BACKGROUND_MOCK_TABLE_DIMENSIONS } from '@/sign-in-background-mock/constants/BackgroundMockTableDimensions';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronDown, IconPlus, useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { Checkbox } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx
index 35c19dc24f7..5923cb4b9b2 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { TopBar } from '@/ui/layout/top-bar/components/TopBar';
-import { TintedIconTile } from 'twenty-ui/primitives/data-display';
+import { TintedIconTile } from 'twenty-ui/components';
import { IconBuildingSkyscraper, IconChevronDown } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/skill-suggestion/components/SkillReferenceChip.tsx b/packages/twenty-front/src/modules/skill-suggestion/components/SkillReferenceChip.tsx
index f1a9c8839cc..ea5f38e0c10 100644
--- a/packages/twenty-front/src/modules/skill-suggestion/components/SkillReferenceChip.tsx
+++ b/packages/twenty-front/src/modules/skill-suggestion/components/SkillReferenceChip.tsx
@@ -1,6 +1,6 @@
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { LinkChip } from 'twenty-ui/primitives/data-display';
import { useIcons } from 'twenty-ui/icon';
import { useTheme } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/skill-suggestion/components/SkillSuggestionMenuItem.tsx b/packages/twenty-front/src/modules/skill-suggestion/components/SkillSuggestionMenuItem.tsx
index 718fac0b403..883c8ab4d02 100644
--- a/packages/twenty-front/src/modules/skill-suggestion/components/SkillSuggestionMenuItem.tsx
+++ b/packages/twenty-front/src/modules/skill-suggestion/components/SkillSuggestionMenuItem.tsx
@@ -1,5 +1,5 @@
+import { MenuItemSuggestion } from 'twenty-ui/components';
import { useIcons } from 'twenty-ui/icon';
-import { MenuItemSuggestion } from 'twenty-ui/primitives/navigation';
import { DEFAULT_SKILL_ICON } from '@/skill-suggestion/constants/DefaultSkillIcon';
import type { SkillSuggestionItem } from '@/skill-suggestion/types/SkillSuggestionItem';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
index cbf4c5a2370..ed066e42af3 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
@@ -1,11 +1,9 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { useMemo, useState } from 'react';
-
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { getFieldMetadataTypeLabel } from '@/object-record/object-filter-dropdown/utils/getFieldMetadataTypeLabel';
import { DO_NOT_IMPORT_OPTION_KEY } from '@/spreadsheet-import/constants/DoNotImportOptionKey';
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHasNestedFields';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -18,6 +16,7 @@ import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
+import { useMemo, useState } from 'react';
import { IconForbid, IconX, useIcons } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/primitives/input';
import { ListItem } from 'twenty-ui/primitives/navigation';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
index e48b3f7e2aa..0059e3c7b62 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
@@ -1,9 +1,8 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type SpreadsheetImportFieldOption } from '@/spreadsheet-import/types/SpreadsheetImportFieldOption';
import { getSubFieldOptions } from '@/spreadsheet-import/utils/spreadsheetImportGetSubFieldOptions';
import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHasNestedFields';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -12,8 +11,9 @@ import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/Dropdow
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useState } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronLeft } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { ListItem } from 'twenty-ui/primitives/navigation';
export const MatchColumnSelectSubFieldSelectDropdownContent = ({
fieldMetadataItem,
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx
index 97cce099acd..7a64c974407 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx
@@ -11,11 +11,11 @@ import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHas
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isDefined } from 'twenty-shared/utils';
+import { MenuItem } from 'twenty-ui/components';
import { IconChevronDown } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/primitives/input';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
interface MatchColumnToFieldSelectProps {
columnIndex: string;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
index 425c0d14a66..330f3bd00b4 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
@@ -1,9 +1,9 @@
-import { isDefined } from 'twenty-shared/utils';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { useMemo, useRef, useState, createElement } from 'react';
+import { createElement, useMemo, useRef, useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
import { type TagColor, Tag } from 'twenty-ui/primitives/data-display';
import { type SelectOption } from 'twenty-ui/primitives/input';
import { ListItem } from 'twenty-ui/primitives/navigation';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx
index ce1a8daac47..be51d3c2106 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx
@@ -1,10 +1,11 @@
-import { Dialog } from 'twenty-ui/primitives/surfaces';
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
import { ImportDataStep } from '@/spreadsheet-import/steps/components/ImportDataStep';
import { type SpreadsheetImportStep } from '@/spreadsheet-import/steps/types/SpreadsheetImportStep';
import { SpreadsheetImportStepType } from '@/spreadsheet-import/steps/types/SpreadsheetImportStepType';
import { useCallback, useContext, useState } from 'react';
-import { CircularProgressBar, useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
+import { CircularProgressBar } from 'twenty-ui/primitives/feedback';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { MatchColumnsStep } from './MatchColumnsStep/MatchColumnsStep';
import { SelectHeaderStep } from './SelectHeaderStep/SelectHeaderStep';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx
index a69ad6bdba2..031a646a26c 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx
@@ -7,12 +7,10 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { useDropzone } from 'react-dropzone';
-import { MainButton } from 'twenty-ui/components';
+import { MainButton, useToast } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { read, type WorkBook } from 'xlsx-ugnis';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledContainer = styled.div`
align-items: center;
background:
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.tsx b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder.tsx
similarity index 55%
rename from packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.tsx
rename to packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder.tsx
index 9c88eeabbb1..d4569c07660 100644
--- a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder.tsx
@@ -1,14 +1,54 @@
-import { type AnimatedPlaceholderType } from './types/AnimatedPlaceholderType';
+import { css } from '@linaria/core';
import { clsx } from 'clsx';
import { useEffect, useRef } from 'react';
+import { type AnimatedPlaceholderType } from './types/AnimatedPlaceholderType';
-import { BACKGROUND } from '@ui/primitives/feedback/AnimatedPlaceholder/constants/Background';
-import { DARK_BACKGROUND } from '@ui/primitives/feedback/AnimatedPlaceholder/constants/DarkBackground';
-import { DARK_MOVING_IMAGE } from '@ui/primitives/feedback/AnimatedPlaceholder/constants/DarkMovingImage';
-import { MOVING_IMAGE } from '@ui/primitives/feedback/AnimatedPlaceholder/constants/MovingImage';
-import { useThemeColorScheme } from '@ui/theme-constants';
+import { BACKGROUND } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/Background';
+import { DARK_BACKGROUND } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/DarkBackground';
+import { DARK_MOVING_IMAGE } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/DarkMovingImage';
+import { MOVING_IMAGE } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/MovingImage';
+import { useThemeColorScheme } from 'twenty-ui/theme-constants';
-import styles from './AnimatedPlaceholder.module.scss';
+const styles = {
+ container: css`
+ & {
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ min-height: 100px;
+ position: relative;
+ }
+ `,
+ backgroundImage: css`
+ & {
+ max-height: 160px;
+ max-width: 160px;
+ }
+ `,
+ backgroundImageLarge: css`
+ & {
+ max-height: 245px;
+ max-width: 245px;
+ }
+ `,
+ movingImage: css`
+ & {
+ max-height: 130px;
+ max-width: 130px;
+ position: absolute;
+ transform: translate(var(--parallax-x, 0), var(--parallax-y, 0));
+ transition: transform calc(var(--t-animation-duration-normal) * 1s)
+ ease-out;
+ z-index: 2;
+ }
+ `,
+ movingImageLarge: css`
+ & {
+ max-height: 185px;
+ max-width: 185px;
+ }
+ `,
+};
const PARALLAX_OFFSET_IN_PX = 2;
@@ -30,7 +70,13 @@ export const AnimatedPlaceholder = ({
return;
}
- const setParallax = (offsetX: number, offsetY: number) => {
+ const setParallax = ({
+ offsetX,
+ offsetY,
+ }: {
+ offsetX: number;
+ offsetY: number;
+ }) => {
movingImage.style.setProperty('--parallax-x', `${offsetX}px`);
movingImage.style.setProperty('--parallax-y', `${offsetY}px`);
};
@@ -41,16 +87,18 @@ export const AnimatedPlaceholder = ({
const clientY =
'touches' in event ? event.touches[0].clientY : event.clientY;
- setParallax(
- (clientX / window.innerWidth) * 2 * PARALLAX_OFFSET_IN_PX -
+ setParallax({
+ offsetX:
+ (clientX / window.innerWidth) * 2 * PARALLAX_OFFSET_IN_PX -
PARALLAX_OFFSET_IN_PX,
- (clientY / window.innerHeight) * 2 * PARALLAX_OFFSET_IN_PX -
+ offsetY:
+ (clientY / window.innerHeight) * 2 * PARALLAX_OFFSET_IN_PX -
PARALLAX_OFFSET_IN_PX,
- );
+ });
};
const handleLeave = () => {
- setParallax(0, 0);
+ setParallax({ offsetX: 0, offsetY: 0 });
};
window.addEventListener('mousemove', handleMove);
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/Background.ts b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/Background.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/Background.ts
rename to packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/Background.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/DarkBackground.ts b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/DarkBackground.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/DarkBackground.ts
rename to packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/DarkBackground.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/DarkMovingImage.ts b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/DarkMovingImage.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/DarkMovingImage.ts
rename to packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/DarkMovingImage.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/MovingImage.ts b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/MovingImage.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/constants/MovingImage.ts
rename to packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/MovingImage.ts
diff --git a/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/types/AnimatedPlaceholderType.ts b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/types/AnimatedPlaceholderType.ts
new file mode 100644
index 00000000000..50c98bd0d5c
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/AnimatedPlaceholder/types/AnimatedPlaceholderType.ts
@@ -0,0 +1,6 @@
+import { type BACKGROUND } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/Background';
+import { type MOVING_IMAGE } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/constants/MovingImage';
+
+export type AnimatedPlaceholderType =
+ | keyof typeof BACKGROUND
+ | keyof typeof MOVING_IMAGE;
diff --git a/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/EmptyState.tsx
similarity index 50%
rename from packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss
rename to packages/twenty-front/src/modules/ui/feedback/empty-state/components/EmptyState.tsx
index 3536f67cca9..a764d362f6f 100644
--- a/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss
+++ b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/EmptyState.tsx
@@ -1,26 +1,28 @@
-.emptyContainer {
+import { styled } from '@linaria/react';
+import { isDefined } from 'twenty-shared/utils';
+
+const StyledRoot = styled.div<{ width?: number }>`
align-items: center;
- width: 100%;
- height: 100%;
+ animation: emptyStateFadeIn calc(var(--t-animation-duration-fast) * 1s) ease;
display: flex;
flex-direction: column;
gap: var(--t-spacing-6);
+ height: 100%;
justify-content: center;
text-align: center;
- animation: emptyPlaceholderFadeIn duration(fast) ease;
-}
+ width: ${({ width }) => (isDefined(width) ? `${width}px` : '100%')};
-@keyframes emptyPlaceholderFadeIn {
- from {
- opacity: 0;
+ @keyframes emptyStateFadeIn {
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
}
+`;
- to {
- opacity: 1;
- }
-}
-
-.emptyTextContainer {
+const StyledContent = styled.div`
align-items: center;
display: flex;
flex-direction: column;
@@ -28,15 +30,15 @@
justify-content: center;
text-align: center;
width: 100%;
-}
+`;
-.emptyTitle {
+const StyledTitle = styled.div`
color: var(--t-font-color-primary);
font-size: var(--t-font-size-lg);
font-weight: var(--t-font-weight-semi-bold);
-}
+`;
-.emptySubTitle {
+const StyledDescription = styled.div`
color: var(--t-font-color-tertiary);
font-size: var(--t-font-size-sm);
font-weight: var(--t-font-weight-regular);
@@ -44,4 +46,11 @@
max-height: 2.8em;
overflow: hidden;
width: 50%;
-}
+`;
+
+export const EmptyState = {
+ Root: StyledRoot,
+ Content: StyledContent,
+ Title: StyledTitle,
+ Description: StyledDescription,
+};
diff --git a/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/ErrorState.tsx
similarity index 68%
rename from packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss
rename to packages/twenty-front/src/modules/ui/feedback/empty-state/components/ErrorState.tsx
index dc445107587..d1f65cb9228 100644
--- a/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss
+++ b/packages/twenty-front/src/modules/ui/feedback/empty-state/components/ErrorState.tsx
@@ -1,15 +1,17 @@
-.errorContainer {
+import { styled } from '@linaria/react';
+
+const StyledRoot = styled.div`
align-items: center;
- width: 100%;
- height: 100%;
display: flex;
flex-direction: column;
gap: var(--t-spacing-8);
+ height: 100%;
justify-content: center;
text-align: center;
-}
+ width: 100%;
+`;
-.errorTextContainer {
+const StyledContent = styled.div`
align-items: center;
display: flex;
flex-direction: column;
@@ -17,20 +19,27 @@
justify-content: center;
text-align: center;
width: 100%;
-}
+`;
-.errorTitle {
+const StyledTitle = styled.div`
color: var(--t-font-color-primary);
font-size: var(--t-font-size-xl);
font-weight: var(--t-font-weight-semi-bold);
line-height: var(--t-text-line-height-lg);
-}
+`;
-.errorSubTitle {
+const StyledDescription = styled.div`
color: var(--t-font-color-tertiary);
font-size: var(--t-font-size-xs);
font-weight: var(--t-font-weight-regular);
line-height: var(--t-text-line-height-md);
max-height: 2.4em;
overflow: hidden;
-}
+`;
+
+export const ErrorState = {
+ Root: StyledRoot,
+ Content: StyledContent,
+ Title: StyledTitle,
+ Description: StyledDescription,
+};
diff --git a/packages/twenty-front/src/modules/ui/feedback/toast/components/AppToaster.tsx b/packages/twenty-front/src/modules/ui/feedback/toast/components/AppToaster.tsx
index d54a078f6eb..513edce81c1 100644
--- a/packages/twenty-front/src/modules/ui/feedback/toast/components/AppToaster.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/toast/components/AppToaster.tsx
@@ -1,7 +1,7 @@
import { getLocalizedToastProps } from '@/ui/feedback/toast/utils/getLocalizedToastProps';
import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
import { useLingui } from '@lingui/react/macro';
-import { Toaster, type ToasterProps } from 'twenty-ui/primitives/feedback';
+import { Toaster, type ToasterProps } from 'twenty-ui/components';
type AppToasterProps = Pick<ToasterProps, 'container'>;
diff --git a/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx b/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx
index db7c304099d..0e2fe5316d3 100644
--- a/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx
@@ -6,7 +6,7 @@ import { act, renderHook, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { type ReactNode } from 'react';
import { MemoryRouter } from 'react-router-dom';
-import { ToastProvider, useToast } from 'twenty-ui/primitives/feedback';
+import { ToastProvider, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { ThemeProvider } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/feedback/toast/utils/getLocalizedToastProps.ts b/packages/twenty-front/src/modules/ui/feedback/toast/utils/getLocalizedToastProps.ts
index a21d87e3d94..dc636b36c9b 100644
--- a/packages/twenty-front/src/modules/ui/feedback/toast/utils/getLocalizedToastProps.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/toast/utils/getLocalizedToastProps.ts
@@ -1,10 +1,7 @@
import { type I18n } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { isString } from '@sniptt/guards';
-import {
- type ToastProps,
- type ToastVariant,
-} from 'twenty-ui/primitives/feedback';
+import { type ToastProps, type ToastVariant } from 'twenty-ui/components';
const DEFAULT_ARIA_LABEL_BY_VARIANT: Record<
ToastVariant,
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
index e9ed999a216..6d1d19e49c3 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
@@ -1,8 +1,8 @@
import { type FieldActorValue } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { t } from '@lingui/core/macro';
import { ConnectedAccountProvider } from 'twenty-shared/types';
-import { AvatarOrIcon, Chip } from 'twenty-ui/primitives/data-display';
import {
IconApi,
IconCalendar,
@@ -18,6 +18,7 @@ import {
IconWebhook,
type IconComponent,
} from 'twenty-ui/icon';
+import { Chip } from 'twenty-ui/primitives/data-display';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
type ActorDisplayProps = Partial<FieldActorValue> & {
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
index 29b8d2c7338..b69db5f5af0 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
@@ -1,8 +1,8 @@
-import { useContext } from 'react';
import { styled } from '@linaria/react';
+import { useContext } from 'react';
+import { formatToShortNumber, isDefined } from 'twenty-shared/utils';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext } from 'twenty-ui/theme-constants';
-import { isDefined, formatToShortNumber } from 'twenty-shared/utils';
import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
@@ -11,8 +11,8 @@ import {
type FieldCurrencyValue,
} from '@/object-record/record-field/ui/types/FieldMetadata';
import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';
+import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
-import { EllipsisDisplay } from 'twenty-ui/primitives/data-display';
import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
index 28fcde66ea6..f77ddf2f1ca 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
@@ -1,10 +1,10 @@
import { type FieldDateMetadataSettings } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { UserContext } from '@/users/contexts/UserContext';
import { useContext } from 'react';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import { formatDateString } from '~/utils/string/formatDateString';
-import { EllipsisDisplay } from 'twenty-ui/primitives/data-display';
type DateDisplayProps = {
value: string | null | undefined;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
index a6821e80b94..ca00bdc1198 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
@@ -1,4 +1,5 @@
import { type FieldDateMetadataSettings } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
import { TimeZoneAbbreviation } from '@/ui/input/components/internal/date/components/TimeZoneAbbreviation';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { UserContext } from '@/users/contexts/UserContext';
@@ -6,10 +7,9 @@ import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { Temporal } from 'temporal-polyfill';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
-import { EllipsisDisplay } from 'twenty-ui/primitives/data-display';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTimeZoneSpacer = styled.span`
min-width: ${themeCssVariables.spacing[1]};
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/EmailDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/EmailDisplay.tsx
index 88609b7e815..c8054f7f89d 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/EmailDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/EmailDisplay.tsx
@@ -1,7 +1,7 @@
+import { ContactLink } from '@/ui/field/display/components/internal/ContactLink/ContactLink';
+import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
import { type MouseEvent } from 'react';
-import { EllipsisDisplay } from 'twenty-ui/primitives/data-display';
import { isDefined } from 'twenty-shared/utils';
-import { ContactLink } from 'twenty-ui/primitives/navigation';
const validateEmail = (email: string) => {
// Record this without using regex
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/EmailsDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/EmailsDisplay.tsx
index 56268db5613..587811d02f2 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/EmailsDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/EmailsDisplay.tsx
@@ -4,7 +4,7 @@ import { type FieldEmailsValue } from '@/object-record/record-field/ui/types/Fie
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
-import { RoundedLink } from 'twenty-ui/primitives/navigation';
+import { RoundedLink } from 'twenty-ui/components';
type EmailsDisplayProps = {
value?: FieldEmailsValue;
diff --git a/packages/twenty-ui/src/primitives/data-display/JsonDisplay/JsonDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay/JsonDisplay.tsx
similarity index 66%
rename from packages/twenty-ui/src/primitives/data-display/JsonDisplay/JsonDisplay.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay/JsonDisplay.tsx
index e88cf23e1ff..6457b7910a0 100644
--- a/packages/twenty-ui/src/primitives/data-display/JsonDisplay/JsonDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay/JsonDisplay.tsx
@@ -1,4 +1,4 @@
-import { EllipsisDisplay } from '@ui/primitives/data-display/EllipsisDisplay/EllipsisDisplay';
+import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
type JsonDisplayProps = {
text: string;
diff --git a/packages/twenty-ui/src/primitives/data-display/JsonDisplay/__stories__/JsonDisplay.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay/__stories__/JsonDisplay.stories.tsx
similarity index 73%
rename from packages/twenty-ui/src/primitives/data-display/JsonDisplay/__stories__/JsonDisplay.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay/__stories__/JsonDisplay.stories.tsx
index 07a51bd638f..a6c61f19ee6 100644
--- a/packages/twenty-ui/src/primitives/data-display/JsonDisplay/__stories__/JsonDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay/__stories__/JsonDisplay.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { ComponentDecorator } from '@ui/testing';
+import { ComponentDecorator } from 'twenty-ui/testing';
-import { JsonDisplay } from '@ui/primitives/data-display/JsonDisplay/JsonDisplay';
+import { JsonDisplay } from '@/ui/field/display/components/JsonDisplay/JsonDisplay';
const meta: Meta<typeof JsonDisplay> = {
title: 'UI/Data Display/JsonDisplay',
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx
index 08b666a83ab..74117ac6ace 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx
@@ -1,8 +1,9 @@
+import { SocialLink } from '@/ui/field/display/components/SocialLink/SocialLink';
import { isNonEmptyString } from '@sniptt/guards';
-import { RoundedLink, SocialLink } from 'twenty-ui/primitives/navigation';
+import { getSafeUrl } from 'twenty-shared/utils';
+import { RoundedLink } from 'twenty-ui/components';
import { checkUrlType } from '~/utils/checkUrlType';
import { isSocialLinkType } from '~/utils/isSocialLinkType';
-import { getSafeUrl } from 'twenty-shared/utils';
type LinkDisplayProps = {
value: { url: string; label?: string | null };
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx
index ad473f88fbf..5d937040714 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx
@@ -2,13 +2,14 @@ import React, { useMemo } from 'react';
import { getFieldLinkDefinedLinks } from '@/object-record/record-field/ui/meta-types/input/utils/getFieldLinkDefinedLinks';
import { type FieldLinksValue } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { SocialLink } from '@/ui/field/display/components/SocialLink/SocialLink';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
import {
getAbsoluteUrlOrThrow,
getUrlHostnameOrThrow,
isDefined,
} from 'twenty-shared/utils';
-import { RoundedLink, SocialLink } from 'twenty-ui/primitives/navigation';
+import { RoundedLink } from 'twenty-ui/components';
import { checkUrlType } from '~/utils/checkUrlType';
import { isSocialLinkType } from '~/utils/isSocialLinkType';
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx
index 5c57f34a806..c5e93c5fbc2 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx
@@ -1,7 +1,7 @@
+import { ContactLink } from '@/ui/field/display/components/internal/ContactLink/ContactLink';
import { parsePhoneNumber, type PhoneNumber } from 'libphonenumber-js';
import { type MouseEvent } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { ContactLink } from 'twenty-ui/primitives/navigation';
interface PhoneDisplayProps {
value: PhoneDisplayValueProps;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/PhonesDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/PhonesDisplay.tsx
index 45c0b467fd5..e9898fa2b4e 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/PhonesDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/PhonesDisplay.tsx
@@ -1,13 +1,11 @@
-import React, { useMemo } from 'react';
-
import { createPhonesFromFieldValue } from '@/object-record/record-field/ui/meta-types/input/utils/phonesUtils';
import { type FieldPhonesValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
-
import { styled } from '@linaria/react';
import { parsePhoneNumber } from 'libphonenumber-js';
+import React, { useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { RoundedLink } from 'twenty-ui/primitives/navigation';
+import { RoundedLink } from 'twenty-ui/components';
type PhonesDisplayProps = {
value?: FieldPhonesValue;
diff --git a/packages/twenty-ui/src/primitives/data-display/SelectDisplay/SelectDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay/SelectDisplay.tsx
similarity index 63%
rename from packages/twenty-ui/src/primitives/data-display/SelectDisplay/SelectDisplay.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay/SelectDisplay.tsx
index 7f7663b02f5..85e56e60805 100644
--- a/packages/twenty-ui/src/primitives/data-display/SelectDisplay/SelectDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay/SelectDisplay.tsx
@@ -1,7 +1,7 @@
-import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { Tag } from '@ui/primitives/data-display/Tag/Tag';
-import { type ThemeColor } from '@ui/theme';
-import { isDefined } from '@ui/utilities/utils/isDefined';
+import { type IconComponent } from 'twenty-ui/icon';
+import { Tag } from 'twenty-ui/primitives/data-display';
+import { type ThemeColor } from 'twenty-ui/theme';
+import { isDefined } from 'twenty-ui/utilities';
type SelectDisplayProps = {
color: ThemeColor | 'transparent';
diff --git a/packages/twenty-ui/src/primitives/data-display/SelectDisplay/__stories__/SelectDisplay.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay/__stories__/SelectDisplay.stories.tsx
similarity index 81%
rename from packages/twenty-ui/src/primitives/data-display/SelectDisplay/__stories__/SelectDisplay.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay/__stories__/SelectDisplay.stories.tsx
index c2424bd1c4a..5b34b53f6b7 100644
--- a/packages/twenty-ui/src/primitives/data-display/SelectDisplay/__stories__/SelectDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay/__stories__/SelectDisplay.stories.tsx
@@ -1,15 +1,15 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconUser } from '@ui/icon/components/TablerIcons';
+import { IconUser } from 'twenty-ui/icon';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
-} from '@ui/testing';
-import { type ThemeColor, MAIN_COLOR_NAMES } from '@ui/theme';
+} from 'twenty-ui/testing';
+import { type ThemeColor, MAIN_COLOR_NAMES } from 'twenty-ui/theme';
-import { SelectDisplay } from '@ui/primitives/data-display/SelectDisplay/SelectDisplay';
+import { SelectDisplay } from '@/ui/field/display/components/SelectDisplay/SelectDisplay';
const meta: Meta<typeof SelectDisplay> = {
title: 'UI/Data Display/SelectDisplay',
diff --git a/packages/twenty-ui/src/primitives/navigation/SocialLink/LinkType.ts b/packages/twenty-front/src/modules/ui/field/display/components/SocialLink/LinkType.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/SocialLink/LinkType.ts
rename to packages/twenty-front/src/modules/ui/field/display/components/SocialLink/LinkType.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/SocialLink/SocialLink.tsx b/packages/twenty-front/src/modules/ui/field/display/components/SocialLink/SocialLink.tsx
similarity index 69%
rename from packages/twenty-ui/src/primitives/navigation/SocialLink/SocialLink.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/SocialLink/SocialLink.tsx
index 6d1a9b61ebc..035dd3f26ae 100644
--- a/packages/twenty-ui/src/primitives/navigation/SocialLink/SocialLink.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/SocialLink/SocialLink.tsx
@@ -2,9 +2,9 @@ import * as React from 'react';
import { isNonEmptyString } from '@sniptt/guards';
-import { type LinkType } from '@ui/primitives/navigation/SocialLink/LinkType';
-import { RoundedLink } from '@ui/primitives/navigation/RoundedLink/RoundedLink';
-import { getDisplayValueByUrlType } from '@ui/utilities';
+import { type LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
+import { getDisplayValueByUrlType } from '@/ui/field/display/utils/getDisplayValueByUrlType';
+import { RoundedLink } from 'twenty-ui/components';
type SocialLinkProps = {
label?: string | null;
diff --git a/packages/twenty-ui/src/primitives/navigation/SocialLink/__stories__/SocialLink.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/SocialLink/__stories__/SocialLink.stories.tsx
similarity index 90%
rename from packages/twenty-ui/src/primitives/navigation/SocialLink/__stories__/SocialLink.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/SocialLink/__stories__/SocialLink.stories.tsx
index 45c70aa929b..f7b11cc5c86 100644
--- a/packages/twenty-ui/src/primitives/navigation/SocialLink/__stories__/SocialLink.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/SocialLink/__stories__/SocialLink.stories.tsx
@@ -1,9 +1,9 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, within } from 'storybook/test';
-import { ComponentWithRouterDecorator } from '@ui/testing';
-import { LinkType } from '@ui/primitives/navigation/SocialLink/LinkType';
-import { SocialLink } from '@ui/primitives/navigation/SocialLink/SocialLink';
+import { ComponentWithRouterDecorator } from 'twenty-ui/testing';
+import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
+import { SocialLink } from '@/ui/field/display/components/SocialLink/SocialLink';
const meta: Meta<typeof SocialLink> = {
title: 'UI/Navigation/Link/SocialLink',
diff --git a/packages/twenty-ui/src/primitives/navigation/SocialLink/socialLinkProviders.ts b/packages/twenty-front/src/modules/ui/field/display/components/SocialLink/socialLinkProviders.ts
similarity index 96%
rename from packages/twenty-ui/src/primitives/navigation/SocialLink/socialLinkProviders.ts
rename to packages/twenty-front/src/modules/ui/field/display/components/SocialLink/socialLinkProviders.ts
index 01a10623ad9..1db0dca40f0 100644
--- a/packages/twenty-ui/src/primitives/navigation/SocialLink/socialLinkProviders.ts
+++ b/packages/twenty-front/src/modules/ui/field/display/components/SocialLink/socialLinkProviders.ts
@@ -1,4 +1,4 @@
-import { LinkType } from '@ui/primitives/navigation/SocialLink/LinkType';
+import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
export type SocialLinkProvider = {
type: LinkType;
diff --git a/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay/TextDisplay.tsx
similarity index 65%
rename from packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/TextDisplay/TextDisplay.tsx
index 42e21ddc8e5..503d751379c 100644
--- a/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay/TextDisplay.tsx
@@ -1,9 +1,23 @@
+import { css } from '@linaria/core';
import { isUndefined } from '@sniptt/guards';
import { clsx } from 'clsx';
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
-import styles from './TextDisplay.module.scss';
+const styles = {
+ container: css`
+ & {
+ align-items: center;
+ display: flex;
+ height: auto;
+ }
+ `,
+ fixHeight: css`
+ & {
+ height: 20px;
+ }
+ `,
+};
type TextDisplayProps = {
text: string;
diff --git a/packages/twenty-ui/src/primitives/data-display/TextDisplay/__stories__/TextDisplay.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay/__stories__/TextDisplay.stories.tsx
similarity index 81%
rename from packages/twenty-ui/src/primitives/data-display/TextDisplay/__stories__/TextDisplay.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/TextDisplay/__stories__/TextDisplay.stories.tsx
index 029b12dfb8b..034b116f8a4 100644
--- a/packages/twenty-ui/src/primitives/data-display/TextDisplay/__stories__/TextDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay/__stories__/TextDisplay.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { ComponentDecorator } from '@ui/testing';
+import { ComponentDecorator } from 'twenty-ui/testing';
-import { TextDisplay } from '@ui/primitives/data-display/TextDisplay/TextDisplay';
+import { TextDisplay } from '@/ui/field/display/components/TextDisplay/TextDisplay';
const meta: Meta<typeof TextDisplay> = {
title: 'UI/Data Display/TextDisplay',
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/__stories__/perf/EllipsisDisplay.perf.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/__stories__/perf/EllipsisDisplay.perf.stories.tsx
index 71967f79d39..d2990efe2ef 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/__stories__/perf/EllipsisDisplay.perf.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/__stories__/perf/EllipsisDisplay.perf.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { EllipsisDisplay } from 'twenty-ui/primitives/data-display';
+import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
import { ComponentDecorator } from 'twenty-ui/testing';
import { getProfilingStory } from '~/testing/profiling/utils/getProfilingStory';
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.tsx b/packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon.tsx
similarity index 69%
rename from packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon.tsx
index 8c304e16544..94c8425b267 100644
--- a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon.tsx
@@ -1,13 +1,38 @@
+import { css } from '@linaria/core';
import { isNonEmptyString } from '@sniptt/guards';
-import { handleClickableElementKeyDown } from '@ui/primitives/accessibility/utils/handleClickableElementKeyDown';
-import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
-import { useTheme } from '@ui/theme-constants';
-import { isDefined } from '@ui/utilities/utils/isDefined';
-
-import styles from './AvatarOrIcon.module.scss';
+import { handleClickableElementKeyDown } from 'twenty-ui/primitives/accessibility';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { useTheme } from 'twenty-ui/theme-constants';
+import { isDefined } from 'twenty-ui/utilities';
import { type AvatarOrIconProps } from './types/AvatarOrIconProps';
+const styles = {
+ iconWithBackgroundContainer: css`
+ & {
+ align-items: center;
+ background-color: var(
+ --avatar-or-icon-background,
+ var(--t-background-inverted-secondary)
+ );
+ border-radius: var(--t-border-radius-sm);
+ display: flex;
+ height: 14px;
+ justify-content: center;
+ width: 14px;
+ }
+ `,
+ wrapper: css`
+ & {
+ cursor: inherit;
+ display: flex;
+ }
+ &[data-clickable] {
+ cursor: pointer;
+ }
+ `,
+};
+
export const AvatarOrIcon = ({
Icon,
colorSeed,
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
similarity index 82%
rename from packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
index ec72b6873a8..9ef8db60b1f 100644
--- a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconBuildingSkyscraper, IconUser } from '@ui/icon';
-import { AVATAR_URL_MOCK, ComponentDecorator } from '@ui/testing';
-import { AvatarOrIcon } from '@ui/primitives/data-display/AvatarOrIcon/AvatarOrIcon';
+import { IconBuildingSkyscraper, IconUser } from 'twenty-ui/icon';
+import { AVATAR_URL_MOCK, ComponentDecorator } from 'twenty-ui/testing';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
const meta: Meta<typeof AvatarOrIcon> = {
title: 'UI/Data Display/AvatarOrIcon',
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/types/AvatarOrIconProps.ts b/packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/types/AvatarOrIconProps.ts
new file mode 100644
index 00000000000..24aa468ae43
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/field/display/components/internal/AvatarOrIcon/types/AvatarOrIconProps.ts
@@ -0,0 +1,18 @@
+import { type IconComponent } from 'twenty-ui/icon';
+import {
+ type AvatarProps,
+ type AvatarShape,
+} from 'twenty-ui/primitives/data-display';
+import { type Nullable } from 'twenty-ui/utilities';
+
+export type AvatarOrIconProps = Pick<
+ AvatarProps,
+ 'src' | 'name' | 'colorSeed'
+> & {
+ shape?: Nullable<AvatarShape>;
+ Icon?: IconComponent;
+ IconColor?: string;
+ IconBackgroundColor?: string;
+ isIconInverted?: boolean;
+ onClick?: () => void;
+};
diff --git a/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.tsx b/packages/twenty-front/src/modules/ui/field/display/components/internal/ContactLink/ContactLink.tsx
similarity index 54%
rename from packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/internal/ContactLink/ContactLink.tsx
index 21a3aad2dd6..4736f46050c 100644
--- a/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/internal/ContactLink/ContactLink.tsx
@@ -1,8 +1,25 @@
+import { css } from '@linaria/core';
import * as React from 'react';
-import { getSafeUrl } from '@ui/utilities/utils/getSafeUrl';
+import { getSafeUrl } from 'twenty-ui/utilities';
-import styles from './ContactLink.module.scss';
+const styles = {
+ root: css`
+ & {
+ color: inherit;
+ overflow: hidden;
+ text-decoration: underline;
+ text-decoration-color: var(--t-border-color-strong);
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 100%;
+ max-width: var(--contact-link-max-width);
+ }
+ &:hover {
+ text-decoration-color: var(--t-font-color-primary);
+ }
+ `,
+};
type ContactLinkProps = {
href: string;
diff --git a/packages/twenty-ui/src/primitives/navigation/ContactLink/__stories__/ContactLink.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/internal/ContactLink/__stories__/ContactLink.stories.tsx
similarity index 80%
rename from packages/twenty-ui/src/primitives/navigation/ContactLink/__stories__/ContactLink.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/internal/ContactLink/__stories__/ContactLink.stories.tsx
index 383e635f5c6..71841159036 100644
--- a/packages/twenty-ui/src/primitives/navigation/ContactLink/__stories__/ContactLink.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/internal/ContactLink/__stories__/ContactLink.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { fn } from 'storybook/test';
-import { ComponentWithRouterDecorator } from '@ui/testing';
-import { ContactLink } from '@ui/primitives/navigation/ContactLink/ContactLink';
+import { ComponentWithRouterDecorator } from 'twenty-ui/testing';
+import { ContactLink } from '@/ui/field/display/components/internal/ContactLink/ContactLink';
const meta: Meta<typeof ContactLink> = {
title: 'UI/Navigation/Link/ContactLink',
diff --git a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay.tsx
similarity index 57%
rename from packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay.tsx
index 06f8390241e..3564a87cd96 100644
--- a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay.tsx
@@ -1,9 +1,20 @@
+import { css } from '@linaria/core';
import { clsx } from 'clsx';
-import { Text } from '@ui/primitives/typography/Text/Text';
-import { isDefined } from '@ui/utilities/utils/isDefined';
+import { Text } from 'twenty-ui/primitives/typography';
+import { isDefined } from 'twenty-ui/utilities';
-import styles from './EllipsisDisplay.module.scss';
+const styles = {
+ ellipsis: css`
+ & {
+ align-items: center;
+ display: flex;
+ height: 20px;
+ max-width: 100%;
+ width: 100%;
+ }
+ `,
+};
type EllipsisDisplayProps = {
children: React.ReactNode;
diff --git a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/__stories__/EllipsisDisplay.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/internal/EllipsisDisplay/__stories__/EllipsisDisplay.stories.tsx
similarity index 73%
rename from packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/__stories__/EllipsisDisplay.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/internal/EllipsisDisplay/__stories__/EllipsisDisplay.stories.tsx
index 02b10ca57ef..3e8ac7b713b 100644
--- a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/__stories__/EllipsisDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/internal/EllipsisDisplay/__stories__/EllipsisDisplay.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { ComponentDecorator } from '@ui/testing';
+import { ComponentDecorator } from 'twenty-ui/testing';
-import { EllipsisDisplay } from '@ui/primitives/data-display/EllipsisDisplay/EllipsisDisplay';
+import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
const meta: Meta<typeof EllipsisDisplay> = {
title: 'UI/Data Display/EllipsisDisplay',
diff --git a/packages/twenty-ui/src/utilities/utils/__tests__/getDisplayValueByUrlType.test.ts b/packages/twenty-front/src/modules/ui/field/display/utils/__tests__/getDisplayValueByUrlType.test.ts
similarity index 98%
rename from packages/twenty-ui/src/utilities/utils/__tests__/getDisplayValueByUrlType.test.ts
rename to packages/twenty-front/src/modules/ui/field/display/utils/__tests__/getDisplayValueByUrlType.test.ts
index a292150b987..a3392559a68 100644
--- a/packages/twenty-ui/src/utilities/utils/__tests__/getDisplayValueByUrlType.test.ts
+++ b/packages/twenty-front/src/modules/ui/field/display/utils/__tests__/getDisplayValueByUrlType.test.ts
@@ -1,6 +1,6 @@
-import { LinkType } from '@ui/primitives/navigation/SocialLink/LinkType';
+import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
-import { getDisplayValueByUrlType } from '../getDisplayValueByUrlType';
+import { getDisplayValueByUrlType } from '@/ui/field/display/utils/getDisplayValueByUrlType';
describe('getDisplayValueByUrlType', () => {
describe('linkedin', () => {
diff --git a/packages/twenty-ui/src/utilities/utils/getDisplayValueByUrlType.ts b/packages/twenty-front/src/modules/ui/field/display/utils/getDisplayValueByUrlType.ts
similarity index 72%
rename from packages/twenty-ui/src/utilities/utils/getDisplayValueByUrlType.ts
rename to packages/twenty-front/src/modules/ui/field/display/utils/getDisplayValueByUrlType.ts
index 8a6dfd777b9..f0d3af60e10 100644
--- a/packages/twenty-ui/src/utilities/utils/getDisplayValueByUrlType.ts
+++ b/packages/twenty-front/src/modules/ui/field/display/utils/getDisplayValueByUrlType.ts
@@ -1,6 +1,6 @@
-import { type LinkType } from '@ui/primitives/navigation/SocialLink/LinkType';
-import { SOCIAL_LINK_PROVIDERS } from '@ui/primitives/navigation/SocialLink/socialLinkProviders';
-import { isDefined } from '@ui/utilities/utils/isDefined';
+import { type LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
+import { SOCIAL_LINK_PROVIDERS } from '@/ui/field/display/components/SocialLink/socialLinkProviders';
+import { isDefined } from 'twenty-ui/utilities';
type GetDisplayValueByUrlTypeProps = {
type: LinkType;
diff --git a/packages/twenty-front/src/modules/ui/icon/components/ColoredIcon.tsx b/packages/twenty-front/src/modules/ui/icon/components/ColoredIcon.tsx
index 885152b8282..2e35f3154be 100644
--- a/packages/twenty-front/src/modules/ui/icon/components/ColoredIcon.tsx
+++ b/packages/twenty-front/src/modules/ui/icon/components/ColoredIcon.tsx
@@ -1,6 +1,6 @@
import { css } from '@linaria/core';
+import { getIconTileColorShades } from 'twenty-ui/components';
import { type IconComponent } from 'twenty-ui/icon';
-import { getIconTileColorShades } from 'twenty-ui/primitives/data-display';
import { useTheme } from 'twenty-ui/theme-constants';
const iconClassName = css`
diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index c12e949dc81..fdd4c7dd9b6 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -5,20 +5,21 @@ import { useStore } from 'jotai';
import React, { type ReactNode, useCallback, useMemo, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import {
- ColorSample,
+ IconButton,
+ LightIconButton,
getIconTileColorShades,
-} from 'twenty-ui/primitives/data-display';
+} from 'twenty-ui/components';
import { IconApps, type IconComponent, useIcons } from 'twenty-ui/icon';
+import { ColorSample } from 'twenty-ui/primitives/data-display';
import {
type ButtonSize,
type ButtonVariant,
} from 'twenty-ui/primitives/input';
-import { IconButton, LightIconButton } from 'twenty-ui/components';
import { type ThemeColor } from 'twenty-ui/theme';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { ICON_PICKER_DROPDOWN_CONTENT_WIDTH } from '@/ui/input/components/constants/IconPickerDropdownContentWidth';
import { ThemeColorPickerMenu } from '@/ui/input/components/ThemeColorPickerMenu';
+import { ICON_PICKER_DROPDOWN_CONTENT_WIDTH } from '@/ui/input/components/constants/IconPickerDropdownContentWidth';
import { IconPickerScrollEffect } from '@/ui/input/effect-components/IconPickerScrollEffect';
import {
ICON_PICKER_DEFAULT_VISIBLE_COUNT,
diff --git a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
index b8498245d6c..bc3e35f24d5 100644
--- a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
@@ -5,9 +5,9 @@ import {
import { styled } from '@linaria/react';
import React, { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { TintedIconTile } from 'twenty-ui/primitives/data-display';
+import { TintedIconTile } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronDown, type IconComponent } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { type ThemeColor } from 'twenty-ui/theme';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
index 18e9fa1a6de..40743bbb016 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
@@ -3,9 +3,10 @@ import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVaria
import { styled } from '@linaria/react';
import { type ReactNode, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Tag, TintedIconTile } from 'twenty-ui/primitives/data-display';
+import { TintedIconTile } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronDown } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { Tag } from 'twenty-ui/primitives/data-display';
import { type SelectOption } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
index ddb789062c8..7dbee43bbb6 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
@@ -9,8 +9,8 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useEffect, useMemo, useRef, useState, createElement } from 'react';
import { t } from '@lingui/core/macro';
+import { createElement, useEffect, useMemo, useRef, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type TagColor, Tag } from 'twenty-ui/primitives/data-display';
import { type SelectOption } from 'twenty-ui/primitives/input';
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx
index 9117bc6e59d..82d3a2dc1e2 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
+import { TintedIconTile } from 'twenty-ui/components';
import { type IconComponent } from 'twenty-ui/icon';
-import { TintedIconTile } from 'twenty-ui/primitives/data-display';
import { type ThemeColor } from 'twenty-ui/theme';
import { useTheme } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
index 196feb6a0f4..9df5a79e1f1 100644
--- a/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
@@ -1,23 +1,23 @@
-import { Field } from 'twenty-ui/primitives/input';
-import { isNonEmptyString } from '@sniptt/guards';
-import { isDefined } from 'twenty-shared/utils';
+import { AutogrowWrapper } from '@/ui/input/components/internal/AutogrowWrapper/AutogrowWrapper';
import { css } from '@linaria/core';
import { styled } from '@linaria/react';
+import { isNonEmptyString } from '@sniptt/guards';
import React, {
- forwardRef,
type ChangeEvent,
type FocusEventHandler,
type InputHTMLAttributes,
+ forwardRef,
useContext,
useId,
useRef,
useState,
} from 'react';
+import { isDefined } from 'twenty-shared/utils';
import { type IconComponent, IconEye, IconEyeOff } from 'twenty-ui/icon';
-import { AutogrowWrapper } from 'twenty-ui/primitives/layout';
+import { Field } from 'twenty-ui/primitives/input';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useCombinedRefs } from '~/hooks/useCombinedRefs';
import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div<Pick<TextInputComponentProps, 'fullWidth'>>`
box-sizing: border-box;
display: inline-flex;
diff --git a/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsx b/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsx
index baf14456aaf..c03e7a6182b 100644
--- a/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsx
@@ -1,20 +1,18 @@
-import { ColorSample } from 'twenty-ui/primitives/data-display';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import {
- DEFAULT_COLOR_LABELS,
- ListItem,
-} from 'twenty-ui/primitives/navigation';
+import { DEFAULT_COLOR_LABELS } from 'twenty-ui/components';
+import { ColorSample } from 'twenty-ui/primitives/data-display';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { type ThemeColor, MAIN_COLOR_NAMES } from 'twenty-ui/theme';
type ThemeColorPickerMenuProps = {
diff --git a/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx b/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx
index fad0549d229..99b121758ee 100644
--- a/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx
@@ -8,7 +8,7 @@ import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePush
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { styled } from '@linaria/react';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type CommonInputProps = {
diff --git a/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/AutogrowWrapper/AutogrowWrapper.tsx
similarity index 56%
rename from packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.tsx
rename to packages/twenty-front/src/modules/ui/input/components/internal/AutogrowWrapper/AutogrowWrapper.tsx
index da0dd5926d2..27152bb13dd 100644
--- a/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/AutogrowWrapper/AutogrowWrapper.tsx
@@ -1,7 +1,30 @@
+import { css } from '@linaria/core';
import { clsx } from 'clsx';
import { type ReactNode } from 'react';
-import styles from './AutogrowWrapper.module.scss';
+const styles = {
+ container: css`
+ & {
+ max-width: 100%;
+ position: relative;
+ }
+ `,
+ nodeWrapper: css`
+ & {
+ pointer-events: none;
+ visibility: hidden;
+ white-space: pre;
+ }
+ `,
+ childWrapper: css`
+ & {
+ left: 0;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ }
+ `,
+};
type AutogrowWrapperProps = {
children: ReactNode;
diff --git a/packages/twenty-ui/src/primitives/input/InputHint/InputHint.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/InputHint/InputHint.tsx
similarity index 58%
rename from packages/twenty-ui/src/primitives/input/InputHint/InputHint.tsx
rename to packages/twenty-front/src/modules/ui/input/components/internal/InputHint/InputHint.tsx
index 96bd5b240d7..f75273cb615 100644
--- a/packages/twenty-ui/src/primitives/input/InputHint/InputHint.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/InputHint/InputHint.tsx
@@ -1,6 +1,21 @@
+import { css } from '@linaria/core';
import { clsx } from 'clsx';
-import styles from './InputHint.module.scss';
+const styles = {
+ hint: css`
+ & {
+ color: var(--t-font-color-light);
+ font-size: var(--t-font-size-xs);
+ font-weight: var(--t-font-weight-regular);
+ margin-top: var(--t-spacing-0_5);
+ }
+ `,
+ danger: css`
+ & {
+ color: var(--t-font-color-danger);
+ }
+ `,
+};
type InputHintProps = {
children?: React.ReactNode;
diff --git a/packages/twenty-ui/src/primitives/input/InputHint/__stories__/InputHint.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/InputHint/__stories__/InputHint.stories.tsx
similarity index 89%
rename from packages/twenty-ui/src/primitives/input/InputHint/__stories__/InputHint.stories.tsx
rename to packages/twenty-front/src/modules/ui/input/components/internal/InputHint/__stories__/InputHint.stories.tsx
index 802a7766a3f..bed56f8446d 100644
--- a/packages/twenty-ui/src/primitives/input/InputHint/__stories__/InputHint.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/InputHint/__stories__/InputHint.stories.tsx
@@ -5,9 +5,9 @@ import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
-} from '@ui/testing';
+} from 'twenty-ui/testing';
-import { InputHint } from '@ui/primitives/input/InputHint/InputHint';
+import { InputHint } from '@/ui/input/components/internal/InputHint/InputHint';
const meta: Meta<typeof InputHint> = {
title: 'UI/Input/InputHint',
diff --git a/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/InputLabel/InputLabel.tsx
similarity index 61%
rename from packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.tsx
rename to packages/twenty-front/src/modules/ui/input/components/internal/InputLabel/InputLabel.tsx
index 4b13d51de4d..ab0536ed930 100644
--- a/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/InputLabel/InputLabel.tsx
@@ -1,6 +1,17 @@
+import { css } from '@linaria/core';
import { clsx } from 'clsx';
-import styles from './InputLabel.module.scss';
+const styles = {
+ label: css`
+ & {
+ color: var(--t-font-color-light);
+ display: block;
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+ margin-bottom: var(--t-spacing-1);
+ }
+ `,
+};
type InputLabelProps = {
children?: React.ReactNode;
diff --git a/packages/twenty-ui/src/primitives/input/InputLabel/__stories__/InputLabel.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/InputLabel/__stories__/InputLabel.stories.tsx
similarity index 69%
rename from packages/twenty-ui/src/primitives/input/InputLabel/__stories__/InputLabel.stories.tsx
rename to packages/twenty-front/src/modules/ui/input/components/internal/InputLabel/__stories__/InputLabel.stories.tsx
index 82773c8afdc..b60759dcf49 100644
--- a/packages/twenty-ui/src/primitives/input/InputLabel/__stories__/InputLabel.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/InputLabel/__stories__/InputLabel.stories.tsx
@@ -1,8 +1,11 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
+import {
+ A11Y_DEFER_COLOR_CONTRAST,
+ ComponentDecorator,
+} from 'twenty-ui/testing';
-import { InputLabel } from '@ui/primitives/input/InputLabel/InputLabel';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
const meta: Meta<typeof InputLabel> = {
title: 'UI/Input/InputLabel',
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
index 4b81112587a..16a3662bc19 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
@@ -1,15 +1,13 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { t } from '@lingui/core/macro';
-import { useMemo, useState } from 'react';
-
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-
import { CURRENCIES } from '@/settings/data-model/constants/Currencies';
import { type Currency } from '@/ui/input/components/internal/types/Currency';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { t } from '@lingui/core/macro';
+import { useMemo, useState } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { ListItem } from 'twenty-ui/primitives/navigation';
export const CurrencyPickerDropdownSelect = ({
selectedCurrency,
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
index bc9427a6a5e..c8c3051f71f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { lazy, Suspense, useContext, type ComponentType } from 'react';
+import { Suspense, lazy, useContext, type ComponentType } from 'react';
import type { DatePickerProps as ReactDatePickerLibProps } from 'react-datepicker';
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
@@ -29,7 +29,7 @@ import {
type RelativeDateFilter,
} from 'twenty-shared/utils';
import { IconCalendarX } from 'twenty-ui/icon';
-import { MenuItemLeftContent } from 'twenty-ui/primitives/navigation';
+import { Text } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export const MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID =
@@ -310,7 +310,8 @@ export const DatePicker = ({
{clearable && (
<StyledButtonContainer onClick={handleClear}>
<StyledButtonContent>
- <MenuItemLeftContent LeftIcon={IconCalendarX} text={t`Clear`} />
+ <IconCalendarX size={theme.icon.size.md} />
+ <Text>{t`Clear`}</Text>
</StyledButtonContent>
</StyledButtonContainer>
)}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
index 337fc29f271..43aa5b14fdf 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
@@ -1,18 +1,18 @@
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { Select } from '@/ui/input/components/Select';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { DatePickerInput } from '@/ui/input/components/internal/date/components/DatePickerInput';
import { getMonthSelectOptions } from '@/ui/input/components/internal/date/utils/getMonthSelectOptions';
import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
-import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Temporal } from 'temporal-polyfill';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
+import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID =
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
index d58328d8a70..3940de85c6b 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
@@ -17,14 +17,14 @@ import { getRelativeDatePickerCalendarRange } from '@/ui/input/components/intern
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { lazy, Suspense, useContext, type ComponentType } from 'react';
+import { Suspense, lazy, useContext, type ComponentType } from 'react';
import type { DatePickerProps as ReactDatePickerLibProps } from 'react-datepicker';
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import 'react-datepicker/dist/react-datepicker.css';
import { IconCalendarX } from 'twenty-ui/icon';
-import { MenuItemLeftContent } from 'twenty-ui/primitives/navigation';
+import { Text } from 'twenty-ui/primitives/typography';
import { useGetShiftedDateToSystemTimeZone } from '@/ui/input/components/internal/date/hooks/useGetShiftedDateToSystemTimeZone';
import { useUserFirstDayOfTheWeek } from '@/ui/input/components/internal/date/hooks/useUserFirstDayOfTheWeek';
@@ -378,7 +378,8 @@ export const DateTimePicker = ({
<StyledSeparator />
<StyledButtonContainer onClick={handleClear}>
<StyledButtonContent>
- <MenuItemLeftContent LeftIcon={IconCalendarX} text={t`Clear`} />
+ <IconCalendarX size={theme.icon.size.md} />
+ <Text>{t`Clear`}</Text>
</StyledButtonContent>
</StyledButtonContainer>
</>
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
index 0b21eade249..407af66b5ff 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
@@ -18,13 +18,13 @@ import { t } from '@lingui/core/macro';
import { type Temporal } from 'temporal-polyfill';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton } from 'twenty-ui/components';
import {
IconCalendar,
IconChevronLeft,
IconChevronRight,
IconClock,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/RelativeDatePickerCalendarNavigation.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/RelativeDatePickerCalendarNavigation.tsx
index c2d1ea5092b..594c61c6dff 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/RelativeDatePickerCalendarNavigation.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/RelativeDatePickerCalendarNavigation.tsx
@@ -1,10 +1,10 @@
-import { t } from '@lingui/core/macro';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
-import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
index 1b306a98423..4490697a860 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
@@ -1,16 +1,14 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { t } from '@lingui/core/macro';
-import { styled } from '@linaria/react';
-import { useMemo, useState } from 'react';
-
import { type Country } from '@/ui/input/components/internal/types/Country';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { useMemo, useState } from 'react';
import 'react-phone-number-input/style.css';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledIconContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/layout/animation/components/internal/AnimatedContainer/AnimatedContainer.tsx b/packages/twenty-front/src/modules/ui/layout/animation/components/internal/AnimatedContainer/AnimatedContainer.tsx
new file mode 100644
index 00000000000..43ec9367a20
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/animation/components/internal/AnimatedContainer/AnimatedContainer.tsx
@@ -0,0 +1,29 @@
+import { css } from '@linaria/core';
+
+const styles = {
+ container: css`
+ & {
+ animation: animated-container-animatedContainerFadeIn
+ calc(var(--t-animation-duration-fast) * 1s) ease;
+ transition: transform calc(var(--t-animation-duration-fast) * 1s) ease;
+ }
+ &:hover {
+ transform: scale(1.04);
+ }
+
+ @keyframes animated-container-animatedContainerFadeIn {
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
+ }
+ `,
+};
+
+export const AnimatedContainer = ({
+ children,
+}: {
+ children: React.ReactNode;
+}) => <div className={styles.container}>{children}</div>;
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx
index 233d41d15d8..5bc14e79c64 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx
@@ -3,8 +3,8 @@ import { fn } from 'storybook/test';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
+import { MenuItemDraggable } from 'twenty-ui/components';
import { IconBell } from 'twenty-ui/icon';
-import { MenuItemDraggable } from 'twenty-ui/primitives/navigation';
import { ComponentDecorator } from 'twenty-ui/testing';
const meta: Meta<typeof DraggableItem> = {
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx
index d20498e86e8..1c5dc4d1a94 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx
@@ -2,8 +2,8 @@ import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableIt
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { action } from 'storybook/actions';
+import { MenuItemDraggable } from 'twenty-ui/components';
import { IconBell } from 'twenty-ui/icon';
-import { MenuItemDraggable } from 'twenty-ui/primitives/navigation';
import { ComponentDecorator } from 'twenty-ui/testing';
const meta: Meta<typeof DraggableList> = {
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx
index 0a67d390647..9029bfbc8ac 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx
@@ -1,12 +1,12 @@
+import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type MouseEvent, type ReactElement, useContext } from 'react';
-import { styled } from '@linaria/react';
+import { LightIconButton } from 'twenty-ui/components';
+import { type IconComponent } from 'twenty-ui/icon';
import {
type Avatar,
type AvatarProps,
} from 'twenty-ui/primitives/data-display';
-import { type IconComponent } from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledNonClickableStartIcon = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
index d2868c9bec3..25b5b0af4ed 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
@@ -2,7 +2,6 @@ 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 { useContext } from 'react';
import { IconChevronDown } from 'twenty-ui/icon';
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx
index 32e61908b20..755b8ea8b81 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDropdownMenuSubheaderContainer = styled.div`
@@ -15,6 +15,12 @@ export const StyledDropdownMenuSubheader = ({
children: ReactNode;
}) => (
<StyledDropdownMenuSubheaderContainer>
- <Label>{children}</Label>
+ <StyledDisplayLabel>{children}</StyledDisplayLabel>
</StyledDropdownMenuSubheaderContainer>
);
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx
index b511fa4bd39..48ebed2d873 100644
--- a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx
@@ -7,12 +7,12 @@ import {
useState,
} from 'react';
+import { AnimatedContainer } from '@/ui/layout/animation/components/internal/AnimatedContainer/AnimatedContainer';
import { ExpandableListResizeEffect } from '@/ui/layout/expandable-list/components/ExpandableListResizeEffect';
import { ExpandedListDropdown } from '@/ui/layout/expandable-list/components/ExpandedListDropdown';
import { isFirstOverflowingChildElement } from '@/ui/layout/expandable-list/utils/isFirstOverflowingChildElement';
import { isDefined } from 'twenty-shared/utils';
-import { AnimatedContainer } from 'twenty-ui/primitives/layout';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/HeaderIdentifier.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/HeaderIdentifier.tsx
index 2c4473693bc..162f0378623 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/components/HeaderIdentifier.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/components/HeaderIdentifier.tsx
@@ -2,12 +2,12 @@ import { StyledHeaderIdentifierLabel } from '@/ui/layout/page/components/StyledH
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import {
AVATAR_PROPERTIES_BY_SIZE,
Avatar,
type AvatarProps,
} from 'twenty-ui/primitives/data-display';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const HEADER_IDENTIFIER_TILE_SIZE = AVATAR_PROPERTIES_BY_SIZE.lg.width;
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
index 5992a366168..9baa4ec6548 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
@@ -1,5 +1,5 @@
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { type ReactNode, useContext } from 'react';
import { FrontComponentMediaSessionIndicator } from '@/front-components/media-session/components/FrontComponentMediaSessionIndicator';
@@ -12,9 +12,9 @@ import { PAGE_BAR_MIN_HEIGHT } from '@/ui/layout/page/constants/PageBarMinHeight
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { AnimatePresence } from 'framer-motion';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent, IconX } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { LightIconButton } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { type IconComponent, IconX } from 'twenty-ui/icon';
import {
MOBILE_VIEWPORT,
ThemeContext,
diff --git a/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx b/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
index 6e3e555e4e3..94b27c29cf6 100644
--- a/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
@@ -1,9 +1,9 @@
import { styled } from '@linaria/react';
import { type ReactNode, useContext, useState } from 'react';
-import { TableBody } from './TableBody';
import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { TableBody } from './TableBody';
type TableSectionProps = {
children: ReactNode;
@@ -53,7 +53,7 @@ export const TableSection = ({
isExpanded={isExpanded}
onClick={handleToggleSection}
>
- <Label>{title}</Label>
+ <StyledDisplayLabel>{title}</StyledDisplayLabel>
{isExpanded ? (
<IconChevronUp
size={theme.icon.size.md}
@@ -76,3 +76,9 @@ export const TableSection = ({
</>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.tsx b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx
similarity index 52%
rename from packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.tsx
rename to packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx
index 08b870d09e7..0463a5e2a09 100644
--- a/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx
@@ -1,23 +1,25 @@
-import { type ComponentPropsWithRef, type MouseEvent } from 'react';
+import { css } from '@linaria/core';
import { Link } from 'react-router-dom';
+import { type LinkChipProps } from './types/LinkChipProps';
-import { Chip } from '@ui/primitives/data-display/Chip/Chip';
-import { type ChipProps } from '@ui/primitives/data-display/Chip/types/ChipProps';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@ui/primitives/data-display/Chip/constants/LinkChipClickOutsideId';
-import { type TriggerEventType, useMouseDownNavigation } from '@ui/utilities';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@/ui/navigation/link/constants/LinkChipClickOutsideId';
+import { useMouseDownNavigation } from '@/ui/navigation/utils/hooks/useMouseDownNavigation';
+import { Chip } from 'twenty-ui/primitives/data-display';
-import styles from './LinkChip.module.scss';
-
-export type LinkChipProps = Omit<
- ChipProps,
- 'render' | 'ref' | 'onClick' | 'onMouseDown' | 'disabled' | 'nativeButton'
-> &
- Pick<ComponentPropsWithRef<typeof Link>, 'target' | 'ref'> & {
- to: string;
- onClick?: (event: MouseEvent<HTMLElement>) => void;
- onMouseDown?: (event: MouseEvent<HTMLElement>) => void;
- triggerEvent?: TriggerEventType;
- };
+const styles = {
+ linkContainer: css`
+ & {
+ display: inline-flex;
+ min-width: 0;
+ vertical-align: middle;
+ }
+ & > a {
+ max-width: 100%;
+ min-width: 0;
+ text-decoration: none;
+ }
+ `,
+};
export const LinkChip = ({
to,
diff --git a/packages/twenty-ui/src/primitives/data-display/LinkChip/__stories__/LinkChip.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/__stories__/LinkChip.stories.tsx
similarity index 91%
rename from packages/twenty-ui/src/primitives/data-display/LinkChip/__stories__/LinkChip.stories.tsx
rename to packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/__stories__/LinkChip.stories.tsx
index 246c8d950c8..328e1a209c6 100644
--- a/packages/twenty-ui/src/primitives/data-display/LinkChip/__stories__/LinkChip.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/__stories__/LinkChip.stories.tsx
@@ -1,17 +1,19 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconUser, IconX } from '@ui/icon';
-import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
+import { IconUser, IconX } from 'twenty-ui/icon';
+import {
+ Avatar,
+ type ChipSize,
+ type ChipVariant,
+} from 'twenty-ui/primitives/data-display';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
-} from '@ui/testing';
+} from 'twenty-ui/testing';
import { MemoryRouter } from 'react-router-dom';
-import { type ChipSize } from '@ui/primitives/data-display/Chip/types/ChipSize';
-import { type ChipVariant } from '@ui/primitives/data-display/Chip/types/ChipVariant';
-import { LinkChip } from '@ui/primitives/data-display/LinkChip/LinkChip';
+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
const meta: Meta<typeof LinkChip> = {
title: 'UI/Data Display/LinkChip',
diff --git a/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/types/LinkChipProps.ts b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/types/LinkChipProps.ts
new file mode 100644
index 00000000000..47d9be98a3f
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/types/LinkChipProps.ts
@@ -0,0 +1,15 @@
+import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
+import { type ComponentPropsWithRef, type MouseEvent } from 'react';
+import { type Link } from 'react-router-dom';
+import { type ChipProps } from 'twenty-ui/primitives/data-display';
+
+export type LinkChipProps = Omit<
+ ChipProps,
+ 'render' | 'ref' | 'onClick' | 'onMouseDown' | 'disabled' | 'nativeButton'
+> &
+ Pick<ComponentPropsWithRef<typeof Link>, 'target' | 'ref'> & {
+ to: string;
+ onClick?: (event: MouseEvent<HTMLElement>) => void;
+ onMouseDown?: (event: MouseEvent<HTMLElement>) => void;
+ triggerEvent?: TriggerEventType;
+ };
diff --git a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.tsx b/packages/twenty-front/src/modules/ui/navigation/link/components/UndecoratedLink/UndecoratedLink.tsx
similarity index 82%
rename from packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.tsx
rename to packages/twenty-front/src/modules/ui/navigation/link/components/UndecoratedLink/UndecoratedLink.tsx
index 2fb08926390..57626891eb8 100644
--- a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/UndecoratedLink/UndecoratedLink.tsx
@@ -1,7 +1,14 @@
+import { css } from '@linaria/core';
import React from 'react';
import { Link } from 'react-router-dom';
-import styles from './UndecoratedLink.module.scss';
+const styles = {
+ undecoratedLink: css`
+ & {
+ text-decoration: none;
+ }
+ `,
+};
type UndecoratedLinkProps = {
to: string | number;
diff --git a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/link/components/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
similarity index 80%
rename from packages/twenty-ui/src/primitives/navigation/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
rename to packages/twenty-front/src/modules/ui/navigation/link/components/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
index 660d1ac62fa..b43e5c234e4 100644
--- a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { UndecoratedLink } from '@ui/primitives/navigation/UndecoratedLink/UndecoratedLink';
-import { ComponentWithRouterDecorator } from '@ui/testing';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
+import { ComponentWithRouterDecorator } from 'twenty-ui/testing';
import { expect, userEvent, within } from 'storybook/test';
const meta: Meta<typeof UndecoratedLink> = {
diff --git a/packages/twenty-ui/src/primitives/data-display/Chip/constants/LinkChipClickOutsideId.ts b/packages/twenty-front/src/modules/ui/navigation/link/constants/LinkChipClickOutsideId.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/Chip/constants/LinkChipClickOutsideId.ts
rename to packages/twenty-front/src/modules/ui/navigation/link/constants/LinkChipClickOutsideId.ts
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx
index 98a79f84894..5f45b3ffe44 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx
@@ -1,40 +1,12 @@
-import { t } from '@lingui/core/macro';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { type Placement } from '@floating-ui/react';
-import { type MouseEvent, type ReactNode, useContext } from 'react';
-import {
- IconChevronRight,
- type IconComponent,
- IconDotsVertical,
-} from 'twenty-ui/icon';
+import { t } from '@lingui/core/macro';
+import { type MouseEvent, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { LightIconButton } from 'twenty-ui/components';
-import {
- type MenuItemAccent,
- MenuItemLeftContent,
- StyledHoverableMenuItemBase,
- StyledMenuItemLeftContent,
-} from 'twenty-ui/primitives/navigation';
+import { IconDotsVertical } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { ThemeContext } from 'twenty-ui/theme-constants';
-
-export type MenuItemWithOptionDropdownProps = {
- accent?: MenuItemAccent;
- className?: string;
- dropdownContent: ReactNode;
- dropdownId: string;
- isIconDisplayedOnHoverOnly?: boolean;
- isTooltipOpen?: boolean;
- LeftIcon?: IconComponent | null;
- RightIcon?: IconComponent | null;
- onClick?: (event: MouseEvent<HTMLDivElement>) => void;
- onMouseEnter?: (event: MouseEvent<HTMLDivElement>) => void;
- onMouseLeave?: (event: MouseEvent<HTMLDivElement>) => void;
- testId?: string;
- text: ReactNode;
- hasSubMenu?: boolean;
- dropdownPlacement?: Placement;
- selected?: boolean;
-};
+import { type MenuItemWithOptionDropdownProps } from './types/MenuItemWithOptionDropdownProps';
// TODO: refactor this
export const MenuItemWithOptionDropdown = ({
@@ -64,41 +36,37 @@ export const MenuItemWithOptionDropdown = ({
};
return (
- <StyledHoverableMenuItemBase
+ <ListItem
data-testid={testId ?? undefined}
onClick={handleMenuItemClick}
className={className}
- accent={accent}
- isIconDisplayedOnHoverOnly={isIconDisplayedOnHoverOnly}
+ color={accent === 'danger' ? 'danger' : 'neutral'}
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
focused={selected}
+ startIcon={LeftIcon && <LeftIcon size={theme.icon.size.md} />}
+ hasSubmenu={hasSubMenu}
+ actionsVisibility={isIconDisplayedOnHoverOnly ? 'hover' : 'always'}
+ actions={
+ <div className="hoverable-buttons">
+ <Dropdown
+ clickableComponent={
+ <LightIconButton
+ size="sm"
+ emphasis="subtle"
+ aria-label={t`More options`}
+ >
+ {isDefined(RightIcon) ? <RightIcon /> : <IconDotsVertical />}
+ </LightIconButton>
+ }
+ dropdownPlacement={dropdownPlacement}
+ dropdownComponents={dropdownContent}
+ dropdownId={dropdownId}
+ />
+ </div>
+ }
>
- <StyledMenuItemLeftContent>
- <MenuItemLeftContent LeftIcon={LeftIcon ?? undefined} text={text} />
- </StyledMenuItemLeftContent>
- <div className="hoverable-buttons">
- <Dropdown
- clickableComponent={
- <LightIconButton
- size="sm"
- emphasis="subtle"
- aria-label={t`More options`}
- >
- {isDefined(RightIcon) ? <RightIcon /> : <IconDotsVertical />}
- </LightIconButton>
- }
- dropdownPlacement={dropdownPlacement}
- dropdownComponents={dropdownContent}
- dropdownId={dropdownId}
- />
- </div>
- {hasSubMenu && (
- <IconChevronRight
- size={theme.icon.size.sm}
- color={theme.font.color.tertiary}
- />
- )}
- </StyledHoverableMenuItemBase>
+ {text}
+ </ListItem>
);
};
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/types/MenuItemWithOptionDropdownProps.ts b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/types/MenuItemWithOptionDropdownProps.ts
new file mode 100644
index 00000000000..8f6f01e7d9c
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/types/MenuItemWithOptionDropdownProps.ts
@@ -0,0 +1,23 @@
+import { type Placement } from '@floating-ui/react';
+import { type MouseEvent, type ReactNode } from 'react';
+import { type MenuItemAccent } from 'twenty-ui/components';
+import { type IconComponent } from 'twenty-ui/icon';
+
+export type MenuItemWithOptionDropdownProps = {
+ accent?: MenuItemAccent;
+ className?: string;
+ dropdownContent: ReactNode;
+ dropdownId: string;
+ isIconDisplayedOnHoverOnly?: boolean;
+ isTooltipOpen?: boolean;
+ LeftIcon?: IconComponent | null;
+ RightIcon?: IconComponent | null;
+ onClick?: (event: MouseEvent<HTMLDivElement>) => void;
+ onMouseEnter?: (event: MouseEvent<HTMLDivElement>) => void;
+ onMouseLeave?: (event: MouseEvent<HTMLDivElement>) => void;
+ testId?: string;
+ text: ReactNode;
+ hasSubMenu?: boolean;
+ dropdownPlacement?: Placement;
+ selected?: boolean;
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
index 179cf871caf..fabf93375dd 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
@@ -1,12 +1,12 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { NavigationBar } from 'twenty-ui/components';
import {
IconCheckbox,
IconList,
IconSearch,
IconSettings,
} from 'twenty-ui/icon';
-import { NavigationBar } from 'twenty-ui/primitives/navigation';
import { ComponentDecorator } from 'twenty-ui/testing';
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
index fc72f115eb9..7db3ed4b35c 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
@@ -1,16 +1,14 @@
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
-
import { useAuth } from '@/auth/hooks/useAuth';
import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { countAvailableWorkspaces } from '@/auth/utils/availableWorkspacesUtils';
-import { supportChatState } from '@/client-config/states/supportChatState';
import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
+import { supportChatState } from '@/client-config/states/supportChatState';
import { useBuildWorkspaceUrl } from '@/domain-manager/hooks/useBuildWorkspaceUrl';
import { useRedirectToDefaultDomain } from '@/domain-manager/hooks/useRedirectToDefaultDomain';
import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
import { useOpenRecordInPreference } from '@/settings/experience/hooks/useOpenRecordInPreference';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
@@ -18,6 +16,8 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
+import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownId';
import { OPEN_RECORD_IN_OPTIONS } from '@/ui/navigation/navigation-drawer/constants/OpenRecordInOptions';
import { multiWorkspaceDropdownState } from '@/ui/navigation/navigation-drawer/states/multiWorkspaceDropdownState';
@@ -28,7 +28,7 @@ import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import { LightIconButton } from 'twenty-ui/components';
import {
IconDotsVertical,
IconLogout,
@@ -38,8 +38,8 @@ import {
IconSwitchHorizontal,
IconUserPlus,
} from 'twenty-ui/icon';
-import { LightIconButton } from 'twenty-ui/components';
-import { ListItem, UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { useIsMobile } from 'twenty-ui/utilities';
import { type AvailableWorkspace } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx
index b13b066cd4b..ac0db3aea98 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx
@@ -1,14 +1,14 @@
-import { Avatar } from 'twenty-ui/primitives/data-display';
-import { UndecoratedLink, ListItem } from 'twenty-ui/primitives/navigation';
+import { getAvailableWorkspacePathAndSearchParams } from '@/auth/utils/availableWorkspacesUtils';
+import { useBuildWorkspaceUrl } from '@/domain-manager/hooks/useBuildWorkspaceUrl';
+import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
+import { t } from '@lingui/core/macro';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { type AvailableWorkspace } from '~/generated-metadata/graphql';
-import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
-import { getAvailableWorkspacePathAndSearchParams } from '@/auth/utils/availableWorkspacesUtils';
-import { t } from '@lingui/core/macro';
-import React from 'react';
-import { useBuildWorkspaceUrl } from '@/domain-manager/hooks/useBuildWorkspaceUrl';
export const AvailableWorkspaceItem = ({
availableWorkspace,
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
index b04ed3fd7a1..015652c42d6 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
@@ -1,15 +1,15 @@
import { FrontComponentMediaSessionIndicator } from '@/front-components/media-session/components/FrontComponentMediaSessionIndicator';
-import { NAVIGATION_DRAWER_COLLAPSED_BUTTON_SIZE } from '@/ui/navigation/navigation-drawer/constants/NavigationDrawerCollapsedButtonSize';
import { APP_HEADER_HEIGHT } from '@/ui/layout/constants/AppHeaderHeight';
+import { NAVIGATION_DRAWER_COLLAPSED_BUTTON_SIZE } from '@/ui/navigation/navigation-drawer/constants/NavigationDrawerCollapsedButtonSize';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconSearch } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconSearch } from 'twenty-ui/icon';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
+import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';
import { useOpenRecordsSearchPageInSidePanel } from '@/side-panel/hooks/useOpenRecordsSearchPageInSidePanel';
import { MultiWorkspaceDropdownButton } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton';
-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { NavigationDrawerCollapseButton } from './NavigationDrawerCollapseButton';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
index 16097b807d1..c1934f9c9ac 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
@@ -1,12 +1,14 @@
-import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
-import { NavigationDrawerItemEditingContext } from '@/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext';
-import { NAVIGATION_DRAWER_COLLAPSED_BUTTON_SIZE } from '@/ui/navigation/navigation-drawer/constants/NavigationDrawerCollapsedButtonSize';
import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';
+import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';
import { NavigationDrawerItemBreadcrumb } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemBreadcrumb';
+import { NAVIGATION_DRAWER_COLLAPSED_BUTTON_SIZE } from '@/ui/navigation/navigation-drawer/constants/NavigationDrawerCollapsedButtonSize';
+import { NavigationDrawerItemEditingContext } from '@/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext';
import { useNavigationDrawerTooltip } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerTooltip';
import { type NavigationDrawerSubItemState } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerSubItemState';
import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
+import { useMouseDownNavigation } from '@/ui/navigation/utils/hooks/useMouseDownNavigation';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { styled } from '@linaria/react';
@@ -14,22 +16,18 @@ import { t } from '@lingui/core/macro';
import { type JSX, type ReactNode, useContext } from 'react';
import { Link } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { Pill } from 'twenty-ui/primitives/data-display';
import { type IconComponent, type TablerIconsProps } from 'twenty-ui/icon';
+import { Pill } from 'twenty-ui/primitives/data-display';
+import { Tooltip } from 'twenty-ui/primitives/surfaces';
import {
- Tooltip,
+ Text,
OverflowingTextWithTooltip,
-} from 'twenty-ui/primitives/surfaces';
-import { Label } from 'twenty-ui/primitives/typography';
+} from 'twenty-ui/primitives/typography';
import {
MOBILE_VIEWPORT,
ThemeContext,
themeCssVariables,
} from 'twenty-ui/theme-constants';
-import {
- type TriggerEventType,
- useMouseDownNavigation,
-} from 'twenty-ui/utilities';
const DEFAULT_INDENTATION_LEVEL = 1;
export type NavigationDrawerItemIndentationLevel = 1 | 2;
@@ -439,7 +437,7 @@ export const NavigationDrawerItem = ({
{isDefined(keyboardKeys) && (
<NavigationDrawerAnimatedCollapseWrapper>
<StyledKeyBoardShortcut className="keyboard-shortcuts">
- <Label>{keyboardKeys}</Label>
+ <StyledDisplayLabel>{keyboardKeys}</StyledDisplayLabel>
</StyledKeyBoardShortcut>
</NavigationDrawerAnimatedCollapseWrapper>
)}
@@ -475,3 +473,9 @@ export const NavigationDrawerItem = ({
</StyledNavigationDrawerItemContainer>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
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.tsx
index 18ed0b8e4ab..bd9fc294299 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
@@ -5,7 +5,7 @@ import { motion } from 'framer-motion';
import React, { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { IconChevronRight } from 'twenty-ui/icon';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTitle = styled.div`
@@ -92,7 +92,9 @@ export const NavigationDrawerSectionTitle = ({
return (
<StyledTitle className="section-title-container">
<StyledLabelContainer onClick={handleTitleClick}>
- <Label className="section-title-label">{label}</Label>
+ <StyledDisplayLabel className="section-title-label">
+ {label}
+ </StyledDisplayLabel>
{isOpen !== undefined && (
<StyledChevron>
<MotionIconChevronRight
@@ -117,3 +119,9 @@ export const NavigationDrawerSectionTitle = ({
</StyledTitle>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx b/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx
index af9fceb117d..032081cac23 100644
--- a/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx
@@ -2,8 +2,8 @@ import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import { useContext } from 'react';
+import { AnimatedCheckmark } from '@/ui/navigation/step-bar/components/internal/AnimatedCheckmark/AnimatedCheckmark';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
-import { AnimatedCheckmark } from 'twenty-ui/primitives/data-display';
import {
MOBILE_VIEWPORT,
ThemeContext,
diff --git a/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.tsx b/packages/twenty-front/src/modules/ui/navigation/step-bar/components/internal/AnimatedCheckmark/AnimatedCheckmark.tsx
similarity index 67%
rename from packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.tsx
rename to packages/twenty-front/src/modules/ui/navigation/step-bar/components/internal/AnimatedCheckmark/AnimatedCheckmark.tsx
index 3485e91d13c..7681c8f89e0 100644
--- a/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/step-bar/components/internal/AnimatedCheckmark/AnimatedCheckmark.tsx
@@ -1,6 +1,23 @@
-import { useTheme } from '@ui/theme-constants';
+import { css } from '@linaria/core';
+import { useTheme } from 'twenty-ui/theme-constants';
-import styles from './AnimatedCheckmark.module.scss';
+const styles = {
+ animatedPath: css`
+ & {
+ animation: animated-checkmark-draw-checkmark
+ var(--animated-checkmark-duration, 0.5s) ease forwards;
+ }
+
+ @keyframes animated-checkmark-draw-checkmark {
+ from {
+ stroke-dashoffset: 1;
+ }
+ to {
+ stroke-dashoffset: 0;
+ }
+ }
+ `,
+};
export type AnimatedCheckmarkProps = {
isAnimating?: boolean;
diff --git a/packages/twenty-ui/src/utilities/navigation/hooks/useMouseDownNavigation.ts b/packages/twenty-front/src/modules/ui/navigation/utils/hooks/useMouseDownNavigation.ts
similarity index 86%
rename from packages/twenty-ui/src/utilities/navigation/hooks/useMouseDownNavigation.ts
rename to packages/twenty-front/src/modules/ui/navigation/utils/hooks/useMouseDownNavigation.ts
index 75f3c3ba272..c7c1b751810 100644
--- a/packages/twenty-ui/src/utilities/navigation/hooks/useMouseDownNavigation.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/utils/hooks/useMouseDownNavigation.ts
@@ -1,8 +1,8 @@
-import { isNavigationModifierPressed } from '@ui/utilities/navigation/isNavigationModifierPressed';
-import { type TriggerEventType } from '@ui/utilities/navigation/types/trigger-event.type';
+import { isNavigationModifierPressed } from '@/ui/navigation/utils/isNavigationModifierPressed';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
import { type MouseEvent } from 'react';
import { useNavigate } from 'react-router-dom';
-import { isDefined } from '@ui/utilities/utils/isDefined';
+import { isDefined } from 'twenty-ui/utilities';
type UseMouseDownNavigationProps = {
to?: string;
diff --git a/packages/twenty-ui/src/utilities/navigation/hooks/useResetLocationHash.ts b/packages/twenty-front/src/modules/ui/navigation/utils/hooks/useResetLocationHash.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/navigation/hooks/useResetLocationHash.ts
rename to packages/twenty-front/src/modules/ui/navigation/utils/hooks/useResetLocationHash.ts
diff --git a/packages/twenty-ui/src/utilities/navigation/isNavigationModifierPressed.ts b/packages/twenty-front/src/modules/ui/navigation/utils/isNavigationModifierPressed.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/navigation/isNavigationModifierPressed.ts
rename to packages/twenty-front/src/modules/ui/navigation/utils/isNavigationModifierPressed.ts
diff --git a/packages/twenty-ui/src/utilities/navigation/types/trigger-event.type.ts b/packages/twenty-front/src/modules/ui/navigation/utils/types/trigger-event.type.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/navigation/types/trigger-event.type.ts
rename to packages/twenty-front/src/modules/ui/navigation/utils/types/trigger-event.type.ts
diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx b/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx
index 8cb7dd7726c..cc17a1334cc 100644
--- a/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx
+++ b/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx
@@ -17,8 +17,8 @@ jest.mock('@apollo/client/react', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts b/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts
index 8c05a56d570..5c4987a9c26 100644
--- a/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts
+++ b/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts
@@ -9,7 +9,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type IconComponent,
IconMoon,
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx
index 9c9b511158e..fe31fb12fd7 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx
@@ -7,26 +7,26 @@ import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUp
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { VIEW_BAR_FILTER_BOTTOM_MENU_ITEM_IDS } from '@/views/constants/ViewBarFilterBottomMenuItemIds';
import { useChildRecordFiltersAndRecordFilterGroups } from '@/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups';
import { useSetRecordFilterUsedInAdvancedFilterDropdownRow } from '@/object-record/advanced-filter/hooks/useSetRecordFilterUsedInAdvancedFilterDropdownRow';
import { rootLevelRecordFilterGroupComponentSelector } from '@/object-record/advanced-filter/states/rootLevelRecordFilterGroupComponentSelector';
import { useCreateEmptyRecordFilterFromFieldMetadataItem } from '@/object-record/record-filter/hooks/useCreateEmptyRecordFilterFromFieldMetadataItem';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { getViewBarAdvancedFilterDropdownId } from '@/views/utils/getViewBarAdvancedFilterDropdownId';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
+import { getViewBarAdvancedFilterDropdownId } from '@/views/utils/getViewBarAdvancedFilterDropdownId';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Pill } from 'twenty-ui/primitives/data-display';
import { IconFilter } from 'twenty-ui/icon';
+import { Pill } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx
index 943cae27994..0d79308a472 100644
--- a/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx
@@ -1,17 +1,17 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { t } from '@lingui/core/macro';
-import { LightIconButton } from 'twenty-ui/components';
import { useActiveFieldMetadataItems } from '@/object-metadata/hooks/useActiveFieldMetadataItems';
import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
import { ObjectOptionsDropdownContext } from '@/object-record/object-options-dropdown/states/contexts/ObjectOptionsDropdownContext';
import { useChangeRecordFieldVisibility } from '@/object-record/record-field/hooks/useChangeRecordFieldVisibility';
import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { ViewType } from '@/views/types/ViewType';
+import { t } from '@lingui/core/macro';
import { useContext } from 'react';
+import { LightIconButton } from 'twenty-ui/components';
import { IconEye, useIcons } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
export const ViewFieldsHiddenDropdownSection = () => {
const { viewType, objectMetadataItem, recordIndexId } = useContext(
diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx
index b09d1450c76..1496bc22298 100644
--- a/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx
@@ -1,18 +1,18 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
-import { LightIconButton } from 'twenty-ui/components';
import { useActiveFieldMetadataItems } from '@/object-metadata/hooks/useActiveFieldMetadataItems';
import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
import { ObjectOptionsDropdownContext } from '@/object-record/object-options-dropdown/states/contexts/ObjectOptionsDropdownContext';
import { useChangeRecordFieldVisibility } from '@/object-record/record-field/hooks/useChangeRecordFieldVisibility';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { ViewType } from '@/views/types/ViewType';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
+import { LightIconButton } from 'twenty-ui/components';
import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/icon';
+import { ListItem } from 'twenty-ui/primitives/navigation';
type ViewFieldsSearchDropdownSectionProps = {
searchInput: string;
diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx
index dfa7707a480..04fc89d4378 100644
--- a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx
@@ -1,7 +1,3 @@
-import { t } from '@lingui/core/macro';
-import { LightIconButton } from 'twenty-ui/components';
-import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
-
import { useGetFieldMetadataItemByIdOrThrow } from '@/object-metadata/hooks/useGetFieldMetadataItemById';
import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
@@ -11,13 +7,15 @@ import { useChangeRecordFieldVisibility } from '@/object-record/record-field/hoo
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
+import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { ViewType } from '@/views/types/ViewType';
+import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { LightIconButton, MenuItemDraggable } from 'twenty-ui/components';
import { IconEyeOff, useIcons } from 'twenty-ui/icon';
-import { MenuItemDraggable } from 'twenty-ui/primitives/navigation';
import { sortByProperty } from '~/utils/array/sortByProperty';
export const ViewFieldsVisibleDropdownSection = () => {
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiUpdate.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiUpdate.ts
index 737d1a80b2e..34250a4e17b 100644
--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiUpdate.ts
+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiUpdate.ts
@@ -13,7 +13,7 @@ import { t } from '@lingui/core/macro';
import { useStore } from 'jotai';
import { CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type UpdateViewMutation,
type UpdateViewMutationVariables,
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityApiPersistOperation.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityApiPersistOperation.ts
index 4ee70887ae2..5ad5eb76510 100644
--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityApiPersistOperation.ts
+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityApiPersistOperation.ts
@@ -8,7 +8,7 @@ import { t } from '@lingui/core/macro';
import { type AllMetadataName } from 'twenty-shared/metadata';
import { type CrudOperationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
type MetadataStoreDraftUtils = Pick<
ReturnType<typeof useUpdateMetadataStoreDraft>,
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
index 6f7e5f12437..46b57a8ca68 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
@@ -1,8 +1,7 @@
-import { styled } from '@linaria/react';
-import { t } from '@lingui/core/macro';
+import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { StyledDropdownButtonContainer } from '@/ui/layout/dropdown/components/StyledDropdownButtonContainer';
-import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useGetRecordIndexTotalCount } from '@/views/hooks/internal/useGetRecordIndexTotalCount';
@@ -11,14 +10,15 @@ import { ViewPickerContentCreateMode } from '@/views/view-picker/components/View
import { ViewPickerContentEditMode } from '@/views/view-picker/components/ViewPickerContentEditMode';
import { ViewPickerContentEffect } from '@/views/view-picker/components/ViewPickerContentEffect';
import { ViewPickerListContent } from '@/views/view-picker/components/ViewPickerListContent';
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { getViewPickerDropdownId } from '@/views/view-picker/utils/getViewPickerDropdownId';
import { useUpdateViewFromCurrentState } from '@/views/view-picker/hooks/useUpdateViewFromCurrentState';
import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
+import { getViewPickerDropdownId } from '@/views/view-picker/utils/getViewPickerDropdownId';
+import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronDown, IconList, useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { useContext } from 'react';
import {
MOBILE_VIEWPORT,
ThemeContext,
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx
index 540e2d93d78..3637ffaa397 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx
@@ -1,15 +1,15 @@
import { LightCopyIconButton } from '@/object-record/record-field/ui/components/LightCopyIconButton';
+import { AnimatedCircleLoading } from '@/workflow/components/internal/AnimatedCircleLoading/AnimatedCircleLoading';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { useContext } from 'react';
+import { CodeEditor, CodeEditorHeader } from 'twenty-ui/components/code-editor';
import {
IconLoader,
IconSquareRoundedCheck,
IconSquareRoundedX,
} from 'twenty-ui/icon';
-import { CodeEditor, CodeEditorHeader } from 'twenty-ui/components/code-editor';
-import { AnimatedCircleLoading } from 'twenty-ui/primitives/layout';
-import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';
-import { useContext } from 'react';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
display: flex;
flex: 1;
diff --git a/packages/twenty-front/src/modules/workflow/components/internal/AnimatedCircleLoading/AnimatedCircleLoading.tsx b/packages/twenty-front/src/modules/workflow/components/internal/AnimatedCircleLoading/AnimatedCircleLoading.tsx
new file mode 100644
index 00000000000..19d8fac5928
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/components/internal/AnimatedCircleLoading/AnimatedCircleLoading.tsx
@@ -0,0 +1,28 @@
+import { css } from '@linaria/core';
+
+const styles = {
+ container: css`
+ & {
+ align-items: center;
+ animation: animated-circle-loading-animatedCircleLoadingSpin
+ calc(var(--t-animation-duration-slow) * 1s) ease-in-out infinite;
+ display: flex;
+ justify-content: center;
+ }
+
+ @keyframes animated-circle-loading-animatedCircleLoadingSpin {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+ }
+ `,
+};
+
+export const AnimatedCircleLoading = ({
+ children,
+}: {
+ children: React.ReactNode;
+}) => <div className={styles.container}>{children}</div>;
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowEditorMutationErrorHandler.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowEditorMutationErrorHandler.ts
index 0e8d5056d95..635a890f4c4 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowEditorMutationErrorHandler.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowEditorMutationErrorHandler.ts
@@ -1,6 +1,6 @@
import { useStore } from 'jotai';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeButtonGroup.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeButtonGroup.tsx
index 1e74979ef4d..91c7c78624e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeButtonGroup.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { ButtonGroup } from 'twenty-ui/primitives/input';
import { type ReactNode } from 'react';
+import { ButtonGroup } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledButtonGroupContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx
index b2d5973acfd..2f573a014fb 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
@@ -33,7 +33,13 @@ export const WorkflowDiagramEdgeLabel = ({
return (
<StyledContainer>
{isDefined(elseIfIndex) && <StyledNumber>{elseIfIndex}</StyledNumber>}
- <Label>{label}</Label>
+ <StyledDisplayLabel>{label}</StyledDisplayLabel>
</StyledContainer>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
index 393f9e2c61d..e784ece26a1 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
@@ -10,8 +10,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useId } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconDotsVertical } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/components';
+import { IconDotsVertical } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledOptionsButtonContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx
index a1d7270b1d0..fdb2f0d1032 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx
@@ -1,7 +1,7 @@
import type { WorkflowRunStepStatus } from '@/workflow/types/Workflow';
import { getWorkflowDiagramColors } from '@/workflow/workflow-diagram/utils/getWorkflowDiagramColors';
import { styled } from '@linaria/react';
-import { Label } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
type WorkflowNodeLabelProps = {
runStatus?: WorkflowRunStepStatus;
@@ -30,7 +30,13 @@ export const WorkflowNodeLabel = ({
return (
<StyledNodeLabelWrapper labelColor={labelColor} className={className}>
- <Label>{children}</Label>
+ <StyledDisplayLabel>{children}</StyledDisplayLabel>
</StyledNodeLabelWrapper>
);
};
+
+const StyledDisplayLabel = styled(Text)`
+ color: var(--t-font-color-light);
+ font-size: 11px;
+ font-weight: var(--t-font-weight-semi-bold);
+`;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
index fa2286495f9..a841bcb6363 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
@@ -8,8 +8,8 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { WorkflowVariableSearchResultItems } from '@/workflow/workflow-variables/components/WorkflowVariableSearchResultItems';
import { useUpdateStepFilterFromVariable } from '@/workflow/workflow-steps/filters/hooks/useUpdateStepFilterFromVariable';
+import { WorkflowVariableSearchResultItems } from '@/workflow/workflow-variables/components/WorkflowVariableSearchResultItems';
import { useVariableDropdown } from '@/workflow/workflow-variables/hooks/useVariableDropdown';
import { isRecordOutputSchemaV2 } from '@/workflow/workflow-variables/types/guards/isRecordOutputSchemaV2';
import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';
@@ -22,8 +22,8 @@ import { getWorkflowVariableRecordObjectDisplay } from '@/workflow/workflow-vari
import { useLingui } from '@lingui/react/macro';
import { type StepFilter } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ListItem } from 'twenty-ui/primitives/navigation';
type WorkflowDropdownStepOutputItemsProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx
index 0e618015ed4..55a2a837bed 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx
@@ -9,13 +9,11 @@ import { getWorkflowRunStepContext } from '@/workflow/workflow-steps/utils/getWo
import { getWorkflowVariablesUsedInStep } from '@/workflow/workflow-steps/utils/getWorkflowVariablesUsedInStep';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconBrackets } from 'twenty-ui/icon';
import {
type GetJsonNodeHighlighting,
- JsonNestedNode,
- JsonTreeContextProvider,
+ JsonTree,
type ShouldExpandNodeInitiallyProps,
-} from 'twenty-ui/primitives/json-visualizer';
+} from 'twenty-ui/components';
import { type JsonValue } from 'type-fest';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
@@ -101,30 +99,21 @@ export const WorkflowRunStepInputDetail = ({ stepId }: { stepId: string }) => {
return (
<>
<WorkflowRunStepJsonContainer>
- <JsonTreeContextProvider
- value={{
- emptyArrayLabel: t`Empty Array`,
- emptyObjectLabel: t`Empty Object`,
- emptyStringLabel: t`[empty string]`,
- arrowButtonCollapsedLabel: t`Expand`,
- arrowButtonExpandedLabel: t`Collapse`,
- getNodeHighlighting,
- shouldExpandNodeInitially: isFirstNodeDepthOfPreviousStep,
- onNodeValueClick: copyToClipboard,
- }}
- >
- <JsonNestedNode
- elements={stepContext.map(({ id, name, context }) => ({
- id,
- label: name,
- value: context as JsonValue,
- }))}
- Icon={IconBrackets}
- depth={0}
- keyPath=""
- emptyElementsText=""
- />
- </JsonTreeContextProvider>
+ <JsonTree
+ emptyArrayLabel={t`Empty Array`}
+ emptyObjectLabel={t`Empty Object`}
+ emptyStringLabel={t`[empty string]`}
+ arrowButtonCollapsedLabel={t`Expand`}
+ arrowButtonExpandedLabel={t`Collapse`}
+ getNodeHighlighting={getNodeHighlighting}
+ shouldExpandNodeInitially={isFirstNodeDepthOfPreviousStep}
+ onNodeValueClick={copyToClipboard}
+ entries={stepContext.map(({ id, name, context }) => ({
+ id,
+ label: name,
+ value: context as JsonValue,
+ }))}
+ />
</WorkflowRunStepJsonContainer>
</>
);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepOutputDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepOutputDetail.tsx
index 4583a2ab18d..41791fa0527 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepOutputDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepOutputDetail.tsx
@@ -6,11 +6,7 @@ import { useWorkflowRunStepInfo } from '@/workflow/workflow-steps/hooks/useWorkf
import { getWorkflowRunStepInfoToDisplayAsOutput } from '@/workflow/workflow-steps/utils/getWorkflowRunStepInfoToDisplayAsOutput';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import {
- type GetJsonNodeHighlighting,
- isTwoFirstDepths,
- JsonTree,
-} from 'twenty-ui/primitives/json-visualizer';
+import { type GetJsonNodeHighlighting, JsonTree } from 'twenty-ui/components';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
export const WorkflowRunStepOutputDetail = ({ stepId }: { stepId: string }) => {
@@ -52,7 +48,6 @@ export const WorkflowRunStepOutputDetail = ({ stepId }: { stepId: string }) => {
<WorkflowRunStepJsonContainer>
<JsonTree
value={stepInfoToDisplay ?? t`No output available`}
- shouldExpandNodeInitially={isTwoFirstDepths}
emptyArrayLabel={t`Empty Array`}
emptyObjectLabel={t`Empty Object`}
emptyStringLabel={t`[empty string]`}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
index 0104437b711..b0b2c28e80f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
@@ -9,9 +9,9 @@ import { useAddStepFilterToGroup } from '@/workflow/workflow-steps/filters/hooks
import { useChildStepFiltersAndChildStepFilterGroups } from '@/workflow/workflow-steps/filters/hooks/useChildStepFiltersAndChildStepFilterGroups';
import { useUpsertStepFilterSettings } from '@/workflow/workflow-steps/filters/hooks/useUpsertStepFilterSettings';
import { buildEmptyStepFilter } from '@/workflow/workflow-steps/filters/utils/buildEmptyStepFilter';
+import { t } from '@lingui/core/macro';
import { StepLogicalOperator, type StepFilterGroup } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { t } from '@lingui/core/macro';
import { IconLibraryPlus, IconPlus } from 'twenty-ui/icon';
import { v4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterBuilder.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterBuilder.tsx
index 7705e93be31..f7041d9c0e2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterBuilder.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterBuilder.tsx
@@ -1,4 +1,4 @@
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { WorkflowEditActionFilterBodyEffect } from '@/workflow/workflow-steps/filters/components/WorkflowEditActionFilterBodyEffect';
import { WorkflowStepFilterAddFilterRuleSelect } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx
index 82eca64914d..63eb9172563 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx
@@ -4,29 +4,29 @@ import { SelectControl } from '@/ui/input/components/SelectControl';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { WorkflowDropdownStepOutputItems } from '@/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems';
-import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';
import { useUpdateStepFilterFromVariable } from '@/workflow/workflow-steps/filters/hooks/useUpdateStepFilterFromVariable';
+import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';
import { WorkflowVariablesDropdownSteps } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps';
import { useAvailableVariablesInWorkflowStep } from '@/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep';
import { useSearchVariable } from '@/workflow/workflow-variables/hooks/useSearchVariable';
+import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';
import {
type WorkflowVariableSelection,
type WorkflowVariableStepSelection,
} from '@/workflow/workflow-variables/types/WorkflowVariableSelection';
-import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';
+import { InputHint } from '@/ui/input/components/internal/InputHint/InputHint';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext, useState } from 'react';
import { type StepFilter } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import {
+ TRIGGER_STEP_ID,
extractRawVariableNamePart,
isStandaloneVariableString,
- TRIGGER_STEP_ID,
} from 'twenty-shared/workflow';
import { useIcons } from 'twenty-ui/icon';
-import { InputHint } from 'twenty-ui/primitives/input';
import { FieldMetadataType } from '~/generated-metadata/graphql';
type WorkflowStepFilterFieldSelectProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts
index 8827d29e6d9..55b841e32fa 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts
@@ -42,8 +42,8 @@ jest.mock('@/object-record/hooks/useObjectPermissions', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts
index b0629ad96c5..d0f489f6505 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts
@@ -6,7 +6,7 @@ import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnab
import { CREATE_WORKFLOW_VERSION_EDGE } from '@/workflow/graphql/mutations/createWorkflowVersionEdge';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
CreateCoreWorkflowVersionEdgeDocument,
type CreateWorkflowVersionEdgeInput,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts
index 64930a404be..1ec5bdd0fc4 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts
@@ -6,7 +6,7 @@ import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnab
import { CREATE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/createWorkflowVersionStep';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
CreateCoreWorkflowVersionStepDocument,
type CreateWorkflowVersionStepInput,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts
index fdee88e3024..76430dd8c02 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts
@@ -8,7 +8,7 @@ import { DELETE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/delet
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
DeleteCoreWorkflowVersionStepDocument,
type DeleteWorkflowVersionStepInput,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts
index 5012f76035d..c45059446aa 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts
@@ -6,7 +6,7 @@ import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnab
import { DUPLICATE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/duplicateWorkflowVersionStep';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
DuplicateCoreWorkflowVersionStepDocument,
type DuplicateWorkflowVersionStepInput,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts
index 5ec7f894ec3..d31f53ff5d2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts
@@ -10,7 +10,7 @@ import { type WorkflowRun, type WorkflowStep } from '@/workflow/types/Workflow';
import { useMutation } from '@apollo/client/react';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type UpdateWorkflowRunStepInput,
type UpdateWorkflowRunStepMutation,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
index f81ceb6469b..8d5cf3c9130 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
@@ -19,7 +19,7 @@ import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useSte
import { useMutation } from '@apollo/client/react';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
UpdateCoreWorkflowVersionStepDocument,
type UpdateWorkflowVersionStepInput,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx
index 241fdfce65b..c9ea329f578 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx
@@ -1,8 +1,7 @@
-import { t } from '@lingui/core/macro';
-import { LightIconButton } from 'twenty-ui/components';
import { type SettingsRolePermissionsSettingPermission } from '@/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission';
+import { t } from '@lingui/core/macro';
+import { LightIconButton, MenuItem } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
type WorkflowAiAgentPermissionsFlagRowProps = {
permission: SettingsRolePermissionsSettingPermission;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsx
index a4b2ca0b92c..aebd132a9ee 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsx
@@ -1,6 +1,6 @@
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
+import { MenuItem } from 'twenty-ui/components';
type WorkflowAiAgentPermissionsObjectRowProps = {
objectMetadata: Pick<
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsx
index ccbab0ee355..2c251be12c0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsx
@@ -2,8 +2,8 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enriche
import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import { MenuItem } from 'twenty-ui/components';
import { IconSettings } from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
import { WorkflowAiAgentPermissionsObjectRow } from './WorkflowAiAgentPermissionsObjectRow';
type WorkflowAiAgentPermissionsObjectsListProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx
index 6dcd3ca9c0d..16cfdf8b2c3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx
@@ -1,9 +1,8 @@
-import { t } from '@lingui/core/macro';
-import { LightIconButton } from 'twenty-ui/components';
import { PermissionIcon } from '@/settings/roles/role-permissions/objects-permissions/components/PermissionIcon';
import { type SettingsRoleObjectPermissionKey } from '@/settings/roles/role-permissions/objects-permissions/constants/SettingsRoleObjectPermissionIconConfig';
+import { t } from '@lingui/core/macro';
+import { LightIconButton, MenuItem } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
-import { MenuItem } from 'twenty-ui/primitives/navigation';
type WorkflowAiAgentPermissionsPermissionRowProps = {
permission: {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx
index 39f9981d2ed..1cf94da5a25 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx
@@ -1,17 +1,16 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
-import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-
import { type OutputSchemaField } from '@/ai/constants/OutputFieldTypeOptions';
import { createDefaultOutputSchemaField } from '@/ai/utils/createDefaultOutputSchemaField';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { useState } from 'react';
import { isNonEmptyString } from '@sniptt/guards';
+import { useState } from 'react';
import { isValidAgentResponseSchemaPropertyKey } from 'twenty-shared/ai';
import { IconPlus } from 'twenty-ui/icon';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { WorkflowOutputFieldTypeSelector } from './WorkflowOutputFieldTypeSelector';
import { WorkflowOutputSchemaFieldHeader } from './WorkflowOutputSchemaFieldHeader';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx
index c1fb97d3118..d5d64107281 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx
@@ -3,20 +3,20 @@ import { useContext, useState } from 'react';
import { type AiToolCallLog } from 'twenty-shared/workflow';
import { useToolDisplayContext } from '@/ai/hooks/useToolDisplayContext';
-import { getToolDisplayMessage } from '@/ai/utils/tool-display/get-tool-display-message';
import { getToolIcon } from '@/ai/utils/getToolIcon';
+import { getToolDisplayMessage } from '@/ai/utils/tool-display/get-tool-display-message';
import { useLingui } from '@lingui/react/macro';
-import { type JsonValue } from 'type-fest';
+import { isDefined } from 'twenty-shared/utils';
+import { JsonTree } from 'twenty-ui/components';
import {
IconCheck,
IconChevronDown,
IconChevronUp,
IconCircleX,
} from 'twenty-ui/icon';
-import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { isDefined } from 'twenty-shared/utils';
+import { type JsonValue } from 'type-fest';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useWorkflowAiAgentPermissionActions.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useWorkflowAiAgentPermissionActions.ts
index 5d0e1f70744..1abffa626bb 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useWorkflowAiAgentPermissionActions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useWorkflowAiAgentPermissionActions.ts
@@ -12,7 +12,7 @@ import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { v4 } from 'uuid';
import {
type Agent,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/classify-action/components/WorkflowClassifyQuestionCriteria.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/classify-action/components/WorkflowClassifyQuestionCriteria.tsx
index 8e92480561a..c0e233a1a45 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/classify-action/components/WorkflowClassifyQuestionCriteria.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/classify-action/components/WorkflowClassifyQuestionCriteria.tsx
@@ -1,14 +1,15 @@
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { type WorkflowClassifyCriterion } from 'twenty-shared/workflow';
-import { v4 } from 'uuid';
import { IconTrash } from 'twenty-ui/icon';
-import { Button, InputLabel } from 'twenty-ui/primitives/input';
+import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { v4 } from 'uuid';
const StyledContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx
index af06b2b26f7..d6f6807b4d3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx
@@ -3,9 +3,9 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type Monaco } from '@monaco-editor/react';
import { type editor } from 'monaco-editor';
-import { IconMaximize } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
import { CodeEditor } from 'twenty-ui/components/code-editor';
+import { IconMaximize } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const CODE_EDITOR_MIN_HEIGHT = 343;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx
index 6939a93e64d..23b5266ef05 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx
@@ -1,19 +1,18 @@
-import { TabListRoot } from '@/ui/layout/tab-list/components/TabListRoot';
-import { WorkflowStepTabPanel } from '@/workflow/workflow-steps/components/WorkflowStepTabPanel';
import { useGetAvailablePackages } from '@/logic-functions/hooks/useGetAvailablePackages';
import { useLogicFunctionForm } from '@/logic-functions/hooks/useLogicFunctionForm';
import { useFullScreenModal } from '@/ui/layout/fullscreen/hooks/useFullScreenModal';
+import { TabListRoot } from '@/ui/layout/tab-list/components/TabListRoot';
import { type BreadcrumbProps } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';
import { type WorkflowCodeAction } from '@/workflow/types/Workflow';
+import { WorkflowStepTabPanel } from '@/workflow/workflow-steps/components/WorkflowStepTabPanel';
import { setNestedValue } from '@/workflow/workflow-steps/workflow-actions/code-action/utils/setNestedValue';
import { LogicFunctionExecutionResult } from '@/logic-functions/components/LogicFunctionExecutionResult';
import { LogicFunctionLogs } from '@/logic-functions/components/LogicFunctionLogs';
-import { CodeEditor } from 'twenty-ui/components/code-editor';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { TabList } from '@/ui/layout/tab-list/components/TabList';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
@@ -31,6 +30,7 @@ import { mergeDefaultFunctionInputAndFunctionInput } from '@/workflow/workflow-s
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { CodeEditor } from 'twenty-ui/components/code-editor';
import { LogicFunctionTestInputInitEffect } from '@/logic-functions/components/LogicFunctionTestInputInitEffect';
import { useExecuteLogicFunction } from '@/logic-functions/hooks/useExecuteLogicFunction';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCodeFields.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCodeFields.tsx
index 215914c32fb..bf751838150 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCodeFields.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCodeFields.tsx
@@ -1,6 +1,6 @@
import { FormNestedFieldInputContainer } from '@/object-record/record-field/ui/form-types/components/FormNestedFieldInputContainer';
import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { WorkflowEditActionCodeFieldLeaf } from '@/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCodeFieldLeaf';
import { getInputSchemaPropertyAtPath } from '@/workflow/workflow-steps/workflow-actions/code-action/utils/getInputSchemaPropertyAtPath';
import { getWorkflowCodeFieldsLeafKind } from '@/workflow/workflow-steps/workflow-actions/code-action/utils/getWorkflowCodeFieldsLeafKind';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
index 50d24280b05..a092303e75a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
@@ -5,9 +5,9 @@ import { FormDateTimeFieldInput } from '@/object-record/record-field/ui/form-typ
import { FormMultiTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput';
import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { AVAILABLE_TIMEZONE_OPTIONS } from '@/settings/experience/constants/AvailableTimezoneOptions';
import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
+import { AVAILABLE_TIMEZONE_OPTIONS } from '@/settings/experience/constants/AvailableTimezoneOptions';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';
@@ -20,9 +20,9 @@ import { t } from '@lingui/core/macro';
import { useEffect } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Callout } from 'twenty-ui/primitives/feedback';
-import { type SelectOption } from 'twenty-ui/primitives/input';
+import { Callout } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
+import { type SelectOption } from 'twenty-ui/primitives/input';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
type WorkflowEditActionCreateCalendarEventProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
index fa544e44dd2..89629ced613 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
@@ -3,10 +3,10 @@ import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
import { buildConnectedAccountSenderOptions } from '@/accounts/utils/buildConnectedAccountSenderOptions';
import { getMissingDraftEmailScopes } from '@/accounts/utils/hasMissingDraftEmailScopes';
import { FormAdvancedTextFieldInput } from '@/advanced-text-editor/components/FormAdvancedTextFieldInput';
+import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { FormMultiTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput';
import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
@@ -20,7 +20,6 @@ import { WORKFLOW_STEP_CONNECTED_ACCOUNT_HANDLE } from '@/workflow/graphql/queri
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';
import { type WorkflowEmailAction } from '@/workflow/types/WorkflowEmailAction';
-import { isStandaloneVariableString } from 'twenty-shared/workflow';
import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';
import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';
import { WorkflowSendEmailAttachments } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowSendEmailAttachments';
@@ -29,6 +28,7 @@ import { useEmailForm } from '@/workflow/workflow-steps/workflow-actions/hooks/u
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
+import { isNonEmptyString } from '@sniptt/guards';
import { useEffect, useState } from 'react';
import {
ConnectedAccountProvider,
@@ -40,9 +40,9 @@ import {
getSendableEmailHandles,
isDefined,
} from 'twenty-shared/utils';
-import { Callout } from 'twenty-ui/primitives/feedback';
+import { isStandaloneVariableString } from 'twenty-shared/workflow';
+import { Callout } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { isNonEmptyString } from '@sniptt/guards';
import { Button } from 'twenty-ui/primitives/input';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsDetail.tsx
index 99b3b1a0a93..48c1f7430e9 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsDetail.tsx
@@ -2,23 +2,20 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
import { workflowRunStepLogSchema } from 'twenty-shared/workflow';
+import { JsonTree } from 'twenty-ui/components';
import { IconInfoCircle } from 'twenty-ui/icon';
-import {
- isTwoFirstDepths,
- JsonTree,
-} from 'twenty-ui/primitives/json-visualizer';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type JsonValue } from 'type-fest';
import { useFlowOrThrow } from '@/workflow/hooks/useFlowOrThrow';
import { useWorkflowRunIdOrThrow } from '@/workflow/hooks/useWorkflowRunIdOrThrow';
import { useWorkflowRunStepLog } from '@/workflow/hooks/useWorkflowRunStepLog';
+import { getIsDescendantOfIterator } from '@/workflow/workflow-steps/utils/getIsDescendantOfIterator';
import { WorkflowRunStepLogsAiAgentDetail } from '@/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsAiAgentDetail';
import { WorkflowRunStepLogsCodeDetail } from '@/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowRunStepLogsCodeDetail';
import { WorkflowRunStepLogsEmailDetail } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsEmailDetail';
import { WorkflowRunStepLogsEntries } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsEntries';
import { WorkflowRunStepLogsHttpRequestDetail } from '@/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowRunStepLogsHttpRequestDetail';
-import { getIsDescendantOfIterator } from '@/workflow/workflow-steps/utils/getIsDescendantOfIterator';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
const StyledRoot = styled.div`
@@ -76,7 +73,6 @@ export const WorkflowRunStepLogsDetail = ({ stepId }: { stepId: string }) => {
<StyledRoot>
<JsonTree
value={rawStepLog as JsonValue}
- shouldExpandNodeInitially={isTwoFirstDepths}
emptyArrayLabel={t`Empty Array`}
emptyObjectLabel={t`Empty Object`}
emptyStringLabel={t`[empty string]`}
@@ -110,7 +106,6 @@ export const WorkflowRunStepLogsDetail = ({ stepId }: { stepId: string }) => {
return (
<JsonTree
value={stepLog.details as JsonValue}
- shouldExpandNodeInitially={isTwoFirstDepths}
emptyArrayLabel={t`Empty Array`}
emptyObjectLabel={t`Empty Object`}
emptyStringLabel={t`[empty string]`}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSendEmailAttachments.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSendEmailAttachments.tsx
index acd28634641..a2da3621b43 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSendEmailAttachments.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSendEmailAttachments.tsx
@@ -1,13 +1,13 @@
-import { useUploadWorkflowFile } from '@/workflow/workflow-steps/workflow-actions/hooks/useUploadWorkflowFile';
-import { AttachmentChip } from '@/file/components/AttachmentChip';
import { useFileUpload } from '@/file-upload/hooks/useFileUpload';
+import { AttachmentChip } from '@/file/components/AttachmentChip';
import { VariableChip } from '@/object-record/record-field/ui/form-types/components/VariableChip';
import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
+import { useUploadWorkflowFile } from '@/workflow/workflow-steps/workflow-actions/hooks/useUploadWorkflowFile';
-import { isString } from '@sniptt/guards';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { isString } from '@sniptt/guards';
import { useContext, useId } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type WorkflowEmailFiles } from 'twenty-shared/workflow';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx
index 7a89744868f..2ae7a6fac78 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx
@@ -22,8 +22,8 @@ import { type RecordFilter } from '@/object-record/record-filter/types/RecordFil
import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
import { useRecordIndexFieldMetadataDerivedStates } from '@/object-record/record-index/hooks/useRecordIndexFieldMetadataDerivedStates';
import { type RecordSort } from '@/object-record/record-sort/types/RecordSort';
-import { InputLabel } from 'twenty-ui/primitives/input';
import { SelectControl } from '@/ui/input/components/SelectControl';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { type WorkflowFindRecordsAction } from '@/workflow/types/Workflow';
@@ -33,8 +33,8 @@ import { WorkflowFindRecordsFilters } from '@/workflow/workflow-steps/workflow-a
import { WorkflowFindRecordsFiltersEffect } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect';
import { WorkflowFindRecordsSorts } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts';
import { WorkflowObjectDropdownContent } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent';
-import { isStandaloneVariableString } from 'twenty-shared/workflow';
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
+import { isStandaloneVariableString } from 'twenty-shared/workflow';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledLabel = styled.span`
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx
index fac9af2026d..f97a5708a96 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx
@@ -1,13 +1,12 @@
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormFieldInputInnerContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer';
import { FormFieldInputRowContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputRowContainer';
import { FormFieldPlaceholder } from '@/object-record/record-field/ui/form-types/components/FormFieldPlaceholder';
-import { InputLabel } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
-import { DragDropItemSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle';
import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
+import { DragDropItemSortableHandle } from '@/ui/utilities/drag-and-drop/components/DragDropItemSortableHandle';
import {
type WorkflowFormAction,
type WorkflowTriggerType,
@@ -23,7 +22,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext, useEffect, useState } from 'react';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Callout } from 'twenty-ui/primitives/feedback';
+import { Callout, LightIconButton } from 'twenty-ui/components';
import {
IconAlertTriangle,
IconChevronDown,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx
index 60e37b94d84..592f41de599 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx
@@ -1,7 +1,6 @@
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';
-import { InputLabel } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { WorkflowFormFieldSettingsByType } from '@/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsByType';
import { FORM_SELECT_FIELD_TYPE_OPTIONS } from '@/workflow/workflow-steps/workflow-actions/form-action/constants/FormSelectFieldTypeOptions';
import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';
@@ -9,9 +8,10 @@ import { type WorkflowFormFieldType } from '@/workflow/workflow-steps/workflow-a
import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconSettingsAutomation, IconX } from 'twenty-ui/icon';
-import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';
import { useContext } from 'react';
+import { LightIconButton } from 'twenty-ui/components';
+import { IconSettingsAutomation, IconX } from 'twenty-ui/icon';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type WorkflowEditActionFormFieldSettingsProps = {
field: WorkflowFormActionField;
onChange: (field: WorkflowFormActionField) => void;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsDate.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsDate.tsx
index 57bae9743db..7ff55e46888 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsDate.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsDate.tsx
@@ -1,6 +1,6 @@
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';
import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
import { t } from '@lingui/core/macro';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsNumber.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsNumber.tsx
index beaf41c5674..ee700e47953 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsNumber.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsNumber.tsx
@@ -1,10 +1,10 @@
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';
import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import camelCase from 'lodash.camelcase';
import { FieldMetadataType } from 'twenty-shared/types';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx
index cbf429fea20..efe2925b6fe 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx
@@ -1,15 +1,16 @@
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { InputLabel, type SelectOption } from 'twenty-ui/primitives/input';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { Select } from '@/ui/input/components/Select';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';
import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import camelCase from 'lodash.camelcase';
+import { type SelectOption } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type WorkflowFormFieldSettingsRecordPickerProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsSelect.tsx
index 880c91fe9d5..4adde166ba5 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsSelect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsSelect.tsx
@@ -1,13 +1,13 @@
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';
import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import camelCase from 'lodash.camelcase';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsText.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsText.tsx
index a7ad05665ca..aaf3f5d05eb 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsText.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsText.tsx
@@ -1,10 +1,10 @@
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';
import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import camelCase from 'lodash.camelcase';
import { FieldMetadataType } from 'twenty-shared/types';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/hooks/useUploadWorkflowFile.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/hooks/useUploadWorkflowFile.ts
index 3e41c2d1002..c60cb3715eb 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/hooks/useUploadWorkflowFile.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/hooks/useUploadWorkflowFile.ts
@@ -4,7 +4,7 @@ import { formatFileSize } from '@/file/utils/formatFileSize';
import { t } from '@lingui/core/macro';
import { extractFolderPathFilenameAndTypeOrThrow } from 'twenty-shared/utils';
import { type WorkflowAttachment } from 'twenty-shared/workflow';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { FileFolder } from '~/generated-metadata/graphql';
import { logError } from '~/utils/logError';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx
index 4f972c3b77c..b5f0bc4dfc1 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx
@@ -1,9 +1,8 @@
-import { t } from '@lingui/core/macro';
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormRawJsonFieldInput } from '@/object-record/record-field/ui/form-types/components/FormRawJsonFieldInput';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { Select } from '@/ui/input/components/Select';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import {
BODY_TYPES,
DEFAULT_JSON_BODY_PLACEHOLDER,
@@ -14,6 +13,7 @@ import { getBodyTypeFromHeaders } from '@/workflow/workflow-steps/workflow-actio
import { parseHttpJsonBodyWithoutVariablesOrThrow } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/parseHttpJsonBodyWithoutVariablesOrThrow';
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { isString } from '@sniptt/guards';
import { useState } from 'react';
import { isDefined, parseJson } from 'twenty-shared/utils';
@@ -22,9 +22,9 @@ import {
type BodyType,
} from 'twenty-shared/workflow';
import { IconFileText, IconKey } from 'twenty-ui/icon';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type JsonValue } from 'type-fest';
import { KeyValuePairInput } from './KeyValuePairInput';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
index dbc530d92e8..ec504efde63 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
@@ -1,15 +1,16 @@
-import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
-import { InputLabel, Button } from 'twenty-ui/primitives/input';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { AUTO_SET_HEADER_KEYS } from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/AutoSetHeaderKeys';
import { isAutoSetHeaderKey } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/isReadOnlyHeaderKey';
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { IconTrash } from 'twenty-ui/icon';
-import { v4 } from 'uuid';
+import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { v4 } from 'uuid';
const StyledContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
index 184128a955f..231653b4b77 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
@@ -1,4 +1,4 @@
-import { InputLabel, Button } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';
@@ -17,8 +17,8 @@ import { WorkflowIfElseBranchEditor } from '@/workflow/workflow-steps/workflow-a
import { calculateElseIfBranchPosition } from '@/workflow/workflow-steps/workflow-actions/if-else-action/utils/calculateElseIfBranchPosition';
import { calculateExistingBranchPositions } from '@/workflow/workflow-steps/workflow-actions/if-else-action/utils/calculateExistingBranchPositions';
import { createElseIfBranch } from '@/workflow/workflow-steps/workflow-actions/if-else-action/utils/createElseIfBranch';
-import { getBranchesToDelete } from '@/workflow/workflow-steps/workflow-actions/if-else-action/utils/getBranchesToDelete';
import { getBranchLabel } from '@/workflow/workflow-steps/workflow-actions/if-else-action/utils/getBranchLabel';
+import { getBranchesToDelete } from '@/workflow/workflow-steps/workflow-actions/if-else-action/utils/getBranchesToDelete';
import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useStepsOutputSchema';
import { useTidyUpWorkflowVersion } from '@/workflow/workflow-version/hooks/useTidyUpWorkflowVersion';
import { styled } from '@linaria/react';
@@ -27,6 +27,7 @@ import { Fragment } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type StepIfElseBranch } from 'twenty-shared/workflow';
import { IconPlus } from 'twenty-ui/icon';
+import { Button } from 'twenty-ui/primitives/input';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx
index 4334f19cf3a..851e76fdbcd 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx
@@ -1,13 +1,12 @@
-import { TabListRoot } from '@/ui/layout/tab-list/components/TabListRoot';
-import { WorkflowStepTabPanel } from '@/workflow/workflow-steps/components/WorkflowStepTabPanel';
import { useIsThirdPartyApplication } from '@/applications/hooks/useIsThirdPartyApplication';
import { LogicFunctionExecutionResult } from '@/logic-functions/components/LogicFunctionExecutionResult';
import { LogicFunctionLogs } from '@/logic-functions/components/LogicFunctionLogs';
import { LogicFunctionTestInputInitEffect } from '@/logic-functions/components/LogicFunctionTestInputInitEffect';
import { useExecuteLogicFunction } from '@/logic-functions/hooks/useExecuteLogicFunction';
import { useGetOneLogicFunction } from '@/logic-functions/hooks/useGetOneLogicFunction';
-import { InputLabel } from 'twenty-ui/primitives/input';
+import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { TabList } from '@/ui/layout/tab-list/components/TabList';
+import { TabListRoot } from '@/ui/layout/tab-list/components/TabListRoot';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { type WorkflowLogicFunctionAction } from '@/workflow/types/Workflow';
@@ -15,6 +14,7 @@ import { WorkflowExpectedOutputBodyInput } from '@/workflow/workflow-steps/compo
import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';
import { WorkflowStepCmdEnterButton } from '@/workflow/workflow-steps/components/WorkflowStepCmdEnterButton';
import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';
+import { WorkflowStepTabPanel } from '@/workflow/workflow-steps/components/WorkflowStepTabPanel';
import { WorkflowEditActionCodeFields } from '@/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCodeFields';
import { mergeDefaultFunctionInputAndFunctionInput } from '@/workflow/workflow-steps/workflow-actions/code-action/utils/mergeDefaultFunctionInputAndFunctionInput';
import { setNestedValue } from '@/workflow/workflow-steps/workflow-actions/code-action/utils/setNestedValue';
@@ -27,7 +27,7 @@ import { useMemo } from 'react';
import { getOutputSchemaFromValue } from 'twenty-shared/logic-function';
import { isDefined } from 'twenty-shared/utils';
import { getFunctionInputFromInputSchema } from 'twenty-shared/workflow';
-import { Callout } from 'twenty-ui/primitives/feedback';
+import { Callout } from 'twenty-ui/components';
import { IconPlayerPlay, IconSettingsAutomation } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsx
index 525c8e7daba..ff8afaa0d83 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsx
@@ -1,10 +1,11 @@
+import { InputHint } from '@/ui/input/components/internal/InputHint/InputHint';
import { styled } from '@linaria/react';
import { i18n } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { useEffect, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { type SelectOption, InputHint } from 'twenty-ui/primitives/input';
+import { type SelectOption } from 'twenty-ui/primitives/input';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx
index 115011c9095..7918354d0e5 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx
@@ -1,17 +1,17 @@
import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';
-import { InputHint } from 'twenty-ui/primitives/input';
+import { InputHint } from '@/ui/input/components/internal/InputHint/InputHint';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import type { WorkflowCronTrigger } from '@/workflow/types/Workflow';
import { calculateNextExecutionsForMinuteInterval } from '@/workflow/workflow-trigger/utils/cron-to-human/utils/calculateNextExecutionsForMinuteInterval';
import { convertScheduleToCronExpression } from '@/workflow/workflow-trigger/utils/cron-to-human/utils/convertScheduleToCronExpression';
import { normalizeCronExpression } from '@/workflow/workflow-trigger/utils/cron-to-human/utils/normalizeCronExpression';
import { getTriggerScheduleDescription } from '@/workflow/workflow-trigger/utils/getTriggerScheduleDescription';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { CronExpressionParser } from 'cron-parser';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
const getNextExecutions = (
cronExpression: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts
index e6bdb13554a..c079dbae290 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts
@@ -28,8 +28,8 @@ jest.mock('@/object-record/hooks/useObjectPermissions', () => ({
const mockEnqueueToast = jest.fn();
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
index 5c0e6ddc021..64237ab89a3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
@@ -21,7 +21,7 @@ import { useMutation } from '@apollo/client/react';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
UpdateCoreWorkflowVersionTriggerDocument,
type UpdateWorkflowVersionTriggerMutation,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
index 828f7063ad7..d0c275d6b88 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
@@ -23,9 +23,9 @@ import {
} from '@/workflow/workflow-variables/utils/getWorkflowVariableSpecialItems';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { ListItem } from 'twenty-ui/primitives/navigation';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
type WorkflowVariablesDropdownStepItemsProps = {
step: StepOutputSchemaV2;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
index 51ee1137dfe..a09380afbe4 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
@@ -1,4 +1,4 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
@@ -7,7 +7,6 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { WorkflowVariableSearchResultItems } from '@/workflow/workflow-variables/components/WorkflowVariableSearchResultItems';
import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';
@@ -20,8 +19,9 @@ import { getWorkflowVariableSelectionFromSearchResult } from '@/workflow/workflo
import { searchWorkflowVariables } from '@/workflow/workflow-variables/utils/searchWorkflowVariables';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconX, useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { ListItem } from 'twenty-ui/primitives/navigation';
type WorkflowVariablesDropdownStepsProps = {
dropdownId: string;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx
index 4db24620430..a72721d6b1f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx
@@ -15,8 +15,8 @@ jest.mock('@/workflow/hooks/useIsWorkflowCoreEnabled', () => ({
jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({
useApolloCoreClient: () => mockClient,
}));
-jest.mock('twenty-ui/primitives/feedback', () => ({
- ...jest.requireActual('twenty-ui/primitives/feedback'),
+jest.mock('twenty-ui/components', () => ({
+ ...jest.requireActual('twenty-ui/components'),
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts
index 7fce0fa7441..001156d684e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts
@@ -1,9 +1,7 @@
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { ComputeStepOutputSchemaDocument } from '~/generated/graphql';
-import { isBaseOutputSchemaV2, TRIGGER_STEP_ID } from 'twenty-shared/workflow';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
+import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { type WorkflowVersion } from '@/workflow/types/Workflow';
import { getStepOutputSchemaFamilyStateKey } from '@/workflow/utils/getStepOutputSchemaFamilyStateKey';
import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon';
@@ -23,7 +21,9 @@ import { resolvePersistedStepOutputSchema } from '@/workflow/workflow-variables/
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { isBaseOutputSchemaV2, TRIGGER_STEP_ID } from 'twenty-shared/workflow';
+import { useToast } from 'twenty-ui/components';
+import { ComputeStepOutputSchemaDocument } from '~/generated/graphql';
export const useStepsOutputSchema = () => {
const store = useStore();
diff --git a/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts b/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts
index c41535416ca..7f0492c5157 100644
--- a/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts
+++ b/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts
@@ -1,6 +1,6 @@
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type SendInvitationsMutationVariables,
GetWorkspaceInvitationsDocument,
diff --git a/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts b/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts
index dcc13750925..564d8a8c2b2 100644
--- a/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts
+++ b/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts
@@ -1,6 +1,6 @@
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type DeleteWorkspaceInvitationMutationVariables,
DeleteWorkspaceInvitationDocument,
diff --git a/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts b/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts
index 12e8c3246cd..0ab279285a8 100644
--- a/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts
+++ b/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts
@@ -1,6 +1,6 @@
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type ResendWorkspaceInvitationMutationVariables,
GetWorkspaceInvitationsDocument,
diff --git a/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx b/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx
index b83d05a554c..89a05e9d5a5 100644
--- a/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx
+++ b/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx
@@ -1,5 +1,6 @@
import { styled } from '@linaria/react';
-import { Avatar, AvatarGroup } from 'twenty-ui/primitives/data-display';
+import { AvatarGroup } from 'twenty-ui/components';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
index 4c028670564..4af9159b03f 100644
--- a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
+++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
@@ -13,7 +13,7 @@ import { i18n } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
IconLock,
IconSend,
diff --git a/packages/twenty-front/src/pages/auth/PasswordReset.tsx b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
index 944f1c525eb..6faa54d6d8f 100644
--- a/packages/twenty-front/src/pages/auth/PasswordReset.tsx
+++ b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
@@ -1,8 +1,9 @@
-import { StyledAuthContent } from '@/auth/components/StyledAuthContent';
import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';
import { Logo } from '@/auth/components/Logo';
+import { StyledAuthContent } from '@/auth/components/StyledAuthContent';
import { StyledOnboardingContentContainer } from '@/auth/components/StyledOnboardingContentContainer';
import { Title } from '@/auth/components/Title';
+import { AnimatedEaseIn } from '@/auth/components/internal/AnimatedEaseIn/AnimatedEaseIn';
import { useAuth } from '@/auth/hooks/useAuth';
import { useIsLogged } from '@/auth/hooks/useIsLogged';
import { currentUserState } from '@/auth/states/currentUserState';
@@ -29,9 +30,7 @@ import { Controller, useForm } from 'react-hook-form';
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import { useParams } from 'react-router-dom';
import { AppPath } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/components';
-import { AnimatedEaseIn } from 'twenty-ui/primitives/layout';
+import { MainButton, useToast } from 'twenty-ui/components';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { z } from 'zod';
import {
diff --git a/packages/twenty-front/src/pages/not-found/NotFound.tsx b/packages/twenty-front/src/pages/not-found/NotFound.tsx
index 9ac9980e598..bf63b7247a1 100644
--- a/packages/twenty-front/src/pages/not-found/NotFound.tsx
+++ b/packages/twenty-front/src/pages/not-found/NotFound.tsx
@@ -1,26 +1,22 @@
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
+import { ErrorState } from '@/ui/feedback/empty-state/components/ErrorState';
import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { Trans, useLingui } from '@lingui/react/macro';
-import { lazy, Suspense } from 'react';
+import { Suspense, lazy } from 'react';
+import { AppPath } from 'twenty-shared/types';
const BackgroundMockPage = lazy(() =>
import('@/sign-in-background-mock/components/BackgroundMockPage').then(
(module) => ({ default: module.BackgroundMockPage }),
),
);
-import { AppPath } from 'twenty-shared/types';
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
import { styled } from '@linaria/react';
import { MainButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderErrorContainer,
- AnimatedPlaceholderErrorSubTitle,
- AnimatedPlaceholderErrorTitle,
-} from 'twenty-ui/primitives/feedback';
const StyledBackDrop = styled.div`
align-items: center;
@@ -48,19 +44,19 @@ export const NotFound = () => {
<>
<PageTitle title={t`Page Not Found | Twenty`} />
<StyledBackDrop>
- <AnimatedPlaceholderErrorContainer>
+ <ErrorState.Root>
<AnimatedPlaceholder type="error404" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderErrorTitle>
+ <EmptyState.Content>
+ <ErrorState.Title>
<Trans>Off the beaten path</Trans>
- </AnimatedPlaceholderErrorTitle>
- <AnimatedPlaceholderErrorSubTitle>
+ </ErrorState.Title>
+ <ErrorState.Description>
<Trans>
The page you're seeking is either gone or never was. Let's get
you back on track
</Trans>
- </AnimatedPlaceholderErrorSubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
+ </ErrorState.Description>
+ </EmptyState.Content>
<StyledButtonContainer>
<NavigationButton
buttonComponent={MainButton}
@@ -68,7 +64,7 @@ export const NotFound = () => {
fullWidth
>{t`Back to content`}</NavigationButton>
</StyledButtonContainer>
- </AnimatedPlaceholderErrorContainer>
+ </ErrorState.Root>
</StyledBackDrop>
<Suspense fallback={null}>
<BackgroundMockPage />
diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
index 9b685a73b17..52a53e068a5 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
@@ -26,8 +26,7 @@ import { useCallback, useState } from 'react';
import { Controller, type SubmitHandler, useForm } from 'react-hook-form';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/components';
+import { MainButton, useToast } from 'twenty-ui/components';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
import { z } from 'zod';
diff --git a/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx b/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx
index d35611f9b47..f46e2699645 100644
--- a/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx
@@ -11,10 +11,13 @@ import { type OnboardingInstallableApp } from '@/onboarding/types/OnboardingInst
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-import { IconButton, MainButton } from 'twenty-ui/components';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import {
+ AnimatedIconCrossfade,
+ IconButton,
+ MainButton,
+} from 'twenty-ui/components';
import { IconCheck, IconPlus } from 'twenty-ui/icon';
-import { AnimatedIconCrossfade } from 'twenty-ui/primitives/layout';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
index a8731adf44f..28362a693e2 100644
--- a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
+++ b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
@@ -9,8 +9,7 @@ import { t } from '@lingui/core/macro';
import { AnimatePresence, motion } from 'framer-motion';
import { useEffect, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/components';
+import { MainButton, useToast } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const SUBSCRIPTION_CONFIRMATION_POLL_INTERVAL_MS = 2000;
diff --git a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
index 917b60ad483..3ed8790d7d7 100644
--- a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
+++ b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
@@ -3,13 +3,13 @@ import { useAuth } from '@/auth/hooks/useAuth';
import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';
import { currentUserState } from '@/auth/states/currentUserState';
import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';
+import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';
import { StyledOnboardingContentBlock } from '@/onboarding/components/StyledOnboardingContentBlock';
import { StyledOnboardingStepHeading } from '@/onboarding/components/StyledOnboardingStepHeading';
import { StyledOnboardingStepPage } from '@/onboarding/components/StyledOnboardingStepPage';
import { StyledOnboardingStepSubtitle } from '@/onboarding/components/StyledOnboardingStepSubtitle';
import { StyledOnboardingStepTagsRow } from '@/onboarding/components/StyledOnboardingStepTagsRow';
import { StyledOnboardingStepTitle } from '@/onboarding/components/StyledOnboardingStepTitle';
-import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';
import { OnboardingCreditsRewardTag } from '@/onboarding/components/import-contacts/OnboardingCreditsRewardTag';
import { OnboardingPlanCard } from '@/onboarding/components/upgrade-free-trial/OnboardingPlanCard';
import { OnboardingTrialExtensionTag } from '@/onboarding/components/upgrade-free-trial/OnboardingTrialExtensionTag';
@@ -27,8 +27,8 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { Elements, PaymentElement } from '@stripe/react-stripe-js';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { MainButton } from 'twenty-ui/components';
-import { Info, Loader } from 'twenty-ui/primitives/feedback';
+import { Info, MainButton } from 'twenty-ui/components';
+import { Loader } from 'twenty-ui/primitives/feedback';
import { RadioGroup } from 'twenty-ui/primitives/input';
import { CAL_LINK, ClickToActionLink } from 'twenty-ui/primitives/navigation';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
index 8986d834c9f..b3fa0471105 100644
--- a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
+++ b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
@@ -17,12 +17,11 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useCallback, useEffect, useRef } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { MainButton } from 'twenty-ui/components';
+import { MainButton, useToast } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { ActivateWorkspaceDocument } from '~/generated-metadata/graphql';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
-import { useToast } from 'twenty-ui/primitives/feedback';
const StyledContainer = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsx
index bf147597d48..9b00812bdd7 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsx
@@ -10,7 +10,7 @@ import { GET_MY_MESSAGE_CHANNELS } from '@/settings/accounts/graphql/queries/get
import { useMutation, useQuery } from '@apollo/client/react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { StartChannelSyncDocument } from '~/generated-metadata/graphql';
import { SettingsAccountsConfigurationSelectedMessageChannelEffect } from '~/pages/settings/accounts/SettingsAccountsConfigurationSelectedMessageChannelEffect';
import { SettingsAccountsConfigurationStepCalendar } from '~/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
index ff0d6ea55ba..0dcc60cf9e6 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
@@ -1,4 +1,3 @@
-import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { useClientConfig } from '@/client-config/hooks/useClientConfig';
import { AI_ADMIN_PATH } from '@/settings/admin-panel/ai/constants/AiAdminPath';
import { AI_PROVIDER_SOURCE } from '@/settings/admin-panel/ai/constants/AiProviderSource';
@@ -15,6 +14,7 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useMutation, useQuery } from '@apollo/client/react';
@@ -23,7 +23,12 @@ import { useMemo, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import {
+ RoundedLink,
+ SearchInput,
+ Section,
+ useToast,
+} from 'twenty-ui/components';
import {
type IconComponent,
IconFlag,
@@ -35,15 +40,12 @@ import {
IconTrash,
IconWorld,
} from 'twenty-ui/icon';
-import { Button, SearchInput } from 'twenty-ui/primitives/input';
-import { RoundedLink } from 'twenty-ui/primitives/navigation';
+import { Button } from 'twenty-ui/primitives/input';
import {
type AdminAiModelConfig,
SetAdminAiModelEnabledDocument,
} from '~/generated-admin/graphql';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const REMOVE_PROVIDER_MODAL_ID = 'settings-ai-provider-remove';
const REMOVE_MODEL_MODAL_ID = 'settings-ai-model-remove';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
index 661c654fd9f..e0a01981968 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
@@ -1,6 +1,6 @@
-import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
+import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
import { useMutation, useQuery } from '@apollo/client/react';
@@ -10,9 +10,8 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconShare, IconTrash, IconUserPlus } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { Dialog, Tooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
index 548f11a4ce1..6decdd106f4 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
@@ -1,12 +1,12 @@
-import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { SearchInput, Section } from 'twenty-ui/components';
import { IconDotsVertical } from 'twenty-ui/icon';
-import { Button, SearchInput } from 'twenty-ui/primitives/input';
+import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AI_ADMIN_PATH } from '@/settings/admin-panel/ai/constants/AiAdminPath';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
index ebd2ed31aed..bba17aaeb62 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
@@ -7,9 +7,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconId } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
index 805265c9208..c9f8569be51 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
@@ -12,7 +12,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { formatUpgradeCommandName, getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import {
IconAlertTriangle,
IconCalendar,
@@ -20,7 +20,6 @@ import {
IconStatusChange,
} from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
index 06656e01352..afef5526590 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
@@ -16,12 +16,11 @@ import { t } from '@lingui/core/macro';
import { Trans, useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
import { Controller, useForm } from 'react-hook-form';
-import { useNavigate, useParams } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Info, Section, useToast } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { Info, useToast } from 'twenty-ui/primitives/feedback';
import { Checkbox, Switch } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';
@@ -347,7 +346,12 @@ export const SettingsAdminNewAiModel = () => {
accent="danger"
text={customAiProviderGateDescription}
buttonTitle={t`Activate`}
- to={getSettingsPath(SettingsPath.AdminPanelOrganization)}
+ href={getSettingsPath(SettingsPath.AdminPanelOrganization)}
+ render={
+ <Link
+ to={getSettingsPath(SettingsPath.AdminPanelOrganization)}
+ />
+ }
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
index 01846c7140e..d58a0b399cc 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
@@ -18,14 +18,13 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useMemo, useState } from 'react';
import { Controller, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
import { slugify } from 'transliteration';
import { type AiSdkPackage, isDataResidency } from 'twenty-shared/ai';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Info, Section, useToast } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { Info, useToast } from 'twenty-ui/primitives/feedback';
import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';
type ModelsDevProvider = { id: string; modelCount: number; npm: AiSdkPackage };
@@ -276,7 +275,12 @@ export const SettingsAdminNewAiProvider = () => {
accent="danger"
text={customAiProviderGateDescription}
buttonTitle={t`Activate`}
- to={getSettingsPath(SettingsPath.AdminPanelOrganization)}
+ href={getSettingsPath(SettingsPath.AdminPanelOrganization)}
+ render={
+ <Link
+ to={getSettingsPath(SettingsPath.AdminPanelOrganization)}
+ />
+ }
/>
)}
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
index 6fbf528f0ae..427e661b98f 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
@@ -1,5 +1,3 @@
-import { TabListRoot } from '@/ui/layout/tab-list/components/TabListRoot';
-import { Tabs } from 'twenty-ui/primitives/navigation';
import { currentUserState } from '@/auth/states/currentUserState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { billingState } from '@/client-config/states/billingState';
@@ -23,6 +21,7 @@ import {
} from '@/settings/components/SettingsTableListSection';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';
+import { TabListRoot } from '@/ui/layout/tab-list/components/TabListRoot';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
@@ -39,7 +38,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import {
IconCreditCard,
IconEyeShare,
@@ -50,11 +49,12 @@ import {
} from 'twenty-ui/icon';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { Button, Switch } from 'twenty-ui/primitives/input';
+import { Tabs } from 'twenty-ui/primitives/navigation';
+import { Card } from 'twenty-ui/primitives/surfaces';
import {
- Card,
+ Text,
OverflowingTextWithTooltip,
-} from 'twenty-ui/primitives/surfaces';
-import { Text } from 'twenty-ui/primitives/typography';
+} from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
GetUpgradeStatusDocument,
@@ -65,8 +65,6 @@ import {
} from '~/generated-admin/graphql';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledFeatureFlagName = styled(Text)`
color: ${themeCssVariables.font.color.primary};
font-size: ${themeCssVariables.font.size.md};
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
index 7f1406611e2..f7816385553 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
@@ -8,8 +8,7 @@ import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
index 6b783a08eba..ac176b9285c 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
@@ -15,7 +15,7 @@ import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import { useNavigate, useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined, isValidUuid } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { ThemeContext } from 'twenty-ui/theme-constants';
@@ -27,8 +27,6 @@ import {
import { SettingsToolIcon } from '~/pages/settings/ai/components/SettingsToolIcon';
import { SettingsToolParameterTable } from '~/pages/settings/ai/components/SettingsToolParameterTable';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const DELETE_TOOL_MODAL_ID = 'delete-tool-modal';
export const SettingsToolDetail = () => {
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentDeleteConfirmationModal.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentDeleteConfirmationModal.tsx
index c29cd4a5588..4ee59482307 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentDeleteConfirmationModal.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentDeleteConfirmationModal.tsx
@@ -6,7 +6,7 @@ import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useMutation } from '@apollo/client/react';
import { SettingsPath } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { DeleteOneAgentDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
index fe2e116e408..d06d375b76c 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
@@ -1,14 +1,13 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
import { RUN_EVALUATION_INPUT } from '@/ai/graphql/mutations/runEvaluationInput';
import { GET_AGENT_TURNS } from '@/ai/graphql/queries/getAgentTurns';
import { SettingsListCard } from '@/settings/components/SettingsListCard';
import { TextInput } from '@/ui/input/components/TextInput';
+import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
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 { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
-import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useMutation } from '@apollo/client/react';
@@ -16,8 +15,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
-import { Section, LightIconButton } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { LightIconButton, Section, useToast } from 'twenty-ui/components';
import {
IconDotsVertical,
IconMessage,
@@ -26,7 +24,7 @@ import {
IconTrash,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 as uuidv4 } from 'uuid';
import { SETTINGS_AGENT_DETAIL_TABS } from '~/pages/settings/ai/constants/SettingsAgentDetailTabs';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
index 2ec2dca2eb9..6dd4f46a69a 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
@@ -1,3 +1,5 @@
+import { AnimatedPlaceholder } from '@/ui/feedback/empty-state/components/AnimatedPlaceholder/AnimatedPlaceholder';
+import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';
import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
@@ -11,17 +13,10 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { IconChevronRight } from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
-import {
- AnimatedPlaceholder,
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptySubTitle,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
- useToast,
-} from 'twenty-ui/primitives/feedback';
+
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
+import { LightIconButton, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
-import { LightIconButton } from 'twenty-ui/components';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
EvaluateAgentTurnDocument,
@@ -169,17 +164,15 @@ export const SettingsAgentLogsTab = ({
if (turns.length === 0) {
return (
- <AnimatedPlaceholderEmptyContainer>
+ <EmptyState.Root>
<AnimatedPlaceholder type="emptyTimeline" />
- <AnimatedPlaceholderEmptyTextContainer>
- <AnimatedPlaceholderEmptyTitle>
- {t`No logs yet`}
- </AnimatedPlaceholderEmptyTitle>
- <AnimatedPlaceholderEmptySubTitle>
+ <EmptyState.Content>
+ <EmptyState.Title>{t`No logs yet`}</EmptyState.Title>
+ <EmptyState.Description>
{t`Agent interactions will appear here once the agent is used in conversations`}
- </AnimatedPlaceholderEmptySubTitle>
- </AnimatedPlaceholderEmptyTextContainer>
- </AnimatedPlaceholderEmptyContainer>
+ </EmptyState.Description>
+ </EmptyState.Content>
+ </EmptyState.Root>
);
}
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
index 4c01311d5fb..fdaddaa6007 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
@@ -1,5 +1,3 @@
-import { SettingsRow, Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { getApplicationDisplayName } from '@/applications/utils/getApplicationDisplayName';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -8,14 +6,19 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { useMutation, useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import {
+ SearchInput,
+ Section,
+ SettingsRow,
+ useToast,
+} from 'twenty-ui/components';
import { IconArchive, IconSettings } from 'twenty-ui/icon';
-import { SearchInput } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { useMutation, useQuery } from '@apollo/client/react';
-import { isDefined } from 'twenty-shared/utils';
import {
ActivateSkillDocument,
DeleteSkillDocument,
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
index f8ca6e63cd6..9cb7e7d3d52 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
@@ -1,13 +1,12 @@
-import { styled } from '@linaria/react';
-import { useLingui } from '@lingui/react/macro';
-import { type ReactNode, useState } from 'react';
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 { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { type ReactNode, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { SettingsRow, Section } from 'twenty-ui/components';
+import { SearchInput, Section, SettingsRow } from 'twenty-ui/components';
import { IconLock, IconPuzzle, IconTool } from 'twenty-ui/icon';
-import { SearchInput } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsAgentToolsTable } from '~/pages/settings/ai/components/SettingsAgentToolsTable';
import { useSettingsAgentToolsTable } from '~/pages/settings/ai/hooks/useSettingsAgentToolsTable';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
index 19de8d23040..3b0ffa2f15a 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
@@ -4,6 +4,7 @@ import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { SettingsCard } from '@/settings/components/SettingsCard';
import { SettingsStatsGrid } from '@/settings/components/SettingsStatsGrid';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { CombinedGraphQLErrors } from '@apollo/client';
import { useMutation, useQuery } from '@apollo/client/react';
@@ -12,10 +13,8 @@ import { t } from '@lingui/core/macro';
import { Fragment, useContext, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconBook, IconMessage, IconSparkles, IconTool } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
import {
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
index e97b84f9b31..ab0cb660423 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
@@ -1,3 +1,5 @@
+import { SettingsCard } from '@/settings/components/SettingsCard';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
@@ -5,9 +7,7 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
import { IconPrompt } from 'twenty-ui/icon';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeContext } from 'twenty-ui/theme-constants';
-import { SettingsCard } from '@/settings/components/SettingsCard';
import { GetAiSystemPromptPreviewDocument } from '~/generated-metadata/graphql';
import { formatNumber } from '~/utils/format/formatNumber';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
index 005e319fe0e..583e2399283 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
@@ -3,8 +3,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { IconArchive, IconArchiveOff, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
index 0e525b253ac..adabc9c0099 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
@@ -4,8 +4,8 @@ import { type ReactNode, useContext } from 'react';
import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type Skill } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
index 9229c4925aa..1acbc2863ff 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
@@ -3,12 +3,8 @@ import { useContext } from 'react';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
-import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
import { isDefined } from 'twenty-shared/utils';
-import {
- Avatar,
- getIconTileColorShades,
-} from 'twenty-ui/primitives/data-display';
+import { getIconTileColorShades } from 'twenty-ui/components';
import {
IconEdit,
IconPlus,
@@ -18,9 +14,11 @@ import {
useIcons,
type IconComponent,
} from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type SettingsAgentToolApplication } from '~/pages/settings/ai/types/SettingsAgentToolApplication';
import { type SettingsAgentToolMarketplaceApp } from '~/pages/settings/ai/types/SettingsAgentToolMarketplaceApp';
+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
type SettingsToolIconProps = {
icon?: string | null;
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
index fe20913d96b..28f5046a607 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
@@ -11,6 +11,7 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import {
IconArrowUpRight,
IconInfoCircle,
@@ -22,10 +23,7 @@ import {
IllustrationIconText,
IllustrationIconToggle,
} from 'twenty-ui/icon';
-import {
- Tooltip,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/primitives/surfaces';
+import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type SchemaProperty = {
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx
index 09ab0d35bbc..d3395a36a87 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx
@@ -1,12 +1,12 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
+import { AppChip } from '@/applications/components/AppChip';
+import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
-import { AppChip } from '@/applications/components/AppChip';
export type SettingsToolTableRowProps = {
leftIcon: ReactNode;
diff --git a/packages/twenty-front/src/pages/settings/ai/hooks/useCreateTool.ts b/packages/twenty-front/src/pages/settings/ai/hooks/useCreateTool.ts
index fcf26b33bb9..e16e860a281 100644
--- a/packages/twenty-front/src/pages/settings/ai/hooks/useCreateTool.ts
+++ b/packages/twenty-front/src/pages/settings/ai/hooks/useCreateTool.ts
@@ -6,7 +6,7 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { usePersistLogicFunction } from '@/logic-functions/hooks/usePersistLogicFunction';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
export const useCreateTool = () => {
const navigate = useNavigate();
diff --git a/packages/twenty-front/src/pages/settings/ai/hooks/useNavigateToNotFoundOnLoadFailure.ts b/packages/twenty-front/src/pages/settings/ai/hooks/useNavigateToNotFoundOnLoadFailure.ts
index b349fcd7f76..b1d17d06c69 100644
--- a/packages/twenty-front/src/pages/settings/ai/hooks/useNavigateToNotFoundOnLoadFailure.ts
+++ b/packages/twenty-front/src/pages/settings/ai/hooks/useNavigateToNotFoundOnLoadFailure.ts
@@ -2,7 +2,7 @@ import { type ErrorLike } from '@apollo/client';
import { useEffect } from 'react';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useNavigateApp } from '~/hooks/useNavigateApp';
diff --git a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentSave.ts b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentSave.ts
index 98e18288c5a..a2f8f3eff55 100644
--- a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentSave.ts
+++ b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentSave.ts
@@ -2,10 +2,10 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
-import { useDebouncedCallback } from 'use-debounce';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
+import { useDebouncedCallback } from 'use-debounce';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useSaveDraftRoleToDB } from '@/settings/roles/role/hooks/useSaveDraftRoleToDB';
diff --git a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAiModelsActions.ts b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAiModelsActions.ts
index 7fc4bb5255e..5327d931ef4 100644
--- a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAiModelsActions.ts
+++ b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAiModelsActions.ts
@@ -1,8 +1,8 @@
-import { useToast } from 'twenty-ui/primitives/feedback';
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { type AiModelTier } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
+import { useToast } from 'twenty-ui/components';
import {
currentWorkspaceState,
diff --git a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsSkillSave.ts b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsSkillSave.ts
index 21196e764ef..bff05ec1ba5 100644
--- a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsSkillSave.ts
+++ b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsSkillSave.ts
@@ -1,9 +1,9 @@
import { useMutation } from '@apollo/client/react';
import { useEffect, useState } from 'react';
-import { useDebouncedCallback } from 'use-debounce';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
+import { useDebouncedCallback } from 'use-debounce';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import {
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
index 8d5855b27db..b6eae5f1a3c 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
@@ -25,14 +25,14 @@ import {
isDefined,
isNonEmptyArray,
} from 'twenty-shared/utils';
+import { InlineBanner } from 'twenty-ui/components';
import {
- IconAlertTriangle,
IconAdjustments,
+ IconAlertTriangle,
IconDeviceFloppy,
IconSettings,
IconVariable,
} from 'twenty-ui/icon';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import {
FindMarketplaceAppDetailDocument,
@@ -40,12 +40,12 @@ import {
IsApplicationStoppedDocument,
} from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { SettingsApplicationHealthBanner } from '~/pages/settings/applications/components/SettingsApplicationHealthBanner';
+import { SettingsApplicationMissingConfigurationBanner } from '~/pages/settings/applications/components/SettingsApplicationMissingConfigurationBanner';
import { CUSTOM_APPLICATION_ILLUSTRATIONS } from '~/pages/settings/applications/constants/CustomApplicationIllustrations';
import { STANDARD_APPLICATION_ILLUSTRATIONS } from '~/pages/settings/applications/constants/StandardApplicationIllustrations';
import { useApplicationHealthCheck } from '~/pages/settings/applications/hooks/useApplicationHealthCheck';
import { useApplicationVariablesDraft } from '~/pages/settings/applications/hooks/useApplicationVariablesDraft';
-import { SettingsApplicationHealthBanner } from '~/pages/settings/applications/components/SettingsApplicationHealthBanner';
-import { SettingsApplicationMissingConfigurationBanner } from '~/pages/settings/applications/components/SettingsApplicationMissingConfigurationBanner';
import { SettingsApplicationCustomSettingsSection } from '~/pages/settings/applications/tabs/SettingsApplicationCustomSettingsSection';
import { SettingsApplicationDetailGeneralTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailGeneralTab';
import { SettingsApplicationDetailVariablesTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailVariablesTab';
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
index b0afac006ae..e1483a2b4d5 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
@@ -19,7 +19,7 @@ import { useParams } from 'react-router-dom';
import { type Manifest } from 'twenty-shared/application';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
+import { InlineBanner } from 'twenty-ui/components';
import {
IconBox,
IconEyeOff,
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx
index 151bfdf44cc..af647f21777 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx
@@ -1,3 +1,4 @@
+import { AppChip } from '@/applications/components/AppChip';
import {
StyledActionTableCell,
StyledNameTableCell,
@@ -7,10 +8,9 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { TableSection } from '@/ui/layout/table/components/TableSection';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronRight, useIcons } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { AppChip } from '@/applications/components/AppChip';
export type ApplicationContentRow = {
key: string;
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationHealthBanner.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationHealthBanner.tsx
index a0d3577e397..bf1c87e9851 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationHealthBanner.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationHealthBanner.tsx
@@ -1,5 +1,5 @@
import { isDefined } from 'twenty-shared/utils';
-import { Callout } from 'twenty-ui/primitives/feedback';
+import { Callout } from 'twenty-ui/components';
import { type ApplicationHealthStatus } from '~/generated-metadata/graphql';
import { getApplicationHealthBannerAppearance } from '~/pages/settings/applications/utils/getApplicationHealthBannerAppearance';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationMissingConfigurationBanner.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationMissingConfigurationBanner.tsx
index 0f7d6914531..6947f4459b7 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationMissingConfigurationBanner.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationMissingConfigurationBanner.tsx
@@ -1,6 +1,6 @@
import { t } from '@lingui/core/macro';
+import { InlineBanner } from 'twenty-ui/components';
import { IconAlertCircle } from 'twenty-ui/icon';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
import { type ApplicationVariable } from '~/generated-metadata/graphql';
import { getApplicationVariableDisplayLabel } from '~/pages/settings/applications/utils/getApplicationVariableDisplayLabel';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
index cbb46220594..73a30fffa51 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
@@ -1,3 +1,15 @@
+import { useRefetchOnApplicationOperation } from '@/applications/hooks/useRefetchOnApplicationOperation';
+import {
+ SettingsTableCard,
+ type TableItem,
+} from '@/settings/components/SettingsTableCard';
+import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
+import { useQuery } from '@apollo/client/react';
+import { styled } from '@linaria/react';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
import {
IconBox,
@@ -6,12 +18,8 @@ import {
IconVersions,
IconWorld,
} from 'twenty-ui/icon';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { useRefetchOnApplicationOperation } from '@/applications/hooks/useRefetchOnApplicationOperation';
-import {
- SettingsTableCard,
- type TableItem,
-} from '@/settings/components/SettingsTableCard';
+import { Chip, Tag } from 'twenty-ui/primitives/data-display';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
type ApplicationRegistration,
ApplicationRegistrationSourceType,
@@ -19,13 +27,6 @@ import {
FindOneApplicationSummaryDocument,
GetPublicWorkspaceDataByIdDocument,
} from '~/generated-metadata/graphql';
-import { isNonEmptyString } from '@sniptt/guards';
-import { styled } from '@linaria/react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { useQuery } from '@apollo/client/react';
-import { AvatarOrIcon, Chip, Tag } from 'twenty-ui/primitives/data-display';
-import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { SettingsPath } from 'twenty-shared/types';
import { SettingsApplicationRegistrationShareLinkButtons } from '~/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
index b43e8ba6217..8c9368a7278 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
@@ -1,29 +1,29 @@
-import styled from '@emotion/styled';
import { useQuery } from '@apollo/client/react';
+import styled from '@emotion/styled';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { useDebounce } from 'use-debounce';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { IconChevronDown, IconDotsVertical } from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
import { Button } from 'twenty-ui/primitives/input';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { useDebounce } from 'use-debounce';
+import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';
import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
-import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { type ApplicationRegistration } from '~/generated-metadata/graphql';
+import { SettingsPath } from 'twenty-shared/types';
import { FindAdminApplicationRegistrationInstalledWorkspacesDocument } from '~/generated-admin/graphql';
+import { type ApplicationRegistration } from '~/generated-metadata/graphql';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
-import { SettingsPath } from 'twenty-shared/types';
const INITIAL_VISIBLE_WORKSPACES = 3;
const SHOW_MORE_PAGE_SIZE = 20;
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx
index 36fdcccd44f..98bc9422aef 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx
@@ -1,14 +1,14 @@
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { TableCell } from '@/ui/layout/table/components/TableCell';
-import { IconX } from 'twenty-ui/icon';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { IconButton } from 'twenty-ui/components';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { IconX } from 'twenty-ui/icon';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsApplicationRegistrationRedirectURIsTableProps = {
redirectUris: string[];
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
index 8bcd3cfad53..b783a11e205 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
@@ -2,16 +2,16 @@ import { type ReactNode } from 'react';
import { ApplicationDisplay } from '@/applications/components/ApplicationDisplay';
import { useResolvedApplicationDescription } from '@/applications/hooks/useResolvedApplicationDescription';
+import { type ApplicationDisplayData } from '@/applications/types/ApplicationDisplayData';
+import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { t } from '@lingui/core/macro';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
import { Tag } from 'twenty-ui/primitives/data-display';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { getApplicationDescriptionSummary } from '~/pages/settings/applications/utils/getApplicationDescriptionSummary';
-import { type ApplicationDisplayData } from '@/applications/types/ApplicationDisplayData';
-import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
+import { getApplicationDescriptionSummary } from '~/pages/settings/applications/utils/getApplicationDescriptionSummary';
export type SettingsApplicationTableRowProps = {
action: ReactNode;
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx
index 8388906fcd8..b7a21f4c521 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx
@@ -3,8 +3,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
-import { Pill } from 'twenty-ui/primitives/data-display';
import { IconInfoCircle } from 'twenty-ui/icon';
+import { Pill } from 'twenty-ui/primitives/data-display';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
index 9ae1a1c9c3c..ba187df395f 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
@@ -1,22 +1,21 @@
-import { Section } from 'twenty-ui/components';
-import { IconChevronRight } from 'twenty-ui/icon';
+import { Table } from '@/ui/layout/table/components/Table';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { SettingsPath } from 'twenty-shared/types';
-import { useLingui } from '@lingui/react/macro';
-import { Table } from '@/ui/layout/table/components/Table';
import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { useContext, useState } from 'react';
+import { SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { SearchInput, Section } from 'twenty-ui/components';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
import {
APPLICATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS,
SettingsApplicationTableRow,
} from '~/pages/settings/applications/components/SettingsApplicationTableRow';
-import { useContext, useState } from 'react';
import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/applicationWithoutRelation';
import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
-import { SearchInput } from 'twenty-ui/primitives/input';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
const StyledTableRowsContainer = styled.div`
border-bottom: 1px solid ${themeCssVariables.border.color.light};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
index 7ceb77d2c7a..748380e4606 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
@@ -17,9 +17,8 @@ import {
} from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Callout, Section, useToast } from 'twenty-ui/components';
import { IconBrandGithub, IconRefresh, IconSearch } from 'twenty-ui/icon';
-import { Callout, useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useApplicationVariablesDraft.test.tsx b/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useApplicationVariablesDraft.test.tsx
index cabc0444610..ff01a66d0f9 100644
--- a/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useApplicationVariablesDraft.test.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useApplicationVariablesDraft.test.tsx
@@ -1,8 +1,8 @@
-import { gql, InMemoryCache } from '@apollo/client';
+import { InMemoryCache, gql } from '@apollo/client';
import { MockedProvider } from '@apollo/client/testing/react';
import { act, renderHook, waitFor } from '@testing-library/react';
import { type ReactNode } from 'react';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
+import { ToastProvider } from 'twenty-ui/components';
import {
type Application,
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationTimelineActivityTypes.ts b/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationTimelineActivityTypes.ts
index 823a04b9017..85d9c546398 100644
--- a/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationTimelineActivityTypes.ts
+++ b/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationTimelineActivityTypes.ts
@@ -1,7 +1,7 @@
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
ResetTimelineActivityTypeDocument,
UpdateTimelineActivityTypeIsActiveDocument,
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationVariablesDraft.ts b/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationVariablesDraft.ts
index 7d30d25854d..1ab779b8254 100644
--- a/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationVariablesDraft.ts
+++ b/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationVariablesDraft.ts
@@ -3,7 +3,7 @@ import { useMutation, useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import {
type ApplicationVariable,
FindOneApplicationDocument,
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection.tsx
index f8fb4e6af3a..4e77f0bd5ea 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection.tsx
@@ -2,8 +2,7 @@ import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsO
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { IconRefresh } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { UpdateApplicationDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
index a3445095429..90b1d81241d 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
-import { isNonEmptyString } from '@sniptt/guards';
import { useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
@@ -9,14 +9,13 @@ import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { Section } from 'twenty-ui/components';
-import { Avatar, Status } from 'twenty-ui/primitives/data-display';
-import { Info } from 'twenty-ui/primitives/feedback';
+import { Info, Section } from 'twenty-ui/components';
import { IconChevronRight, IconPlus } from 'twenty-ui/icon';
+import { Avatar, Status } from 'twenty-ui/primitives/data-display';
import { Button } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { useFindApplicationConnectionProviders } from '~/pages/settings/applications/hooks/useFindApplicationConnectionProviders';
import { useApplicationConnectedAccounts } from '~/pages/settings/applications/hooks/useApplicationConnectedAccounts';
+import { useFindApplicationConnectionProviders } from '~/pages/settings/applications/hooks/useFindApplicationConnectionProviders';
import { useTriggerAppOAuth } from '~/pages/settings/applications/hooks/useTriggerAppOAuth';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
index 224f4f6bf5a..b49579012fc 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
@@ -1,3 +1,4 @@
+import { type ApplicationDisplayData } from '@/applications/types/ApplicationDisplayData';
import { getLogicFunctionTriggerLabel } from '@/logic-functions/utils/getLogicFunctionTriggerLabel';
import { useComputeApplicationContentForLayoutAndLogic } from '@/settings/applications/hooks/useComputeApplicationContentForLayoutAndLogic';
import { useComputeObjectAndFieldsContentForApplication } from '@/settings/applications/hooks/useComputeObjectAndFieldsContentForApplication';
@@ -7,17 +8,15 @@ import { useState } from 'react';
import { type Manifest } from 'twenty-shared/application';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { SearchInput } from 'twenty-ui/primitives/input';
-import { type ApplicationDisplayData } from '@/applications/types/ApplicationDisplayData';
+import { SearchInput, Section } from 'twenty-ui/components';
import { type Application } from '~/generated-metadata/graphql';
import {
type ApplicationContentRow,
SettingsApplicationContentSubtable,
} from '~/pages/settings/applications/components/SettingsApplicationContentSubtable';
import { useInstalledTimelineActivityTypes } from '~/pages/settings/applications/hooks/useInstalledTimelineActivityTypes';
-import { getSettingsApplicationTimelineActivityTypes } from '~/pages/settings/applications/utils/getSettingsApplicationTimelineActivityTypes';
import { filterSettingsApplicationTimelineActivityTypes } from '~/pages/settings/applications/utils/filterSettingsApplicationTimelineActivityTypes';
+import { getSettingsApplicationTimelineActivityTypes } from '~/pages/settings/applications/utils/getSettingsApplicationTimelineActivityTypes';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
type InstalledApplicationForContentTab = Omit<
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
index 064c799fbab..3ee18925601 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
@@ -1,14 +1,14 @@
import { useLingui } from '@lingui/react/macro';
-import { Section } from 'twenty-ui/components';
-import { CommandBlock, Tag } from 'twenty-ui/primitives/data-display';
-import { IconCopy } from 'twenty-ui/icon';
-import { Button } from 'twenty-ui/primitives/input';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { CommandBlock, Section } from 'twenty-ui/components';
+import { IconCopy } from 'twenty-ui/icon';
+import { Tag } from 'twenty-ui/primitives/data-display';
+import { Button } from 'twenty-ui/primitives/input';
import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
-import { type ApplicationRegistrationData } from '~/pages/settings/applications/tabs/types/ApplicationRegistrationData';
import { SettingsApplicationRegistrationShareLinkButtons } from '~/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons';
+import { type ApplicationRegistrationData } from '~/pages/settings/applications/tabs/types/ApplicationRegistrationData';
export const SettingsApplicationRegistrationDistributionTab = ({
registration,
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx
index 4ff028d2d35..8a8a7de2873 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx
@@ -2,13 +2,13 @@ import { type ApplicationRegistration } from '~/generated-metadata/graphql';
import { useLingui } from '@lingui/react/macro';
import { useLocation, useNavigate } from 'react-router-dom';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
+import { InlineBanner } from 'twenty-ui/components';
import { SettingsApplicationRegistrationGeneralInfo } from '~/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo';
import { SettingsAdminApplicationRegistrationClaims } from '~/pages/settings/admin-panel/SettingsAdminApplicationRegistrationClaims';
import { SettingsAdminApplicationRegistrationDangerZone } from '~/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone';
-import { SettingsApplicationRegistrationGeneralStats } from '~/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats';
import { SettingsAdminApplicationRegistrationGeneralSwitches } from '~/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralSwitches';
+import { SettingsApplicationRegistrationGeneralStats } from '~/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats';
export const SettingsApplicationRegistrationGeneralTab = ({
registration,
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
index 1e5bbc1ce40..16a2763526f 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
@@ -8,9 +8,8 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconKey, IconRefresh, IconShield } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
index aecf4f9da4f..1da38d892b0 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
@@ -5,10 +5,13 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useState } from 'react';
-import { SettingsRow, Section } from 'twenty-ui/components';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
+import {
+ InlineBanner,
+ SearchInput,
+ Section,
+ SettingsRow,
+} from 'twenty-ui/components';
import { IconSparkles } from 'twenty-ui/icon';
-import { SearchInput } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMarketplaceApps } from '~/modules/marketplace/hooks/useMarketplaceApps';
import { SettingsAvailableApplicationCard } from '~/pages/settings/applications/components/SettingsAvailableApplicationCard';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
index e4b9589ec90..c63c9e6a9ef 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
@@ -1,21 +1,22 @@
import { useRefetchOnApplicationRegistrationChange } from '@/applications/hooks/useRefetchOnApplicationRegistrationChange';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { getDocumentationUrl } from '@/support/utils/getDocumentationUrl';
import { Table } from '@/ui/layout/table/components/Table';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useState } from 'react';
-import { Section } from 'twenty-ui/components';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { CommandBlock } from 'twenty-ui/primitives/data-display';
+import { CommandBlock, SearchInput, Section } from 'twenty-ui/components';
import { IconArrowUpRight, IconChevronRight, IconCopy } from 'twenty-ui/icon';
-import { Button, SearchInput } from 'twenty-ui/primitives/input';
+import { Button } from 'twenty-ui/primitives/input';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
type ApplicationRegistrationListItemFragment,
FindManyApplicationRegistrationsDocument,
@@ -26,7 +27,6 @@ import {
APPLICATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS,
SettingsApplicationTableRow,
} from '~/pages/settings/applications/components/SettingsApplicationTableRow';
-import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { SettingsClaimApplicationSection } from '~/pages/settings/applications/components/SettingsClaimApplicationSection';
const StyledButtonContainer = styled.div`
diff --git a/packages/twenty-front/src/pages/settings/applications/utils/getApplicationHealthBannerAppearance.ts b/packages/twenty-front/src/pages/settings/applications/utils/getApplicationHealthBannerAppearance.ts
index 7142d49c930..91b2068cc26 100644
--- a/packages/twenty-front/src/pages/settings/applications/utils/getApplicationHealthBannerAppearance.ts
+++ b/packages/twenty-front/src/pages/settings/applications/utils/getApplicationHealthBannerAppearance.ts
@@ -1,3 +1,4 @@
+import { type CalloutVariant } from 'twenty-ui/components';
import {
IconAlertCircle,
IconAlertTriangle,
@@ -6,7 +7,6 @@ import {
IconInfoCircle,
type IconComponent,
} from 'twenty-ui/icon';
-import { type CalloutVariant } from 'twenty-ui/primitives/feedback';
import { ApplicationHealthStatus } from '~/generated-metadata/graphql';
type ApplicationHealthBannerAppearance = {
diff --git a/packages/twenty-front/src/pages/settings/billing/SettingsBillingNewLimit.tsx b/packages/twenty-front/src/pages/settings/billing/SettingsBillingNewLimit.tsx
index a0ac0af1ea6..5a514d8abfc 100644
--- a/packages/twenty-front/src/pages/settings/billing/SettingsBillingNewLimit.tsx
+++ b/packages/twenty-front/src/pages/settings/billing/SettingsBillingNewLimit.tsx
@@ -3,7 +3,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { SettingsBillingLimitForm } from '@/settings/billing/components/SettingsBillingLimitForm';
import { EMPTY_USAGE_LIMIT_FORM_VALUES } from '@/settings/billing/constants/EmptyUsageLimitFormValues';
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
index 64c14bc4f33..d5b96819f42 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
@@ -20,9 +20,8 @@ import { useState } from 'react';
import { useParams } from 'react-router-dom';
import { MessageChannelType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconCopy, IconTrash } from 'twenty-ui/icon';
-import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { GetEmailingDomainsDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
index ac8f7e2dc0d..77700de2f51 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
@@ -10,15 +10,13 @@ import { useLingui } from '@lingui/react/macro';
import { useCallback, useState } from 'react';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconEye } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { NotFound } from '~/pages/not-found/NotFound';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
export const SettingsWorkspaceNewUnsubscribeTopic = () => {
const { t } = useLingui();
const navigate = useNavigateSettings();
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
index 099334e7490..72c1f0a56dc 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
@@ -15,7 +15,7 @@ import { useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconEye, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { Card } from 'twenty-ui/primitives/surfaces';
@@ -23,8 +23,6 @@ import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { NotFound } from '~/pages/not-found/NotFound';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const DELETE_UNSUBSCRIBE_TOPIC_MODAL_ID = 'delete-unsubscribe-topic-modal';
export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 4e50add876d..c56fa143ef1 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -21,9 +21,9 @@ import { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/vali
import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';
import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
import { SettingsTranslationsButton } from '@/settings/translations/components/SettingsTranslationsButton';
-import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
+import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { zodResolver } from '@hookform/resolvers/zod';
@@ -35,7 +35,7 @@ import { FormProvider, useForm } from 'react-hook-form';
import { useLocation, useNavigate, useParams } from 'react-router-dom';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconArchive, IconArchiveOff, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -44,8 +44,6 @@ import { useNavigateApp } from '~/hooks/useNavigateApp';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { getFieldMetadataItemInitialValues } from '~/pages/settings/data-model/utils/getFieldMetadataItemInitialValues';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const DELETE_FIELD_MODAL_ID = 'delete-field-confirmation-modal';
const StyledDangerButtons = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
index 62a13158e4a..e87e60646d7 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
@@ -1,11 +1,11 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';
-import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { StyledSettingsDataModelTableBodyContainer } from '@/settings/data-model/components/SettingsDataModelTableBodyContainer';
import {
OBJECT_FIELD_TABLE_ROW_GRID_TEMPLATE_COLUMNS,
SettingsObjectFieldItemTableRow,
} from '@/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow';
-import { StyledSettingsDataModelTableBodyContainer } from '@/settings/data-model/components/SettingsDataModelTableBodyContainer';
+import { useMostlyEmptyFieldMetadataIds } from '@/settings/data-model/object-details/hooks/useMostlyEmptyFieldMetadataIds';
import { settingsObjectFieldsFamilyState } from '@/settings/data-model/object-details/states/settingsObjectFieldsFamilyState';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -14,22 +14,21 @@ import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableH
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { type TableMetadata } from '@/ui/layout/table/types/TableMetadata';
import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { styled } from '@linaria/react';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
-import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { useEffect, useMemo, useState } from 'react';
import { FieldMetadataType } from 'twenty-shared/types';
-import { SettingsRow } from 'twenty-ui/components';
+import { SearchInput, SettingsRow } from 'twenty-ui/components';
import { IconArchive, IconCircleDashed, IconSettings } from 'twenty-ui/icon';
-import { SearchInput } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { useMostlyEmptyFieldMetadataIds } from '@/settings/data-model/object-details/hooks/useMostlyEmptyFieldMetadataIds';
import { useMapFieldMetadataItemToSettingsObjectDetailTableItem } from '~/pages/settings/data-model/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem';
import { type SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
index df3bf68561e..5c106b1a4c7 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
@@ -9,8 +9,8 @@ import { type TableMetadata } from '@/ui/layout/table/types/TableMetadata';
import { styled } from '@linaria/react';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import { IconSquareKey, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
+import { IconSquareKey, IconTrash } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type SettingsObjectIndexesTableItem } from '~/pages/settings/data-model/types/SettingsObjectIndexesTableItem';
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 3de0a83a3c7..d24cacbfb79 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
@@ -8,8 +8,6 @@ import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField
import { useCombinedGetTotalCount } from '@/object-record/multiple-objects/hooks/useCombinedGetTotalCount';
import { StyledSettingsDataModelTableBodyContainer } from '@/settings/data-model/components/SettingsDataModelTableBodyContainer';
import { SettingsObjectMetadataItemTableRow } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRow';
-import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { TableBody } from '@/ui/layout/table/components/TableBody';
import {
SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS,
SETTINGS_OBJECT_TABLE_ROW_MOBILE_MIN_WIDTH,
@@ -21,7 +19,9 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableHeader';
import { Table } from '@/ui/layout/table/components/Table';
+import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -30,9 +30,8 @@ import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useContext, useMemo, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { SettingsRow } from 'twenty-ui/components';
+import { SearchInput, SettingsRow } from 'twenty-ui/components';
import { IconArchive, IconChevronRight, IconSettings } from 'twenty-ui/icon';
-import { SearchInput } from 'twenty-ui/primitives/input';
import {
MOBILE_VIEWPORT,
ThemeContext,
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.tsx
index 9c534010aaf..28156822d4a 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
@@ -23,8 +23,7 @@ import {
SettingsPath,
} from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type z } from 'zod';
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
index 5b7e872ea12..fa25f5954d1 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
@@ -19,9 +19,8 @@ import { useParams } from 'react-router-dom';
import { MAX_CUSTOM_INDEXES_PER_OBJECT } from 'twenty-shared/constants';
import { AppPath, RelationType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Callout, Section, useToast } from 'twenty-ui/components';
import { IconAlertTriangle } from 'twenty-ui/icon';
-import { Callout, useToast } from 'twenty-ui/primitives/feedback';
import { IndexType } from '~/generated-metadata/graphql';
import { useNavigateApp } from '~/hooks/useNavigateApp';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
index 924fd0acd4b..d3cca988e81 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
@@ -20,7 +20,7 @@ import { useCallback, useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
+import { Section, useToast } from 'twenty-ui/components';
import { IconRepeat, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -35,8 +35,6 @@ import {
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledInfo = styled.span`
color: ${themeCssVariables.font.color.light};
font-size: ${themeCssVariables.font.size.sm};
diff --git a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
index 9351cb7566e..a58f60c1e8a 100644
--- a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
+++ b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
@@ -32,8 +32,7 @@ import {
} from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import {
IconCalendarRepeat,
IconCheck,
diff --git a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx
index e8b02e9cbfe..60351c35bcd 100644
--- a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx
+++ b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx
@@ -20,8 +20,7 @@ import {
type GenerateSignedDpaResult,
} from '@/settings/legal/types/Dpa';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
export const SettingsLegalDpaNew = () => {
diff --git a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx
index 597b5fec4c0..7686f7adbf1 100644
--- a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx
+++ b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx
@@ -16,7 +16,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { t } from '@lingui/core/macro';
import { CoreObjectNameSingular, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { IconInfoCircle, IconLock } from 'twenty-ui/icon';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
index 32bb5e1da43..17c41b9631c 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
@@ -20,7 +20,7 @@ import { isNonEmptyArray } from '@sniptt/guards';
import { formatDistanceToNow } from 'date-fns';
import { useContext, useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconButton, Section } from 'twenty-ui/components';
+import { IconButton, Section, useToast } from 'twenty-ui/components';
import { IconMail, IconReload, IconTrash } from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
@@ -28,8 +28,6 @@ import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { GetWorkspaceInvitationsDocument } from '~/generated-metadata/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { useToast } from 'twenty-ui/primitives/feedback';
-
const StyledButtonContainer = styled.div`
align-items: center;
display: flex;
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
index f891964e2ba..be0df06404d 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
@@ -1,12 +1,3 @@
-import { ListItem } from 'twenty-ui/primitives/navigation';
-import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { styled } from '@linaria/react';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { useContext, useMemo, useState } from 'react';
-import { useInView } from 'react-intersection-observer';
-import { useDebounce } from 'use-debounce';
-
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -14,28 +5,35 @@ 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 { Table } from '@/ui/layout/table/components/Table';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { type WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
+import { styled } from '@linaria/react';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { useContext, useMemo, useState } from 'react';
+import { useInView } from 'react-intersection-observer';
import {
AppPath,
CoreObjectNameSingular,
SettingsPath,
} from 'twenty-shared/types';
import { generateILikeFiltersForCompositeFields } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { Avatar } from 'twenty-ui/primitives/data-display';
+import { SearchInput, Section } from 'twenty-ui/components';
import {
IconArrowUpRight,
IconChevronRight,
IconHierarchy,
IconListDetails,
} from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { Button } from 'twenty-ui/primitives/input';
+import { ListItem } from 'twenty-ui/primitives/navigation';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
-import { Button, SearchInput } from 'twenty-ui/primitives/input';
-
-import { TableCell } from '@/ui/layout/table/components/TableCell';
-import { TableRow } from '@/ui/layout/table/components/TableRow';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { useDebounce } from 'use-debounce';
import { useNavigateApp } from '~/hooks/useNavigateApp';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
diff --git a/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx b/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
index d0207ccac8e..dfdecf6e3a7 100644
--- a/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
@@ -1,23 +1,23 @@
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { SettingsCard } from '@/settings/components/SettingsCard';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { SetOrChangePassword } from '@/settings/profile/components/SetOrChangePassword';
+import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { DeleteAccount } from '@/settings/profile/components/DeleteAccount';
-import { SettingsProfileDevicesSection } from '@/settings/profile/devices/components/SettingsProfileDevicesSection';
import { EmailField } from '@/settings/profile/components/EmailField';
import { NameFields } from '@/settings/profile/components/NameFields';
-import { WorkspaceMemberPictureUploader } from '@/settings/workspace-member/components/WorkspaceMemberPictureUploader';
+import { SetOrChangePassword } from '@/settings/profile/components/SetOrChangePassword';
+import { SettingsProfileDevicesSection } from '@/settings/profile/devices/components/SettingsProfileDevicesSection';
import { useCanChangePassword } from '@/settings/profile/hooks/useCanChangePassword';
import { useCurrentUserWorkspaceTwoFactorAuthentication } from '@/settings/two-factor-authentication/hooks/useCurrentUserWorkspaceTwoFactorAuthentication';
-import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
-import { Trans, useLingui } from '@lingui/react/macro';
+import { WorkspaceMemberPictureUploader } from '@/settings/workspace-member/components/WorkspaceMemberPictureUploader';
+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
-import { Status } from 'twenty-ui/primitives/data-display';
import { IconShield } from 'twenty-ui/icon';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { Status } from 'twenty-ui/primitives/data-display';
export const SettingsProfile = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
index b7d68ba6aa3..2acdc0fe2b6 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
@@ -1,16 +1,15 @@
import { styled } from '@linaria/react';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { FormatPreferencesSettings } from '@/settings/experience/components/FormatPreferencesSettings';
-import { UiScalePicker } from '@/settings/experience/components/UiScalePicker';
import { OpenRecordInPreferencePicker } from '@/settings/experience/components/OpenRecordInPreferencePicker';
-import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
+import { UiScalePicker } from '@/settings/experience/components/UiScalePicker';
import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { ColorSchemePicker } from 'twenty-ui/primitives/input';
+import { ColorSchemePicker, Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { LocalePicker } from '~/pages/settings/profile/appearance/components/LocalePicker';
diff --git a/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx b/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
index f92448874b4..9d554a89a39 100644
--- a/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
+++ b/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
@@ -9,8 +9,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { Controller, useForm } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/components';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { Section, useToast } from 'twenty-ui/components';
import { z } from 'zod';
import { CreateApprovedAccessDomainDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/security/SettingsSecuritySsoIdentifyProvider.tsx b/packages/twenty-front/src/pages/settings/security/SettingsSecuritySsoIdentifyProvider.tsx
index fd0969d61e7..414c678f759 100644
--- a/packages/twenty-front/src/pages/settings/security/SettingsSecuritySsoIdentifyProvider.tsx
+++ b/packages/twenty-front/src/pages/settings/security/SettingsSecuritySsoIdentifyProvider.tsx
@@ -14,7 +14,7 @@ import { Trans } from '@lingui/react/macro';
import { FormProvider, useForm } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/primitives/feedback';
+import { useToast } from 'twenty-ui/components';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
export const SettingsSecuritySsoIdentifyProvider = () => {
diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
index 2422163bef6..4b1430e5f78 100644
--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
@@ -1,22 +1,22 @@
-import { ApolloProvider } from '@apollo/client/react';
-import { loadDevMessages } from '@apollo/client/dev';
-import { type Decorator } from '@storybook/react-vite';
-import { Provider as JotaiProvider } from 'jotai';
-import { HelmetProvider } from '@dr.pogodin/react-helmet';
-import { createMemoryRouter, RouterProvider } from 'react-router-dom';
import { WorkspaceRouteObjectsProvider } from '@/app/routing/components/WorkspaceRouteObjectsProvider';
import { type WorkspaceRouteObject } from '@/app/routing/types/WorkspaceRouteObject';
import { ClientConfigProviderEffect } from '@/client-config/components/ClientConfigProviderEffect';
import { MinimalMetadataGate } from '@/metadata-store/components/MinimalMetadataGate';
import { ApolloCoreClientMockedProvider } from '@/object-metadata/hooks/__mocks__/ApolloCoreClientMockedProvider';
+import { loadDevMessages } from '@apollo/client/dev';
+import { ApolloProvider } from '@apollo/client/react';
+import { HelmetProvider } from '@dr.pogodin/react-helmet';
+import { type Decorator } from '@storybook/react-vite';
+import { Provider as JotaiProvider } from 'jotai';
+import { RouterProvider, createMemoryRouter } from 'react-router-dom';
-import { DefaultLayout } from '@/ui/layout/page/components/DefaultLayout';
import { UserMetadataProviderInitialEffect } from '@/metadata-store/effect-components/UserMetadataProviderInitialEffect';
-import { UserContextProvider } from '@/users/components/UserContextProvider';
-import { MockedMetadataLoadEffect } from '~/testing/decorators/MockedMetadataLoadEffect';
+import { DefaultLayout } from '@/ui/layout/page/components/DefaultLayout';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { UserContextProvider } from '@/users/components/UserContextProvider';
import { type JSX, useState } from 'react';
import { ClientConfigProvider } from '~/modules/client-config/components/ClientConfigProvider';
+import { MockedMetadataLoadEffect } from '~/testing/decorators/MockedMetadataLoadEffect';
import { mockedApolloClient } from '~/testing/mockedApolloClient';
import { RouteContextStoreProvider } from '@/context-store/components/RouteContextStoreProvider';
@@ -25,11 +25,11 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/con
import { PreComputedChipGeneratorsProvider } from '@/object-metadata/components/PreComputedChipGeneratorsProvider';
import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';
import { RecordCreationFormProvider } from '@/object-record/record-form/components/RecordCreationFormProvider';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';
import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
+import { ToastProvider } from 'twenty-ui/components';
import { IconsProvider } from 'twenty-ui/icon';
import { FullHeightStorybookLayout } from '~/testing/FullHeightStorybookLayout';
import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
diff --git a/packages/twenty-front/src/testing/decorators/ToastDecorator.tsx b/packages/twenty-front/src/testing/decorators/ToastDecorator.tsx
index 456e6644798..0fbf745c102 100644
--- a/packages/twenty-front/src/testing/decorators/ToastDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/ToastDecorator.tsx
@@ -1,5 +1,5 @@
import { type Decorator } from '@storybook/react-vite';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
+import { ToastProvider } from 'twenty-ui/components';
export const ToastDecorator: Decorator = (Story) => (
<ToastProvider>
diff --git a/packages/twenty-front/src/testing/decorators/WorkflowStepDecorator.tsx b/packages/twenty-front/src/testing/decorators/WorkflowStepDecorator.tsx
index e698f75b641..562548d8a72 100644
--- a/packages/twenty-front/src/testing/decorators/WorkflowStepDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/WorkflowStepDecorator.tsx
@@ -1,6 +1,5 @@
import { sidePanelWorkflowIdComponentState } from '@/side-panel/pages/workflow/states/sidePanelWorkflowIdComponentState';
import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';
-import { useLoadMockedMetadata } from '~/testing/hooks/useLoadMockedMetadata';
import { flowComponentState } from '@/workflow/states/flowComponentState';
import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';
import { workflowVisualizerWorkflowRunIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowRunIdComponentState';
@@ -13,7 +12,8 @@ import { type Decorator } from '@storybook/react-vite';
import { useAtomValue, useStore } from 'jotai';
import { useEffect, useState, type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
+import { ToastProvider } from 'twenty-ui/components';
+import { useLoadMockedMetadata } from '~/testing/hooks/useLoadMockedMetadata';
import {
mockedWorkflow,
mockedWorkflowNodeId,
diff --git a/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx b/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx
index 7dac98f795a..f1b394db6fb 100644
--- a/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx
+++ b/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx
@@ -7,7 +7,6 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/con
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';
-import { ToastProvider } from 'twenty-ui/primitives/feedback';
import {
jotaiStore,
resetJotaiStore,
@@ -15,6 +14,7 @@ import {
import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
import { type InMemoryCache } from '@apollo/client';
import type { Store } from 'jotai/vanilla/store';
+import { ToastProvider } from 'twenty-ui/components';
import { JestContextStoreSetter } from '~/testing/jest/JestContextStoreSetter';
import { JestObjectMetadataItemSetter } from '~/testing/jest/JestObjectMetadataItemSetter';
diff --git a/packages/twenty-front/src/utils/__tests__/checkUrlType.test.ts b/packages/twenty-front/src/utils/__tests__/checkUrlType.test.ts
index 84b18fcf8a6..70a297239a5 100644
--- a/packages/twenty-front/src/utils/__tests__/checkUrlType.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/checkUrlType.test.ts
@@ -1,5 +1,5 @@
+import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
import { checkUrlType } from '~/utils/checkUrlType';
-import { LinkType } from 'twenty-ui/primitives/navigation';
describe('checkUrlType', () => {
it('should detect LinkedIn urls', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/isSocialLinkType.test.ts b/packages/twenty-front/src/utils/__tests__/isSocialLinkType.test.ts
index 36a1f6fdc82..3cff93fbb4d 100644
--- a/packages/twenty-front/src/utils/__tests__/isSocialLinkType.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/isSocialLinkType.test.ts
@@ -1,5 +1,5 @@
+import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
import { isSocialLinkType } from '~/utils/isSocialLinkType';
-import { LinkType } from 'twenty-ui/primitives/navigation';
describe('isSocialLinkType', () => {
it('should return true for social link types', () => {
diff --git a/packages/twenty-front/src/utils/checkUrlType.ts b/packages/twenty-front/src/utils/checkUrlType.ts
index 40af10d7b09..33c1e36c5e3 100644
--- a/packages/twenty-front/src/utils/checkUrlType.ts
+++ b/packages/twenty-front/src/utils/checkUrlType.ts
@@ -1,7 +1,5 @@
-import {
- LinkType,
- SOCIAL_LINK_PROVIDERS,
-} from 'twenty-ui/primitives/navigation';
+import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
+import { SOCIAL_LINK_PROVIDERS } from '@/ui/field/display/components/SocialLink/socialLinkProviders';
export const checkUrlType = (url: string) => {
const provider = SOCIAL_LINK_PROVIDERS.find((socialLinkProvider) =>
diff --git a/packages/twenty-front/src/utils/isSocialLinkType.ts b/packages/twenty-front/src/utils/isSocialLinkType.ts
index d1e3f6743ce..9ecd67312cb 100644
--- a/packages/twenty-front/src/utils/isSocialLinkType.ts
+++ b/packages/twenty-front/src/utils/isSocialLinkType.ts
@@ -1,7 +1,5 @@
-import {
- type LinkType,
- SOCIAL_LINK_PROVIDERS,
-} from 'twenty-ui/primitives/navigation';
+import { type LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
+import { SOCIAL_LINK_PROVIDERS } from '@/ui/field/display/components/SocialLink/socialLinkProviders';
export const isSocialLinkType = (type: LinkType): boolean =>
SOCIAL_LINK_PROVIDERS.some(
diff --git a/packages/twenty-shared/src/constants/DocumentationPaths.ts b/packages/twenty-shared/src/constants/DocumentationPaths.ts
index 00c18cc6a0a..5f152ecc3f3 100644
--- a/packages/twenty-shared/src/constants/DocumentationPaths.ts
+++ b/packages/twenty-shared/src/constants/DocumentationPaths.ts
@@ -138,13 +138,13 @@ export const DOCUMENTATION_PATHS = {
UI_COMPONENTS_SECTION: '/ui/components/section',
UI_COMPONENTS_SETTINGS_ROW: '/ui/components/settings-row',
UI_COMPONENTS_TAB_BUTTON: '/ui/components/tab-button',
+ UI_COMPONENTS_TOAST: '/ui/components/toast',
UI_DARK_MODE: '/ui/dark-mode',
UI_GETTING_STARTED: '/ui/getting-started',
UI_PRIMITIVES_DATA_DISPLAY_AVATAR: '/ui/primitives/data-display/avatar',
UI_PRIMITIVES_DATA_DISPLAY_CHIP: '/ui/primitives/data-display/chip',
UI_PRIMITIVES_DATA_DISPLAY_STATUS: '/ui/primitives/data-display/status',
UI_PRIMITIVES_DATA_DISPLAY_TAG: '/ui/primitives/data-display/tag',
- UI_PRIMITIVES_FEEDBACK_TOAST: '/ui/primitives/feedback/toast',
UI_PRIMITIVES_INPUT_BUTTON: '/ui/primitives/input/button',
UI_PRIMITIVES_INPUT_BUTTON_GROUP: '/ui/primitives/input/button-group',
UI_PRIMITIVES_INPUT_CHECKBOX: '/ui/primitives/input/checkbox',
@@ -164,6 +164,7 @@ export const DOCUMENTATION_PATHS = {
UI_PRIMITIVES_SURFACES_DIALOG: '/ui/primitives/surfaces/dialog',
UI_PRIMITIVES_SURFACES_MENU: '/ui/primitives/surfaces/menu',
UI_PRIMITIVES_SURFACES_POPOVER: '/ui/primitives/surfaces/popover',
+ UI_PRIMITIVES_SURFACES_TOOLTIP: '/ui/primitives/surfaces/tooltip',
UI_PRIMITIVES_TYPOGRAPHY_HEADING: '/ui/primitives/typography/heading',
UI_PRIMITIVES_TYPOGRAPHY_TEXT: '/ui/primitives/typography/text',
UI_SSR: '/ui/ssr',
diff --git a/packages/twenty-ui/.size-limit.json b/packages/twenty-ui/.size-limit.json
index d57ea39d658..e57e0c91746 100644
--- a/packages/twenty-ui/.size-limit.json
+++ b/packages/twenty-ui/.size-limit.json
@@ -13,7 +13,7 @@
{
"name": "components",
"path": "dist/components.mjs",
- "limit": "96 kB"
+ "limit": "125 kB"
},
{
"name": "components/code-editor",
@@ -46,9 +46,10 @@
"limit": "230 kB"
},
{
- "name": "primitives/json-visualizer",
- "path": "dist/primitives/json-visualizer.mjs",
- "limit": "30 kB"
+ "name": "components (JsonTree)",
+ "path": "dist/components.mjs",
+ "limit": "30 kB",
+ "import": "{ JsonTree }"
},
{
"name": "primitives/layout",
diff --git a/packages/twenty-ui/CHANGELOG.md b/packages/twenty-ui/CHANGELOG.md
new file mode 100644
index 00000000000..e912882b176
--- /dev/null
+++ b/packages/twenty-ui/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+## [Unreleased]
+
+### Breaking Changes
+
+- **Public module ownership changes without a deprecation window.** This release removes 55 public React exports and the `twenty-ui/primitives/json-visualizer` entry point. Applications using the removed imports must migrate when upgrading; compatibility exports are not provided.
+- Import shared compositions, including `JsonTree`, menu presets, and Toast components and hooks, from `twenty-ui/components`. Foundational controls retain `twenty-ui/primitives/<family>` imports. The optional code editor retains `twenty-ui/components/code-editor`.
+- Field displays, application links, placeholders, and feature animations are no longer package exports. External applications must own these integrations or compose supported primitives. Internal implementation parts are private.
+- `Info` uses `href` and `render` in place of `to`. Replace `AnimatedEaseInOut` with `AnimatedExpandableContainer`.
+
+Keep `twenty-ui`, `twenty-sdk`, and `twenty-client-sdk` versions aligned when upgrading Twenty apps.
diff --git a/packages/twenty-ui/README.md b/packages/twenty-ui/README.md
index 713cb884f80..7b644447c85 100644
--- a/packages/twenty-ui/README.md
+++ b/packages/twenty-ui/README.md
@@ -10,6 +10,10 @@ Read the [twenty-ui documentation](https://docs.twenty.com/ui/getting-started) f
> **Alpha:** `twenty-ui` is still in alpha. Its version number follows the Twenty SDK release cycle. APIs and component behavior may change between releases.
+## Upgrading
+
+The next release changes public module ownership and removes exports without a deprecation window. Read the [breaking release notes](./CHANGELOG.md#unreleased) before upgrading.
+
# Installation
For a standalone React application, install the library and its peer dependencies. React 19 is required.
@@ -52,27 +56,26 @@ import { Button } from 'twenty-ui/primitives/input';
# Entry points
-| Subpath | Contents |
-| --- | --- |
-| `twenty-ui` | Components except the code editor, icons, theme tokens, and utilities |
-| `twenty-ui/assets` | Logos and static assets |
-| `twenty-ui/components` | Shared design presets and reusable app building blocks |
-| `twenty-ui/components/code-editor` | Code editor, editor header, and editor theme helpers |
-| `twenty-ui/icon` | Icon components and the icon provider |
-| `twenty-ui/primitives` | Foundational UI controls and compound controls |
-| `twenty-ui/primitives/accessibility` | Hidden elements and keyboard interaction helpers |
-| `twenty-ui/primitives/data-display` | Avatars, chips, tags, status indicators, and display helpers |
-| `twenty-ui/primitives/feedback` | Toasts, banners, progress bars, and loaders |
-| `twenty-ui/primitives/input` | Buttons, form controls, and pickers |
-| `twenty-ui/primitives/json-visualizer` | JSON tree viewer |
-| `twenty-ui/primitives/layout` | Layout, animation, resizing, and section components |
-| `twenty-ui/primitives/navigation` | Links, list items, menus, and tabs |
-| `twenty-ui/primitives/surfaces` | Cards, dialogs, menus, popovers, and tooltips |
-| `twenty-ui/primitives/typography` | Text, headings, labels, and typography helpers |
-| `twenty-ui/testing` | Storybook and test decorators |
-| `twenty-ui/theme` | Theme types and helpers |
-| `twenty-ui/theme-constants` | Design tokens, `ThemeProvider`, and `useTheme` |
-| `twenty-ui/utilities` | Hooks and shared utilities |
+| Subpath | Contents |
+| ------------------------------------ | --------------------------------------------------------------------- |
+| `twenty-ui` | Components except the code editor, icons, theme tokens, and utilities |
+| `twenty-ui/assets` | Logos and static assets |
+| `twenty-ui/components` | Shared design presets and reusable app building blocks |
+| `twenty-ui/components/code-editor` | Code editor, editor header, and editor theme helpers |
+| `twenty-ui/icon` | Icon components and the icon provider |
+| `twenty-ui/primitives` | Foundational UI controls and compound controls |
+| `twenty-ui/primitives/accessibility` | Hidden elements and keyboard interaction helpers |
+| `twenty-ui/primitives/data-display` | Avatars, chips, tags, color samples, and status indicators |
+| `twenty-ui/primitives/feedback` | Banners, progress bars, and loaders |
+| `twenty-ui/primitives/input` | Buttons and form controls |
+| `twenty-ui/primitives/layout` | Expansion, separators, direction, and resizing |
+| `twenty-ui/primitives/navigation` | Action links, list items, and tabs |
+| `twenty-ui/primitives/surfaces` | Cards, dialogs, menus, popovers, and tooltips |
+| `twenty-ui/primitives/typography` | Text and headings |
+| `twenty-ui/testing` | Storybook and test decorators |
+| `twenty-ui/theme` | Theme types and helpers |
+| `twenty-ui/theme-constants` | Design tokens, `ThemeProvider`, and `useTheme` |
+| `twenty-ui/utilities` | Hooks and shared utilities |
# Theming
@@ -82,6 +85,8 @@ import { Button } from 'twenty-ui/primitives/input';
# Development
+Shared component sources live in `src/components/{data-display,feedback,input,layout,navigation,typography}`, with the optional editor in `src/components/code-editor`. Keep each component's types, stories, tests, and private parts beside its implementation. The generated `components` barrel provides the public imports.
+
Primitive guides belong in `packages/twenty-docs/ui/primitives`. Shared component guides belong in `packages/twenty-docs/ui/components`. For each stateful API that supports both modes, include separate **Uncontrolled state** and **Controlled state** examples with the same scenario, labels, and initial state. Keep each example complete, with public imports and one exported example component.
Explain state ownership before advanced behavior such as indeterminate selection or manual tab activation. Document independent states, such as selection and popup visibility, separately. For components that delegate state to a parent or group, explain that ownership and link to the relevant examples.
@@ -108,3 +113,13 @@ npx vitest run --root packages/twenty-ui --project unit <file> # Run a single
# License
twenty-ui is released under the [MIT](https://github.com/twentyhq/twenty/blob/main/packages/twenty-ui/LICENSE) license.
+
+# Module ownership
+
+Primitives provide foundational interaction and presentation. Shared components compose primitives into reusable presets, pickers, menu rows, notifications, and the JSON viewer. Both layers accept data, labels, and callbacks from their host.
+
+Routing adapters, record formatting, product illustrations, and feature-specific animation belong to `twenty-front`. Implementation parts live in `internal` or `parts` directories and are excluded from published barrels.
+
+Run `node --import tsx scripts/checkModuleOwnership.ts` from this package after changing the public interface. When intentionally adding or removing a public React component, regenerate `docs/module-ownership.json` with `node --import tsx scripts/checkModuleOwnership.ts --write` and review the snapshot diff. CI checks the committed snapshot and the dependency boundaries without updating them.
+
+`twenty-ui/testing` includes routing decorators and requires the optional `react-router-dom` peer. The package check verifies each published entry point, allowing that peer only in testing and the Monaco peers only in `twenty-ui/components/code-editor`.
diff --git a/packages/twenty-ui/docs/components.ts b/packages/twenty-ui/docs/components.ts
index 10ec5b016ae..a546181fe7d 100644
--- a/packages/twenty-ui/docs/components.ts
+++ b/packages/twenty-ui/docs/components.ts
@@ -1,15 +1,15 @@
-import { LIGHT_ICON_BUTTON_PROP_DESCRIPTIONS } from './lightIconButtonPropDescriptions';
-import { DIALOG_PROP_DESCRIPTIONS } from './dialogPropDescriptions';
import { AVATAR_PROP_DESCRIPTIONS } from './avatarPropDescriptions';
import { BUTTON_GROUP_PROP_DESCRIPTIONS } from './buttonGroupPropDescriptions';
import { BUTTON_PROP_DESCRIPTIONS } from './buttonPropDescriptions';
-import { ICON_BUTTON_PROP_DESCRIPTIONS } from './iconButtonPropDescriptions';
import { CHIP_PROP_DESCRIPTIONS } from './chipPropDescriptions';
import { CODE_EDITOR_HEADER_PROP_DESCRIPTIONS } from './codeEditorHeaderPropDescriptions';
import { CODE_EDITOR_PROP_DESCRIPTIONS } from './codeEditorPropDescriptions';
+import { DIALOG_PROP_DESCRIPTIONS } from './dialogPropDescriptions';
import { DIALOG_TITLE_PROP_DESCRIPTIONS } from './dialogTitlePropDescriptions';
import { HEADING_PROP_DESCRIPTIONS } from './headingPropDescriptions';
+import { ICON_BUTTON_PROP_DESCRIPTIONS } from './iconButtonPropDescriptions';
import { LIGHT_BUTTON_PROP_DESCRIPTIONS } from './lightButtonPropDescriptions';
+import { LIGHT_ICON_BUTTON_PROP_DESCRIPTIONS } from './lightIconButtonPropDescriptions';
import { SECTION_HEADER_PROP_DESCRIPTIONS } from './sectionHeaderPropDescriptions';
import { SECTION_ROOT_PROP_DESCRIPTIONS } from './sectionRootPropDescriptions';
import { SETTINGS_ROW_PROP_DESCRIPTIONS } from './settingsRowPropDescriptions';
@@ -21,28 +21,28 @@ import { TOOLTIP_PROP_DESCRIPTIONS } from './tooltipPropDescriptions';
export const DOCUMENTED_COMPONENTS = [
{
name: 'LightIconButton',
- source: 'components/LightIconButton/LightIconButton.tsx',
+ source: 'components/input/LightIconButton/LightIconButton.tsx',
entryPoint: 'twenty-ui/components',
slug: 'input/light-icon-button',
propDescriptions: LIGHT_ICON_BUTTON_PROP_DESCRIPTIONS,
},
{
name: 'IconButton',
- source: 'components/IconButton/IconButton.tsx',
+ source: 'components/input/IconButton/IconButton.tsx',
entryPoint: 'twenty-ui/components',
slug: 'input/icon-button',
propDescriptions: ICON_BUTTON_PROP_DESCRIPTIONS,
},
{
name: 'MainButton',
- source: 'components/MainButton/MainButton.tsx',
+ source: 'components/input/MainButton/MainButton.tsx',
entryPoint: 'twenty-ui/components',
slug: 'input/main-button',
propDescriptions: BUTTON_PROP_DESCRIPTIONS,
},
{
name: 'LightButton',
- source: 'components/LightButton/LightButton.tsx',
+ source: 'components/input/LightButton/LightButton.tsx',
entryPoint: 'twenty-ui/components',
slug: 'input/light-button',
propDescriptions: LIGHT_BUTTON_PROP_DESCRIPTIONS,
@@ -126,6 +126,10 @@ export const DOCUMENTED_COMPONENTS = [
source: 'primitives/navigation/ListItem/ListItem.tsx',
entryPoint: 'twenty-ui/primitives/navigation',
slug: 'navigation/list-item',
+ propDescriptions: {
+ actionsVisibility:
+ 'When trailing actions are visible: on hover and focus, or always.',
+ },
},
{
name: 'Tabs',
@@ -177,8 +181,8 @@ export const DOCUMENTED_COMPONENTS = [
},
{
name: 'Toast',
- source: 'primitives/feedback/Toast/Toast.tsx',
- entryPoint: 'twenty-ui/primitives/feedback',
+ source: 'components/feedback/Toast/Toast.tsx',
+ entryPoint: 'twenty-ui/components',
slug: 'feedback/toast',
},
{
@@ -224,14 +228,14 @@ export const DOCUMENTED_COMPONENTS = [
},
{
name: 'SettingsRow',
- source: 'components/SettingsRow/SettingsRow.tsx',
+ source: 'components/input/SettingsRow/SettingsRow.tsx',
entryPoint: 'twenty-ui/components',
slug: 'components/settings-row',
propDescriptions: SETTINGS_ROW_PROP_DESCRIPTIONS,
},
{
name: 'Section',
- source: 'components/Section/Section.tsx',
+ source: 'components/layout/Section/Section.tsx',
entryPoint: 'twenty-ui/components',
slug: 'components/section',
partPropDescriptions: {
@@ -255,7 +259,7 @@ export const DOCUMENTED_COMPONENTS = [
},
{
name: 'TabButton',
- source: 'components/TabButton/TabButton.tsx',
+ source: 'components/navigation/TabButton/TabButton.tsx',
entryPoint: 'twenty-ui/components',
slug: 'components/tab-button',
propDescriptions: {
diff --git a/packages/twenty-ui/docs/iconButtonPropDescriptions.ts b/packages/twenty-ui/docs/iconButtonPropDescriptions.ts
index 57fde53dae7..0a7bcfa00ed 100644
--- a/packages/twenty-ui/docs/iconButtonPropDescriptions.ts
+++ b/packages/twenty-ui/docs/iconButtonPropDescriptions.ts
@@ -1,4 +1,4 @@
-import { type IconButtonProps } from '../src/components/IconButton/types/IconButtonProps';
+import { type IconButtonProps } from '../src/components/input/IconButton/types/IconButtonProps';
import { BUTTON_PROP_DESCRIPTIONS } from './buttonPropDescriptions';
export const ICON_BUTTON_PROP_DESCRIPTIONS = {
diff --git a/packages/twenty-ui/docs/lightButtonPropDescriptions.ts b/packages/twenty-ui/docs/lightButtonPropDescriptions.ts
index 0887dedb710..9f92cc7f0a2 100644
--- a/packages/twenty-ui/docs/lightButtonPropDescriptions.ts
+++ b/packages/twenty-ui/docs/lightButtonPropDescriptions.ts
@@ -1,4 +1,4 @@
-import { type LightButtonProps } from '../src/components/LightButton/types/LightButtonProps';
+import { type LightButtonProps } from '../src/components/input/LightButton/types/LightButtonProps';
import { BUTTON_PROP_DESCRIPTIONS } from './buttonPropDescriptions';
diff --git a/packages/twenty-ui/docs/lightIconButtonPropDescriptions.ts b/packages/twenty-ui/docs/lightIconButtonPropDescriptions.ts
index 91ddc3df4da..17ace3f0991 100644
--- a/packages/twenty-ui/docs/lightIconButtonPropDescriptions.ts
+++ b/packages/twenty-ui/docs/lightIconButtonPropDescriptions.ts
@@ -1,4 +1,4 @@
-import { type LightIconButtonProps } from '../src/components/LightIconButton/types/LightIconButtonProps';
+import { type LightIconButtonProps } from '../src/components/input/LightIconButton/types/LightIconButtonProps';
import { ICON_BUTTON_PROP_DESCRIPTIONS } from './iconButtonPropDescriptions';
export const LIGHT_ICON_BUTTON_PROP_DESCRIPTIONS = {
diff --git a/packages/twenty-ui/docs/module-ownership.json b/packages/twenty-ui/docs/module-ownership.json
new file mode 100644
index 00000000000..3e787287f0c
--- /dev/null
+++ b/packages/twenty-ui/docs/module-ownership.json
@@ -0,0 +1,80 @@
+{
+ "primitives": [
+ "AlertDialog",
+ "AnimatedExpandableContainer",
+ "Avatar",
+ "Banner",
+ "Button",
+ "ButtonGroup",
+ "Card",
+ "CardContent",
+ "CardFooter",
+ "CardHeader",
+ "Checkbox",
+ "Chip",
+ "CircularProgressBar",
+ "ClickToActionLink",
+ "ColorSample",
+ "Dialog",
+ "Field",
+ "Heading",
+ "HorizontalSeparator",
+ "Input",
+ "InputGroup",
+ "ListItem",
+ "Loader",
+ "Menu",
+ "OverflowingTextWithTooltip",
+ "Pill",
+ "Popover",
+ "ProgressBar",
+ "Radio",
+ "RadioGroup",
+ "ResizeHandle",
+ "SegmentedControl",
+ "Select",
+ "Slider",
+ "Status",
+ "Switch",
+ "Tabs",
+ "Tag",
+ "Text",
+ "TextDirectionProvider",
+ "Textarea",
+ "Tooltip",
+ "VisibilityHidden"
+ ],
+ "components": [
+ "AnimatedIconCrossfade",
+ "AvatarGroup",
+ "Callout",
+ "CardPicker",
+ "CodeEditor",
+ "CodeEditorHeader",
+ "ColorSchemePicker",
+ "CommandBlock",
+ "IconButton",
+ "Info",
+ "InlineBanner",
+ "JsonTree",
+ "LightButton",
+ "LightIconButton",
+ "MainButton",
+ "MenuItem",
+ "MenuItemAvatar",
+ "MenuItemDraggable",
+ "MenuItemSuggestion",
+ "MenuPicker",
+ "NavigationBar",
+ "NotificationCounter",
+ "RoundedLink",
+ "SearchInput",
+ "Section",
+ "SettingsRow",
+ "TabButton",
+ "TintedIconTile",
+ "Toast",
+ "ToastProvider",
+ "Toaster"
+ ]
+}
diff --git a/packages/twenty-ui/docs/sectionHeaderPropDescriptions.ts b/packages/twenty-ui/docs/sectionHeaderPropDescriptions.ts
index 86c12ef31e2..90f3fad08e0 100644
--- a/packages/twenty-ui/docs/sectionHeaderPropDescriptions.ts
+++ b/packages/twenty-ui/docs/sectionHeaderPropDescriptions.ts
@@ -1,4 +1,4 @@
-import { type SectionHeaderProps } from '../src/components/Section/types/SectionHeaderProps';
+import { type SectionHeaderProps } from '../src/components/layout/Section/types/SectionHeaderProps';
import { HEADING_PROP_DESCRIPTIONS } from './headingPropDescriptions';
export const SECTION_HEADER_PROP_DESCRIPTIONS = {
diff --git a/packages/twenty-ui/docs/sectionRootPropDescriptions.ts b/packages/twenty-ui/docs/sectionRootPropDescriptions.ts
index 2cb00f659a1..0f55d22fdac 100644
--- a/packages/twenty-ui/docs/sectionRootPropDescriptions.ts
+++ b/packages/twenty-ui/docs/sectionRootPropDescriptions.ts
@@ -1,4 +1,4 @@
-import { type SectionRootProps } from '../src/components/Section/types/SectionRootProps';
+import { type SectionRootProps } from '../src/components/layout/Section/types/SectionRootProps';
export const SECTION_ROOT_PROP_DESCRIPTIONS = {
align: 'Text alignment within the section. Defaults to `left`.',
diff --git a/packages/twenty-ui/docs/settingsRowPropDescriptions.ts b/packages/twenty-ui/docs/settingsRowPropDescriptions.ts
index e76c8304766..304ebaab949 100644
--- a/packages/twenty-ui/docs/settingsRowPropDescriptions.ts
+++ b/packages/twenty-ui/docs/settingsRowPropDescriptions.ts
@@ -1,4 +1,4 @@
-import { type SettingsRowProps } from '../src/components/SettingsRow/types/SettingsRowProps';
+import { type SettingsRowProps } from '../src/components/input/SettingsRow/types/SettingsRowProps';
export const SETTINGS_ROW_PROP_DESCRIPTIONS = {
children:
diff --git a/packages/twenty-ui/generated/components.docs.json b/packages/twenty-ui/generated/components.docs.json
index cc37f491b71..6fe229c142d 100644
--- a/packages/twenty-ui/generated/components.docs.json
+++ b/packages/twenty-ui/generated/components.docs.json
@@ -2387,6 +2387,13 @@
"defaultValue": null,
"description": "Trailing content, such as buttons, rendered after the content."
},
+ {
+ "name": "actionsVisibility",
+ "type": "\"always\" | \"hover\"",
+ "required": false,
+ "defaultValue": "hover",
+ "description": "When trailing actions are visible: on hover and focus, or always."
+ },
{
"name": "color",
"type": "\"danger\" | \"neutral\"",
@@ -5255,7 +5262,7 @@
},
{
"name": "Toast",
- "entryPoint": "twenty-ui/primitives/feedback",
+ "entryPoint": "twenty-ui/components",
"slug": "feedback/toast",
"props": [
{
diff --git a/packages/twenty-ui/package.json b/packages/twenty-ui/package.json
index aa3d9dc2355..28f2aab6757 100644
--- a/packages/twenty-ui/package.json
+++ b/packages/twenty-ui/package.json
@@ -69,7 +69,8 @@
"vite-plugin-dts": "^4.5.4",
"vite-plugin-sass-dts": "^1.3.31",
"vite-plugin-svgr": "^4.3.0",
- "vitest": "^4.1.0"
+ "vitest": "^4.1.0",
+ "react-router-dom": "^7.18.4"
},
"dependencies": {
"@base-ui/react": "^1.8.0",
@@ -78,7 +79,6 @@
"@tabler/icons-react": "^3.31.0",
"clsx": "^2.1.1",
"react-responsive": "^9.0.2",
- "react-router-dom": "^7.18.4",
"type-fest": "^4.10.1",
"zod": "^4.1.11"
},
@@ -86,7 +86,8 @@
"@monaco-editor/react": "^4.7.0",
"monaco-editor": ">= 0.25.0 < 1",
"react": "^19.0.0",
- "react-dom": "^19.0.0"
+ "react-dom": "^19.0.0",
+ "react-router-dom": "^7.18.4"
},
"scripts": {
"build": "npx vite build"
@@ -94,6 +95,7 @@
"files": [
"dist",
"LICENSE",
+ "CHANGELOG.md",
"!dist/individual",
"!dist/individual/**",
"!dist/**/*.map"
@@ -152,11 +154,6 @@
"import": "./dist/primitives/input.mjs",
"require": "./dist/primitives/input.cjs"
},
- "./primitives/json-visualizer": {
- "types": "./dist/primitives/json-visualizer/index.d.ts",
- "import": "./dist/primitives/json-visualizer.mjs",
- "require": "./dist/primitives/json-visualizer.cjs"
- },
"./primitives/layout": {
"types": "./dist/primitives/layout/index.d.ts",
"import": "./dist/primitives/layout.mjs",
@@ -232,9 +229,6 @@
"primitives/input": [
"dist/primitives/input/index.d.ts"
],
- "primitives/json-visualizer": [
- "dist/primitives/json-visualizer/index.d.ts"
- ],
"primitives/layout": [
"dist/primitives/layout/index.d.ts"
],
@@ -270,6 +264,9 @@
},
"monaco-editor": {
"optional": true
+ },
+ "react-router-dom": {
+ "optional": true
}
}
}
diff --git a/packages/twenty-ui/project.json b/packages/twenty-ui/project.json
index dac88e2885c..678502334de 100644
--- a/packages/twenty-ui/project.json
+++ b/packages/twenty-ui/project.json
@@ -6,6 +6,19 @@
"tags": ["scope:shared"],
"targets": {
"build": { "dependsOn": ["^build"], "outputs": ["{projectRoot}/dist"] },
+ "check:ownership": {
+ "executor": "nx:run-commands",
+ "cache": true,
+ "dependsOn": ["generateBarrels"],
+ "inputs": [
+ "{projectRoot}/src/**/*",
+ "{projectRoot}/docs/module-ownership.json",
+ "{projectRoot}/scripts/checkModuleOwnership.ts"
+ ],
+ "options": {
+ "command": "tsx {projectRoot}/scripts/checkModuleOwnership.ts"
+ }
+ },
"generateTokens": {
"executor": "nx:run-commands",
"cache": false,
@@ -109,6 +122,7 @@
"lint": {},
"fmt": { "options": { "files": "src" }, "configurations": { "fix": {} } },
"test": {
+ "dependsOn": ["check:ownership"],
"executor": "nx:run-commands",
"cache": true,
"inputs": ["default", "^default"],
diff --git a/packages/twenty-ui/scripts/checkModuleOwnership.ts b/packages/twenty-ui/scripts/checkModuleOwnership.ts
new file mode 100644
index 00000000000..f8937eac0cf
--- /dev/null
+++ b/packages/twenty-ui/scripts/checkModuleOwnership.ts
@@ -0,0 +1,163 @@
+import { isNonEmptyArray } from '@sniptt/guards';
+import { globSync } from 'glob';
+import { readFileSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import ts from 'typescript';
+import { isDefined } from '../src/utilities/utils/isDefined';
+
+import ownership from '../docs/module-ownership.json';
+
+const PACKAGE_ROOT = path.resolve(
+ path.dirname(fileURLToPath(import.meta.url)),
+ '..',
+);
+const SOURCE_ROOT = path.join(PACKAGE_ROOT, 'src');
+const SHARED_COMPONENTS_ROOT = path.join(SOURCE_ROOT, 'components');
+const SOURCE_EXTENSIONS = ['.tsx', '.ts'];
+const PACKAGE_ENTRY_POINTS = new Set([
+ SOURCE_ROOT,
+ path.join(SOURCE_ROOT, 'index'),
+ ...SOURCE_EXTENSIONS.map((extension) =>
+ path.join(SOURCE_ROOT, `index${extension}`),
+ ),
+]);
+const IMPLEMENTATION_ONLY_PATTERN = /\/(internal|internals|parts)\//;
+const SUPPORT_DIRECTORY_PATTERN = /\/(contexts|hooks)\//;
+const TEST_DIRECTORY_PATTERN = /\/(testing|__tests__|__stories__|__mocks__)\//;
+const TEST_FILE_PATTERN = /\.(stories|test|spec)\.tsx?$/;
+const shouldUpdateSnapshot = process.argv.includes('--write');
+const actualOwnership: Record<keyof typeof ownership, string[]> = {
+ primitives: [],
+ components: [],
+};
+const errors: string[] = [];
+
+for (const layer of ['primitives', 'components'] as const) {
+ const expected = new Set<string>(ownership[layer]);
+ const actual = new Set<string>();
+
+ for (const file of globSync(`${layer}/**/index.ts`, { cwd: SOURCE_ROOT })) {
+ const filePath = path.join(SOURCE_ROOT, file);
+ const source = ts.createSourceFile(
+ filePath,
+ readFileSync(filePath, 'utf8'),
+ ts.ScriptTarget.Latest,
+ true,
+ );
+
+ for (const statement of source.statements) {
+ if (
+ !ts.isExportDeclaration(statement) ||
+ statement.isTypeOnly ||
+ !isDefined(statement.moduleSpecifier) ||
+ !ts.isStringLiteral(statement.moduleSpecifier) ||
+ !isDefined(statement.exportClause) ||
+ !ts.isNamedExports(statement.exportClause)
+ ) {
+ continue;
+ }
+
+ const target = path.resolve(
+ path.dirname(filePath),
+ statement.moduleSpecifier.text,
+ );
+ if (IMPLEMENTATION_ONLY_PATTERN.test(target)) {
+ errors.push(
+ `${file} exports an implementation part: ${statement.moduleSpecifier.text}`,
+ );
+ }
+
+ const componentSource = SOURCE_EXTENSIONS.map(
+ (extension) => `${target}${extension}`,
+ ).find((candidate) => ts.sys.fileExists(candidate));
+ if (
+ !componentSource?.endsWith('.tsx') ||
+ SUPPORT_DIRECTORY_PATTERN.test(componentSource)
+ ) {
+ continue;
+ }
+
+ for (const element of statement.exportClause.elements) {
+ if (!element.isTypeOnly) {
+ actual.add(element.name.text);
+ }
+ }
+ }
+ }
+
+ actualOwnership[layer] = [...actual].sort();
+
+ if (shouldUpdateSnapshot) {
+ continue;
+ }
+
+ for (const name of expected) {
+ if (!actual.has(name)) {
+ errors.push(`${name} is missing from ${layer}`);
+ }
+ }
+
+ for (const name of actual) {
+ if (!expected.has(name)) {
+ errors.push(`${name} has no public ownership decision in ${layer}`);
+ }
+ }
+}
+
+for (const file of globSync('**/*.{ts,tsx}', { cwd: SOURCE_ROOT })) {
+ const filePath = path.join(SOURCE_ROOT, file);
+ const isTestOrDeclaration =
+ TEST_DIRECTORY_PATTERN.test(filePath) ||
+ TEST_FILE_PATTERN.test(filePath) ||
+ file.endsWith('.d.ts');
+
+ const { importedFiles } = ts.preProcessFile(
+ readFileSync(filePath, 'utf8'),
+ true,
+ true,
+ );
+ for (const { fileName: moduleName } of importedFiles) {
+ if (
+ !isTestOrDeclaration &&
+ (moduleName === 'react-router-dom' ||
+ moduleName === 'react-router' ||
+ moduleName.startsWith('twenty-front') ||
+ moduleName.startsWith('@/') ||
+ moduleName.startsWith('~/'))
+ ) {
+ errors.push(`${file} depends on application code: ${moduleName}`);
+ }
+
+ const target = moduleName.startsWith('@ui/')
+ ? path.join(SOURCE_ROOT, moduleName.slice('@ui/'.length))
+ : moduleName.startsWith('twenty-ui/')
+ ? path.join(SOURCE_ROOT, moduleName.slice('twenty-ui/'.length))
+ : path.resolve(path.dirname(filePath), moduleName);
+ if (
+ file.startsWith('primitives/') &&
+ (moduleName === 'twenty-ui' ||
+ moduleName === '@ui' ||
+ PACKAGE_ENTRY_POINTS.has(target) ||
+ target === SHARED_COMPONENTS_ROOT ||
+ target.startsWith(SHARED_COMPONENTS_ROOT + path.sep))
+ ) {
+ errors.push(`${file} depends on a shared composition: ${moduleName}`);
+ }
+ }
+}
+
+if (isNonEmptyArray(errors)) {
+ throw new Error(errors.join('\n'));
+}
+
+if (shouldUpdateSnapshot) {
+ writeFileSync(
+ path.join(PACKAGE_ROOT, 'docs/module-ownership.json'),
+ `${JSON.stringify(actualOwnership, null, 2)}\n`,
+ );
+}
+
+process.stdout.write(
+ `Module ownership verified: ${actualOwnership.primitives.length} primitives and ${actualOwnership.components.length} shared components.\n`,
+);
diff --git a/packages/twenty-ui/scripts/checkOptionalDependencies.ts b/packages/twenty-ui/scripts/checkOptionalDependencies.ts
index 57c046f7283..d634190b42d 100644
--- a/packages/twenty-ui/scripts/checkOptionalDependencies.ts
+++ b/packages/twenty-ui/scripts/checkOptionalDependencies.ts
@@ -1,4 +1,4 @@
-import { isNonEmptyArray } from '@sniptt/guards';
+import { isNonEmptyArray, isString } from '@sniptt/guards';
import { build, type Plugin } from 'esbuild';
import fs from 'node:fs';
import path from 'node:path';
@@ -17,7 +17,10 @@ const PACKAGE_PATH = path.resolve(
path.dirname(fileURLToPath(import.meta.url)),
'..',
);
-const ROOT_ENTRY_POINT = packageJson.exports['.'];
+const ALLOWED_OPTIONAL_PEERS_BY_ENTRY_POINT: Record<string, string[]> = {
+ './testing': ['react-router-dom'],
+ './components/code-editor': ['@monaco-editor/react', 'monaco-editor'],
+};
const OPTIONAL_PEER_DEPENDENCY_NAMES = Object.entries(
packageJson.peerDependenciesMeta,
)
@@ -26,28 +29,46 @@ const OPTIONAL_PEER_DEPENDENCY_NAMES = Object.entries(
const BARE_IMPORT_PATH_PATTERN = /^[^./]/;
const DECLARATION_FILE_SUFFIXES = ['.d.ts', '/index.d.ts'];
-const isOptionalPeerDependencyImportPath = (importPath: string) =>
- OPTIONAL_PEER_DEPENDENCY_NAMES.some(
+const matchesDependencyImportPath = ({
+ importPath,
+ dependencyNames,
+}: {
+ importPath: string;
+ dependencyNames: string[];
+}) =>
+ dependencyNames.some(
(dependencyName) =>
importPath === dependencyName ||
importPath.startsWith(`${dependencyName}/`),
);
-const rejectOptionalPeerDependenciesPlugin: Plugin = {
+const createOptionalPeerDependenciesPlugin = (
+ allowedOptionalPeers: string[],
+): Plugin => ({
name: 'reject-optional-peer-dependencies',
setup: (build) => {
build.onResolve({ filter: BARE_IMPORT_PATH_PATTERN }, ({ path }) =>
- isOptionalPeerDependencyImportPath(path)
+ matchesDependencyImportPath({
+ importPath: path,
+ dependencyNames: OPTIONAL_PEER_DEPENDENCY_NAMES,
+ }) &&
+ !matchesDependencyImportPath({
+ importPath: path,
+ dependencyNames: allowedOptionalPeers,
+ })
? { errors: [{ text: `Unexpected optional peer dependency: ${path}` }] }
: undefined,
);
},
-};
+});
-const resolveDeclarationFilePath = (
- importerFilePath: string,
- importPath: string,
-) => {
+const resolveDeclarationFilePath = ({
+ importerFilePath,
+ importPath,
+}: {
+ importerFilePath: string;
+ importPath: string;
+}) => {
const declarationFilePath = DECLARATION_FILE_SUFFIXES.map((suffix) =>
path.resolve(path.dirname(importerFilePath), `${importPath}${suffix}`),
).find((candidateFilePath) => fs.existsSync(candidateFilePath));
@@ -61,10 +82,13 @@ const resolveDeclarationFilePath = (
return declarationFilePath;
};
-const collectBareDeclarationImports = (
- declarationFilePath: string,
- visitedDeclarationFilePaths: Set<string>,
-): DeclarationImport[] => {
+const collectBareDeclarationImports = ({
+ declarationFilePath,
+ visitedDeclarationFilePaths,
+}: {
+ declarationFilePath: string;
+ visitedDeclarationFilePaths: Set<string>;
+}): DeclarationImport[] => {
if (visitedDeclarationFilePaths.has(declarationFilePath)) {
return [];
}
@@ -79,42 +103,62 @@ const collectBareDeclarationImports = (
({ fileName: importPath }) =>
BARE_IMPORT_PATH_PATTERN.test(importPath)
? [{ declarationFilePath, importPath }]
- : collectBareDeclarationImports(
- resolveDeclarationFilePath(declarationFilePath, importPath),
+ : collectBareDeclarationImports({
+ declarationFilePath: resolveDeclarationFilePath({
+ importerFilePath: declarationFilePath,
+ importPath,
+ }),
visitedDeclarationFilePaths,
- ),
+ }),
);
};
-for (const entryPath of [ROOT_ENTRY_POINT.import, ROOT_ENTRY_POINT.require]) {
- await build({
- entryPoints: [path.resolve(PACKAGE_PATH, entryPath)],
- bundle: true,
- packages: 'external',
- write: false,
- logLevel: 'error',
- plugins: [rejectOptionalPeerDependenciesPlugin],
- });
-}
+for (const [entryName, entryPoint] of Object.entries(packageJson.exports)) {
+ if (isString(entryPoint)) {
+ continue;
+ }
-const optionalPeerDependencyDeclarationImports = collectBareDeclarationImports(
- path.resolve(PACKAGE_PATH, ROOT_ENTRY_POINT.types),
- new Set(),
-).filter(({ importPath }) => isOptionalPeerDependencyImportPath(importPath));
-
-if (isNonEmptyArray(optionalPeerDependencyDeclarationImports)) {
- for (const {
- declarationFilePath,
- importPath,
- } of optionalPeerDependencyDeclarationImports) {
- process.stderr.write(
- `Unexpected optional peer dependency: ${importPath} in ${path.relative(PACKAGE_PATH, declarationFilePath)}\n`,
- );
+ const allowedOptionalPeers =
+ ALLOWED_OPTIONAL_PEERS_BY_ENTRY_POINT[entryName] ?? [];
+
+ for (const entryPath of [entryPoint.import, entryPoint.require]) {
+ await build({
+ entryPoints: [path.resolve(PACKAGE_PATH, entryPath)],
+ bundle: true,
+ packages: 'external',
+ write: false,
+ logLevel: 'error',
+ plugins: [createOptionalPeerDependenciesPlugin(allowedOptionalPeers)],
+ });
}
- process.exit(1);
+ const unexpectedDeclarationImports = collectBareDeclarationImports({
+ declarationFilePath: path.resolve(PACKAGE_PATH, entryPoint.types),
+ visitedDeclarationFilePaths: new Set(),
+ }).filter(
+ ({ importPath }) =>
+ matchesDependencyImportPath({
+ importPath,
+ dependencyNames: OPTIONAL_PEER_DEPENDENCY_NAMES,
+ }) &&
+ !matchesDependencyImportPath({
+ importPath,
+ dependencyNames: allowedOptionalPeers,
+ }),
+ );
+
+ if (isNonEmptyArray(unexpectedDeclarationImports)) {
+ throw new Error(
+ unexpectedDeclarationImports
+ .map(
+ ({ declarationFilePath, importPath }) =>
+ `Unexpected optional peer dependency: ${importPath} in ${entryName}: ${path.relative(PACKAGE_PATH, declarationFilePath)}`,
+ )
+ .join('\n'),
+ );
+ }
}
process.stdout.write(
- 'The root entry point builds without optional peer dependencies.\n',
+ 'All entry points build with only their declared optional peer dependencies.\n',
);
diff --git a/packages/twenty-ui/scripts/generateBarrels.ts b/packages/twenty-ui/scripts/generateBarrels.ts
index 42ade769f96..9d78b8ab411 100644
--- a/packages/twenty-ui/scripts/generateBarrels.ts
+++ b/packages/twenty-ui/scripts/generateBarrels.ts
@@ -278,6 +278,7 @@ const computePackageJsonFilesAndExportsConfig = (
files: [
'dist',
'LICENSE',
+ 'CHANGELOG.md',
'!dist/individual',
'!dist/individual/**',
'!dist/**/*.map',
diff --git a/packages/twenty-ui/src/components/code-editor/CodeEditorHeader/__stories__/CodeEditorHeader.stories.tsx b/packages/twenty-ui/src/components/code-editor/CodeEditorHeader/__stories__/CodeEditorHeader.stories.tsx
index 7ad083c2afd..07f45e04638 100644
--- a/packages/twenty-ui/src/components/code-editor/CodeEditorHeader/__stories__/CodeEditorHeader.stories.tsx
+++ b/packages/twenty-ui/src/components/code-editor/CodeEditorHeader/__stories__/CodeEditorHeader.stories.tsx
@@ -1,9 +1,9 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, within } from 'storybook/test';
+import { LightIconButton } from '@ui/components/input/LightIconButton/LightIconButton';
import { IconCopy } from '@ui/icon/components/TablerIcons';
import { Button } from '@ui/primitives/input/Button/Button';
-import { LightIconButton } from '@ui/components/LightIconButton/LightIconButton';
import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
import { CodeEditorHeader } from '../CodeEditorHeader';
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarGroup/AvatarGroup.module.scss b/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/AvatarGroup/AvatarGroup.module.scss
rename to packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarGroup/AvatarGroup.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/AvatarGroup/AvatarGroup.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarGroup/AvatarGroup.tsx b/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.tsx
similarity index 80%
rename from packages/twenty-ui/src/primitives/data-display/AvatarGroup/AvatarGroup.tsx
rename to packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.tsx
index 4212faa99df..221db92c9c8 100644
--- a/packages/twenty-ui/src/primitives/data-display/AvatarGroup/AvatarGroup.tsx
+++ b/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.tsx
@@ -1,17 +1,9 @@
import { clsx } from 'clsx';
-import { type CSSProperties, type ReactNode } from 'react';
+import { type CSSProperties } from 'react';
+import { type AvatarGroupProps } from './types/AvatarGroupProps';
import styles from './AvatarGroup.module.scss';
-export type AvatarGroupProps = {
- avatars: ReactNode[];
- className?: string;
- maxVisible?: number;
- overflowAvatar?: ReactNode;
- overlap?: 'left' | 'right';
- overlapOffset?: string;
-};
-
const MAX_AVATARS_NB = 4;
export const AvatarGroup = ({
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx b/packages/twenty-ui/src/components/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
similarity index 91%
rename from packages/twenty-ui/src/primitives/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
rename to packages/twenty-ui/src/components/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
index f054c08e052..391396421be 100644
--- a/packages/twenty-ui/src/primitives/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
+++ b/packages/twenty-ui/src/components/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
@@ -2,8 +2,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
import { type AvatarProps } from '@ui/primitives/data-display/Avatar/types/AvatarProps';
-import { type AvatarSize } from '@ui/primitives/data-display/Avatar/types/AvatarSize';
import { type AvatarShape } from '@ui/primitives/data-display/Avatar/types/AvatarShape';
+import { type AvatarSize } from '@ui/primitives/data-display/Avatar/types/AvatarSize';
import {
A11Y_DEFER_COLOR_CONTRAST,
AVATAR_URL_MOCK,
@@ -11,10 +11,8 @@ import {
ComponentDecorator,
} from '@ui/testing';
-import {
- AvatarGroup,
- type AvatarGroupProps,
-} from '@ui/primitives/data-display/AvatarGroup/AvatarGroup';
+import { AvatarGroup } from '@ui/components/data-display/AvatarGroup/AvatarGroup';
+import { type AvatarGroupProps } from '@ui/components/data-display/AvatarGroup/types/AvatarGroupProps';
const makeAvatar = (userName: string, props: Partial<AvatarProps> = {}) => (
<Avatar name={userName} colorSeed={userName} {...props} />
diff --git a/packages/twenty-ui/src/components/data-display/AvatarGroup/types/AvatarGroupProps.ts b/packages/twenty-ui/src/components/data-display/AvatarGroup/types/AvatarGroupProps.ts
new file mode 100644
index 00000000000..085f425e177
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/AvatarGroup/types/AvatarGroupProps.ts
@@ -0,0 +1,10 @@
+import { type ReactNode } from 'react';
+
+export type AvatarGroupProps = {
+ avatars: ReactNode[];
+ className?: string;
+ maxVisible?: number;
+ overflowAvatar?: ReactNode;
+ overlap?: 'left' | 'right';
+ overlapOffset?: string;
+};
diff --git a/packages/twenty-ui/src/primitives/data-display/CommandBlock/CommandBlock.module.scss b/packages/twenty-ui/src/components/data-display/CommandBlock/CommandBlock.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/CommandBlock/CommandBlock.module.scss
rename to packages/twenty-ui/src/components/data-display/CommandBlock/CommandBlock.module.scss
diff --git a/packages/twenty-ui/src/primitives/data-display/CommandBlock/CommandBlock.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/CommandBlock/CommandBlock.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/CommandBlock/CommandBlock.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/CommandBlock/CommandBlock.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/data-display/CommandBlock/CommandBlock.tsx b/packages/twenty-ui/src/components/data-display/CommandBlock/CommandBlock.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/CommandBlock/CommandBlock.tsx
rename to packages/twenty-ui/src/components/data-display/CommandBlock/CommandBlock.tsx
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/JsonTree.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/JsonTree.tsx
new file mode 100644
index 00000000000..51726570a3e
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/JsonTree.tsx
@@ -0,0 +1,31 @@
+import { IconBrackets } from '@ui/icon/components/TablerIcons';
+import { isDefined } from '@ui/utilities/utils/isDefined';
+import { JsonList } from './internal/JsonList';
+import { JsonNestedNode } from './internal/JsonNestedNode';
+import { JsonNode } from './internal/JsonNode';
+import { JsonTreeContextProvider } from './internal/JsonTreeContextProvider';
+import { isTwoFirstDepths } from './internal/utils/isTwoFirstDepths';
+import { type JsonTreeProps } from './types/JsonTreeProps';
+
+export const JsonTree = ({
+ value,
+ entries,
+ shouldExpandNodeInitially = isTwoFirstDepths,
+ ...context
+}: JsonTreeProps) => (
+ <JsonTreeContextProvider value={{ ...context, shouldExpandNodeInitially }}>
+ <JsonList depth={0}>
+ {isDefined(entries) ? (
+ <JsonNestedNode
+ elements={entries}
+ Icon={IconBrackets}
+ depth={0}
+ keyPath=""
+ emptyElementsText={context.emptyObjectLabel}
+ />
+ ) : (
+ <JsonNode value={value ?? null} depth={0} keyPath="" />
+ )}
+ </JsonList>
+ </JsonTreeContextProvider>
+);
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/__stories__/JsonTree.stories.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/__stories__/JsonTree.stories.tsx
similarity index 97%
rename from packages/twenty-ui/src/primitives/json-visualizer/__stories__/JsonTree.stories.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/__stories__/JsonTree.stories.tsx
index 0c06cc4ef49..1f0167d00ba 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/__stories__/JsonTree.stories.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/__stories__/JsonTree.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { JsonTree } from '@ui/primitives/json-visualizer/components/JsonTree';
-import { isTwoFirstDepths } from '@ui/primitives/json-visualizer/utils/isTwoFirstDepths';
+import { JsonTree } from '@ui/components/data-display/JsonTree/JsonTree';
+import { isTwoFirstDepths } from '@ui/components/data-display/JsonTree/internal/utils/isTwoFirstDepths';
import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing';
import {
expect,
@@ -637,3 +637,14 @@ export const CopyJsonNodeValue: Story = {
});
},
};
+
+export const GroupedRoots: Story = {
+ parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
+ args: {
+ entries: [
+ { id: 'first-step', label: 'Find company', value: { name: 'Acme' } },
+ { id: 'second-step', label: 'Find company', value: { name: 'Example' } },
+ ],
+ onNodeValueClick: fn(),
+ },
+};
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/__tests__/JsonTree.test.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/__tests__/JsonTree.test.tsx
new file mode 100644
index 00000000000..04b0f63b5bb
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/__tests__/JsonTree.test.tsx
@@ -0,0 +1,67 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ThemeProvider } from '@ui/theme-constants';
+
+import { JsonTree } from '../JsonTree';
+
+const LABELS = {
+ emptyArrayLabel: 'Empty array',
+ emptyObjectLabel: 'Empty object',
+ emptyStringLabel: 'Empty string',
+ arrowButtonCollapsedLabel: 'Expand',
+ arrowButtonExpandedLabel: 'Collapse',
+};
+
+it('uses entry IDs for highlighting even when display labels are identical', () => {
+ const getNodeHighlighting = vi.fn();
+
+ render(
+ <ThemeProvider colorScheme="light">
+ <JsonTree
+ {...LABELS}
+ entries={[
+ { id: 'first-step', label: 'Find record', value: { id: 'first' } },
+ { id: 'second-step', label: 'Find record', value: { id: 'second' } },
+ ]}
+ getNodeHighlighting={getNodeHighlighting}
+ />
+ </ThemeProvider>,
+ );
+
+ expect(screen.getAllByText('Find record')).toHaveLength(2);
+ expect(getNodeHighlighting).toHaveBeenCalledWith('first-step.id');
+ expect(getNodeHighlighting).toHaveBeenCalledWith('second-step.id');
+});
+
+it('expands grouped roots and copies values through the public interface', async () => {
+ const user = userEvent.setup();
+ const onNodeValueClick = vi.fn();
+
+ render(
+ <ThemeProvider colorScheme="light">
+ <JsonTree
+ {...LABELS}
+ entries={[{ id: 'step', label: 'Result', value: { name: 'Ada' } }]}
+ shouldExpandNodeInitially={() => false}
+ onNodeValueClick={onNodeValueClick}
+ />
+ </ThemeProvider>,
+ );
+
+ expect(screen.queryByText('Ada')).not.toBeInTheDocument();
+ await user.click(screen.getByRole('button', { name: 'Expand' }));
+ await user.click(await screen.findByRole('button', { name: 'Ada' }));
+ expect(onNodeValueClick).toHaveBeenCalledWith('Ada');
+});
+
+it('renders localized empty values in a single JSON root', () => {
+ render(
+ <ThemeProvider colorScheme="light">
+ <JsonTree {...LABELS} value={{ text: '', list: [], object: {} }} />
+ </ThemeProvider>,
+ );
+
+ expect(screen.getByText('Empty string')).toBeInTheDocument();
+ expect(screen.getByText('Empty array')).toBeInTheDocument();
+ expect(screen.getByText('Empty object')).toBeInTheDocument();
+});
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonArrayNode.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrayNode.tsx
similarity index 70%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonArrayNode.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrayNode.tsx
index afa29962347..c6da1de3f55 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonArrayNode.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrayNode.tsx
@@ -1,7 +1,7 @@
+import { JsonNestedNode } from '@ui/components/data-display/JsonTree/internal/JsonNestedNode';
+import { useJsonTreeContextOrThrow } from '@ui/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow';
+import { type JsonNodeHighlighting } from '@ui/components/data-display/JsonTree/types/JsonNodeHighlighting';
import { IconBrackets } from '@ui/icon';
-import { JsonNestedNode } from '@ui/primitives/json-visualizer/components/JsonNestedNode';
-import { useJsonTreeContextOrThrow } from '@ui/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow';
-import { type JsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/JsonNodeHighlighting';
import { type JsonArray } from 'type-fest';
export const JsonArrayNode = ({
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonArrow.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonArrow.module.scss
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonArrow.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonArrow.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonArrow.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.tsx
similarity index 83%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonArrow.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.tsx
index 45656acf65a..eac6d6d904f 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonArrow.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.tsx
@@ -1,6 +1,6 @@
-import { VisibilityHidden } from '@ui/primitives/accessibility';
+import { useJsonTreeContextOrThrow } from '@ui/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow';
import { IconChevronDown } from '@ui/icon';
-import { useJsonTreeContextOrThrow } from '@ui/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow';
+import { VisibilityHidden } from '@ui/primitives/accessibility/components/VisibilityHidden';
import { themeCssVariables, useTheme } from '@ui/theme-constants';
import { clsx } from 'clsx';
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonList.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonList.module.scss
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonList.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonList.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonList.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonList.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.tsx
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonListItem.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonListItem.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonListItem.module.scss
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonListItem.module.scss
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonListItem.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonListItem.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonListItem.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonListItem.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonListItem.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonListItem.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonListItem.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonListItem.tsx
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonNestedNode.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonNestedNode.module.scss
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonNestedNode.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonNestedNode.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonNestedNode.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.tsx
similarity index 83%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonNestedNode.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.tsx
index 6fc58b9710b..195d244bd54 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonNestedNode.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.tsx
@@ -1,17 +1,17 @@
import { Collapsible } from '@base-ui/react/collapsible';
import { isNonEmptyString } from '@sniptt/guards';
+import { isDefined } from '@ui/utilities/utils/isDefined';
import { clsx } from 'clsx';
import { useState } from 'react';
-import { isDefined } from '@ui/utilities/utils/isDefined';
import { type JsonValue } from 'type-fest';
+import { JsonArrow } from '@ui/components/data-display/JsonTree/internal/JsonArrow';
+import { JsonNode } from '@ui/components/data-display/JsonTree/internal/JsonNode';
+import { JsonNodeLabel } from '@ui/components/data-display/JsonTree/internal/JsonNodeLabel';
+import { JsonValueNode } from '@ui/components/data-display/JsonTree/internal/JsonValueNode';
+import { useJsonTreeContextOrThrow } from '@ui/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow';
+import { type JsonNodeHighlighting } from '@ui/components/data-display/JsonTree/types/JsonNodeHighlighting';
import { type IconComponent } from '@ui/icon';
-import { JsonArrow } from '@ui/primitives/json-visualizer/components/internal/JsonArrow';
-import { JsonNodeLabel } from '@ui/primitives/json-visualizer/components/internal/JsonNodeLabel';
-import { JsonNode } from '@ui/primitives/json-visualizer/components/JsonNode';
-import { JsonValueNode } from '@ui/primitives/json-visualizer/components/JsonValueNode';
-import { useJsonTreeContextOrThrow } from '@ui/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow';
-import { type JsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/JsonNodeHighlighting';
import styles from './JsonNestedNode.module.scss';
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonNode.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNode.tsx
similarity index 78%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonNode.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNode.tsx
index 6e36b923e73..efa838ceb92 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonNode.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNode.tsx
@@ -4,17 +4,17 @@ import {
isNumber,
isString,
} from '@sniptt/guards';
+import { JsonArrayNode } from '@ui/components/data-display/JsonTree/internal/JsonArrayNode';
+import { JsonObjectNode } from '@ui/components/data-display/JsonTree/internal/JsonObjectNode';
+import { JsonValueNode } from '@ui/components/data-display/JsonTree/internal/JsonValueNode';
+import { useJsonTreeContextOrThrow } from '@ui/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow';
+import { isArray } from '@ui/components/data-display/JsonTree/internal/utils/isArray';
import {
IconCheckbox,
IconCircleOff,
IconNumber9,
IconTypography,
} from '@ui/icon';
-import { JsonArrayNode } from '@ui/primitives/json-visualizer/components/JsonArrayNode';
-import { JsonObjectNode } from '@ui/primitives/json-visualizer/components/JsonObjectNode';
-import { JsonValueNode } from '@ui/primitives/json-visualizer/components/JsonValueNode';
-import { useJsonTreeContextOrThrow } from '@ui/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow';
-import { isArray } from '@ui/primitives/json-visualizer/utils/isArray';
import { isDefined } from '@ui/utilities/utils/isDefined';
import { type JsonValue } from 'type-fest';
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeLabel.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeLabel.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeLabel.module.scss
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeLabel.module.scss
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeLabel.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeLabel.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeLabel.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeLabel.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeLabel.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeLabel.tsx
similarity index 88%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeLabel.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeLabel.tsx
index d071dbe74d6..817a2cc889f 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeLabel.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeLabel.tsx
@@ -1,5 +1,5 @@
+import { type JsonNodeHighlighting } from '@ui/components/data-display/JsonTree/types/JsonNodeHighlighting';
import { type IconComponent } from '@ui/icon';
-import { type JsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/JsonNodeHighlighting';
import { useTheme } from '@ui/theme-constants';
import { clsx } from 'clsx';
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeValue.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeValue.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeValue.module.scss
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeValue.module.scss
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeValue.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeValue.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeValue.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeValue.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeValue.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeValue.tsx
similarity index 82%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeValue.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeValue.tsx
index fa6ce73c2e4..cd890834931 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/internal/JsonNodeValue.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNodeValue.tsx
@@ -1,8 +1,8 @@
+import { useJsonTreeContextOrThrow } from '@ui/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow';
+import { type JsonNodeHighlighting } from '@ui/components/data-display/JsonTree/types/JsonNodeHighlighting';
import { handleClickableElementKeyDown } from '@ui/primitives/accessibility/utils/handleClickableElementKeyDown';
-import { useJsonTreeContextOrThrow } from '@ui/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow';
-import { type JsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/JsonNodeHighlighting';
-import { clsx } from 'clsx';
import { isDefined } from '@ui/utilities/utils/isDefined';
+import { clsx } from 'clsx';
import styles from './JsonNodeValue.module.scss';
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonObjectNode.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonObjectNode.tsx
similarity index 69%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonObjectNode.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonObjectNode.tsx
index 748f39de5a6..a2b82c0f955 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonObjectNode.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonObjectNode.tsx
@@ -1,7 +1,7 @@
+import { JsonNestedNode } from '@ui/components/data-display/JsonTree/internal/JsonNestedNode';
+import { useJsonTreeContextOrThrow } from '@ui/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow';
+import { type JsonNodeHighlighting } from '@ui/components/data-display/JsonTree/types/JsonNodeHighlighting';
import { IconCube } from '@ui/icon';
-import { JsonNestedNode } from '@ui/primitives/json-visualizer/components/JsonNestedNode';
-import { useJsonTreeContextOrThrow } from '@ui/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow';
-import { type JsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/JsonNodeHighlighting';
import { type JsonObject } from 'type-fest';
export const JsonObjectNode = ({
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonTreeContextProvider.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonTreeContextProvider.tsx
similarity index 52%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonTreeContextProvider.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonTreeContextProvider.tsx
index 21fb9f25c38..20f53370a76 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonTreeContextProvider.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonTreeContextProvider.tsx
@@ -1,7 +1,5 @@
-import {
- JsonTreeContext,
- type JsonTreeContextType,
-} from '@ui/primitives/json-visualizer/contexts/JsonTreeContext';
+import { JsonTreeContext } from '@ui/components/data-display/JsonTree/internal/contexts/JsonTreeContext';
+import { type JsonTreeContextType } from '@ui/components/data-display/JsonTree/internal/types/JsonTreeContextType';
export const JsonTreeContextProvider = ({
value,
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonValueNode.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonValueNode.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonValueNode.module.scss
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonValueNode.module.scss
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonValueNode.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonValueNode.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonValueNode.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonValueNode.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonValueNode.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonValueNode.tsx
similarity index 71%
rename from packages/twenty-ui/src/primitives/json-visualizer/components/JsonValueNode.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonValueNode.tsx
index 067a1d467f7..58209c4a1ef 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonValueNode.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonValueNode.tsx
@@ -1,7 +1,7 @@
+import { JsonNodeLabel } from '@ui/components/data-display/JsonTree/internal/JsonNodeLabel';
+import { JsonNodeValue } from '@ui/components/data-display/JsonTree/internal/JsonNodeValue';
+import { type JsonNodeHighlighting } from '@ui/components/data-display/JsonTree/types/JsonNodeHighlighting';
import { type IconComponent } from '@ui/icon';
-import { JsonNodeLabel } from '@ui/primitives/json-visualizer/components/internal/JsonNodeLabel';
-import { JsonNodeValue } from '@ui/primitives/json-visualizer/components/internal/JsonNodeValue';
-import { type JsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/JsonNodeHighlighting';
import styles from './JsonValueNode.module.scss';
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/internal/contexts/JsonTreeContext.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/contexts/JsonTreeContext.tsx
new file mode 100644
index 00000000000..acdd225fc6c
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/contexts/JsonTreeContext.tsx
@@ -0,0 +1,6 @@
+import { createContext } from 'react';
+import { type JsonTreeContextType } from '../types/JsonTreeContextType';
+
+export const JsonTreeContext = createContext<JsonTreeContextType | undefined>(
+ undefined,
+);
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow.tsx
similarity index 76%
rename from packages/twenty-ui/src/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow.tsx
index 16ce99a5fa6..1e865a05201 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/hooks/useJsonTreeContextOrThrow.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/hooks/useJsonTreeContextOrThrow.tsx
@@ -1,6 +1,6 @@
-import { JsonTreeContext } from '@ui/primitives/json-visualizer/contexts/JsonTreeContext';
-import { useContext } from 'react';
+import { JsonTreeContext } from '@ui/components/data-display/JsonTree/internal/contexts/JsonTreeContext';
import { isDefined } from '@ui/utilities/utils/isDefined';
+import { useContext } from 'react';
export const useJsonTreeContextOrThrow = () => {
const value = useContext(JsonTreeContext);
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/contexts/JsonTreeContext.tsx b/packages/twenty-ui/src/components/data-display/JsonTree/internal/types/JsonTreeContextType.ts
similarity index 54%
rename from packages/twenty-ui/src/primitives/json-visualizer/contexts/JsonTreeContext.tsx
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/types/JsonTreeContextType.ts
index 577fb1fed01..fdc17b9d6f4 100644
--- a/packages/twenty-ui/src/primitives/json-visualizer/contexts/JsonTreeContext.tsx
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/types/JsonTreeContextType.ts
@@ -1,7 +1,5 @@
-import { type GetJsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/GetJsonNodeHighlighting';
-import { createContext } from 'react';
-
-export type ShouldExpandNodeInitiallyProps = { keyPath: string; depth: number };
+import { type GetJsonNodeHighlighting } from '../../types/GetJsonNodeHighlighting';
+import { type ShouldExpandNodeInitiallyProps } from '../../types/ShouldExpandNodeInitiallyProps';
export type JsonTreeContextType = {
getNodeHighlighting?: GetJsonNodeHighlighting;
@@ -15,7 +13,3 @@ export type JsonTreeContextType = {
arrowButtonExpandedLabel: string;
onNodeValueClick?: (valueAsString: string) => void;
};
-
-export const JsonTreeContext = createContext<JsonTreeContextType | undefined>(
- undefined,
-);
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/utils/isArray.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/utils/isArray.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/utils/isArray.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/internal/utils/isArray.ts
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/internal/utils/isTwoFirstDepths.ts b/packages/twenty-ui/src/components/data-display/JsonTree/internal/utils/isTwoFirstDepths.ts
new file mode 100644
index 00000000000..c20883480ba
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/utils/isTwoFirstDepths.ts
@@ -0,0 +1,4 @@
+import { type ShouldExpandNodeInitiallyProps } from '@ui/components/data-display/JsonTree/types/ShouldExpandNodeInitiallyProps';
+
+export const isTwoFirstDepths = ({ depth }: ShouldExpandNodeInitiallyProps) =>
+ depth <= 1;
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/types/GetJsonNodeHighlighting.ts b/packages/twenty-ui/src/components/data-display/JsonTree/types/GetJsonNodeHighlighting.ts
new file mode 100644
index 00000000000..74cf0e4a98f
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/types/GetJsonNodeHighlighting.ts
@@ -0,0 +1,5 @@
+import { type JsonNodeHighlighting } from '@ui/components/data-display/JsonTree/types/JsonNodeHighlighting';
+
+export type GetJsonNodeHighlighting = (
+ keyPath: string,
+) => JsonNodeHighlighting | undefined;
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/types/JsonNodeHighlighting.ts b/packages/twenty-ui/src/components/data-display/JsonTree/types/JsonNodeHighlighting.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/json-visualizer/types/JsonNodeHighlighting.ts
rename to packages/twenty-ui/src/components/data-display/JsonTree/types/JsonNodeHighlighting.ts
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/types/JsonTreeEntry.ts b/packages/twenty-ui/src/components/data-display/JsonTree/types/JsonTreeEntry.ts
new file mode 100644
index 00000000000..9628652da64
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/types/JsonTreeEntry.ts
@@ -0,0 +1,7 @@
+import { type JsonValue } from 'type-fest';
+
+export type JsonTreeEntry = {
+ id: string | number;
+ label: string;
+ value: JsonValue;
+};
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/types/JsonTreeProps.ts b/packages/twenty-ui/src/components/data-display/JsonTree/types/JsonTreeProps.ts
new file mode 100644
index 00000000000..26ed2b5abcc
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/types/JsonTreeProps.ts
@@ -0,0 +1,13 @@
+import { type JsonValue } from 'type-fest';
+import { type JsonTreeContextType } from '../internal/types/JsonTreeContextType';
+import { type JsonTreeEntry } from './JsonTreeEntry';
+
+export type JsonTreeProps = Omit<
+ JsonTreeContextType,
+ 'shouldExpandNodeInitially'
+> & {
+ shouldExpandNodeInitially?: JsonTreeContextType['shouldExpandNodeInitially'];
+} & (
+ | { value: JsonValue; entries?: never }
+ | { value?: never; entries: JsonTreeEntry[] }
+ );
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/types/ShouldExpandNodeInitiallyProps.ts b/packages/twenty-ui/src/components/data-display/JsonTree/types/ShouldExpandNodeInitiallyProps.ts
new file mode 100644
index 00000000000..dc23a07fe27
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/types/ShouldExpandNodeInitiallyProps.ts
@@ -0,0 +1 @@
+export type ShouldExpandNodeInitiallyProps = { keyPath: string; depth: number };
diff --git a/packages/twenty-ui/src/primitives/data-display/NotificationCounter/NotificationCounter.module.scss b/packages/twenty-ui/src/components/data-display/NotificationCounter/NotificationCounter.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/NotificationCounter/NotificationCounter.module.scss
rename to packages/twenty-ui/src/components/data-display/NotificationCounter/NotificationCounter.module.scss
diff --git a/packages/twenty-ui/src/primitives/data-display/NotificationCounter/NotificationCounter.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/NotificationCounter/NotificationCounter.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/NotificationCounter/NotificationCounter.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/NotificationCounter/NotificationCounter.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/data-display/NotificationCounter/NotificationCounter.tsx b/packages/twenty-ui/src/components/data-display/NotificationCounter/NotificationCounter.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/NotificationCounter/NotificationCounter.tsx
rename to packages/twenty-ui/src/components/data-display/NotificationCounter/NotificationCounter.tsx
diff --git a/packages/twenty-ui/src/components/data-display/NotificationCounter/__stories__/NotificationCounter.stories.tsx b/packages/twenty-ui/src/components/data-display/NotificationCounter/__stories__/NotificationCounter.stories.tsx
new file mode 100644
index 00000000000..dc06501f536
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/NotificationCounter/__stories__/NotificationCounter.stories.tsx
@@ -0,0 +1,47 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { IconInfoCircle } from '@ui/icon';
+import { Tabs } from '@ui/primitives/navigation/Tabs/Tabs';
+import { ComponentDecorator } from '@ui/testing';
+
+import { NotificationCounter } from '../NotificationCounter';
+
+const meta = {
+ title: 'UI/Navigation/Tabs',
+ component: NotificationCounter,
+ tags: ['!autodocs'],
+ args: { count: 3, variant: 'secondary' },
+} satisfies Meta<typeof NotificationCounter>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const WithIconAndBadge: Story = {
+ decorators: [ComponentDecorator],
+ parameters: { container: { width: 360 } },
+ render: (args) => (
+ <Tabs.Root defaultValue="overview">
+ <Tabs.List aria-label="Record details">
+ <Tabs.Tab
+ value="overview"
+ startIcon={<IconInfoCircle />}
+ badge={<NotificationCounter {...args} />}
+ >
+ Overview
+ </Tabs.Tab>
+ <Tabs.Tab value="activity">Activity</Tabs.Tab>
+ <Tabs.Tab value="settings">Settings</Tabs.Tab>
+ </Tabs.List>
+ <Tabs.Panel value="overview" style={{ padding: 'var(--t-spacing-4)' }}>
+ Record overview
+ </Tabs.Panel>
+ <Tabs.Panel value="activity" style={{ padding: 'var(--t-spacing-4)' }}>
+ Recent activity
+ </Tabs.Panel>
+ <Tabs.Panel value="settings" style={{ padding: 'var(--t-spacing-4)' }}>
+ Record settings
+ </Tabs.Panel>
+ </Tabs.Root>
+ ),
+};
diff --git a/packages/twenty-ui/src/primitives/data-display/TintedIconTile/TintedIconTile.tsx b/packages/twenty-ui/src/components/data-display/TintedIconTile/TintedIconTile.tsx
similarity index 70%
rename from packages/twenty-ui/src/primitives/data-display/TintedIconTile/TintedIconTile.tsx
rename to packages/twenty-ui/src/components/data-display/TintedIconTile/TintedIconTile.tsx
index 66bbc3a6d83..0444caf3e3e 100644
--- a/packages/twenty-ui/src/primitives/data-display/TintedIconTile/TintedIconTile.tsx
+++ b/packages/twenty-ui/src/components/data-display/TintedIconTile/TintedIconTile.tsx
@@ -1,16 +1,9 @@
-import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { StyledTintedIconTileContainer } from '@ui/primitives/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer';
-import { getIconTileColorShades } from '@ui/primitives/data-display/TintedIconTile/utils/getIconTileColorShades';
+import { StyledTintedIconTileContainer } from '@ui/components/data-display/TintedIconTile/internal/StyledTintedIconTileContainer/StyledTintedIconTileContainer';
+import { getIconTileColorShades } from '@ui/components/data-display/TintedIconTile/utils/getIconTileColorShades';
import { DEFAULT_THEME_COLOR_FALLBACK } from '@ui/theme';
import { useTheme } from '@ui/theme-constants';
import { isDefined } from '@ui/utilities/utils/isDefined';
-
-export type TintedIconTileProps = {
- Icon: IconComponent;
- color?: string | null;
- size?: number;
- stroke?: number;
-};
+import { type TintedIconTileProps } from './types/TintedIconTileProps';
export const TintedIconTile = ({
Icon,
diff --git a/packages/twenty-ui/src/primitives/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss b/packages/twenty-ui/src/components/data-display/TintedIconTile/internal/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss
rename to packages/twenty-ui/src/components/data-display/TintedIconTile/internal/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss
diff --git a/packages/twenty-ui/src/primitives/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss.d.ts b/packages/twenty-ui/src/components/data-display/TintedIconTile/internal/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss.d.ts
rename to packages/twenty-ui/src/components/data-display/TintedIconTile/internal/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.tsx b/packages/twenty-ui/src/components/data-display/TintedIconTile/internal/StyledTintedIconTileContainer/StyledTintedIconTileContainer.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.tsx
rename to packages/twenty-ui/src/components/data-display/TintedIconTile/internal/StyledTintedIconTileContainer/StyledTintedIconTileContainer.tsx
diff --git a/packages/twenty-ui/src/primitives/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant.ts b/packages/twenty-ui/src/components/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant.ts
rename to packages/twenty-ui/src/components/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant.ts
diff --git a/packages/twenty-ui/src/primitives/data-display/TintedIconTile/internal/utils/getColorFromTheme.ts b/packages/twenty-ui/src/components/data-display/TintedIconTile/internal/utils/getColorFromTheme.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/TintedIconTile/internal/utils/getColorFromTheme.ts
rename to packages/twenty-ui/src/components/data-display/TintedIconTile/internal/utils/getColorFromTheme.ts
diff --git a/packages/twenty-ui/src/components/data-display/TintedIconTile/types/TintedIconTileProps.ts b/packages/twenty-ui/src/components/data-display/TintedIconTile/types/TintedIconTileProps.ts
new file mode 100644
index 00000000000..ac5b51b4cae
--- /dev/null
+++ b/packages/twenty-ui/src/components/data-display/TintedIconTile/types/TintedIconTileProps.ts
@@ -0,0 +1,8 @@
+import { type IconComponent } from '@ui/icon/types/IconComponent';
+
+export type TintedIconTileProps = {
+ Icon: IconComponent;
+ color?: string | null;
+ size?: number;
+ stroke?: number;
+};
diff --git a/packages/twenty-ui/src/primitives/data-display/TintedIconTile/utils/getIconTileColorShades.ts b/packages/twenty-ui/src/components/data-display/TintedIconTile/utils/getIconTileColorShades.ts
similarity index 85%
rename from packages/twenty-ui/src/primitives/data-display/TintedIconTile/utils/getIconTileColorShades.ts
rename to packages/twenty-ui/src/components/data-display/TintedIconTile/utils/getIconTileColorShades.ts
index f2344fe928f..248a3f6e055 100644
--- a/packages/twenty-ui/src/primitives/data-display/TintedIconTile/utils/getIconTileColorShades.ts
+++ b/packages/twenty-ui/src/components/data-display/TintedIconTile/utils/getIconTileColorShades.ts
@@ -1,5 +1,5 @@
-import { TINTED_ICON_TILE_COLOR_SHADES } from '@ui/primitives/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant';
-import { getColorFromTheme } from '@ui/primitives/data-display/TintedIconTile/internal/utils/getColorFromTheme';
+import { TINTED_ICON_TILE_COLOR_SHADES } from '@ui/components/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant';
+import { getColorFromTheme } from '@ui/components/data-display/TintedIconTile/internal/utils/getColorFromTheme';
import { parseThemeColor } from '@ui/utilities';
export type IconTileColorShades = {
diff --git a/packages/twenty-ui/src/primitives/feedback/Callout/Callout.module.scss b/packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Callout/Callout.module.scss
rename to packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss
diff --git a/packages/twenty-ui/src/primitives/feedback/Callout/Callout.module.scss.d.ts b/packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Callout/Callout.module.scss.d.ts
rename to packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Callout/Callout.tsx b/packages/twenty-ui/src/components/feedback/Callout/Callout.tsx
similarity index 84%
rename from packages/twenty-ui/src/primitives/feedback/Callout/Callout.tsx
rename to packages/twenty-ui/src/components/feedback/Callout/Callout.tsx
index 779c718cf9c..2a1c4d0d97b 100644
--- a/packages/twenty-ui/src/primitives/feedback/Callout/Callout.tsx
+++ b/packages/twenty-ui/src/components/feedback/Callout/Callout.tsx
@@ -1,21 +1,15 @@
-import { clsx } from 'clsx';
-import { useState } from 'react';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from '@ui/utilities/utils/isDefined';
+import { clsx } from 'clsx';
+import { useState } from 'react';
+import { type CalloutProps } from './types/CalloutProps';
+import { type CalloutVariant } from './types/CalloutVariant';
import { IconHelp, IconX } from '@ui/icon/components/TablerIcons';
-import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { Button } from '@ui/primitives/input';
+import { Button } from '@ui/primitives/input/Button/Button';
import styles from './Callout.module.scss';
-export type CalloutVariant =
- | 'info'
- | 'warning'
- | 'error'
- | 'neutral'
- | 'success';
-
const CALLOUT_CONTAINER_VARIANT_CLASS_NAMES: Record<CalloutVariant, string> = {
info: styles.containerInfo,
warning: styles.containerWarning,
@@ -32,20 +26,6 @@ const CALLOUT_ICON_VARIANT_CLASS_NAMES: Record<CalloutVariant, string> = {
success: styles.iconContainerSuccess,
};
-export type CalloutProps = {
- variant: CalloutVariant;
- title: string;
- description?: string;
- fullWidth?: boolean;
- Icon?: IconComponent;
- action?: {
- label: string;
- onClick: () => void;
- };
- isClosable?: boolean;
- onClose?: () => void;
-};
-
export const Callout = ({
variant,
title,
diff --git a/packages/twenty-ui/src/primitives/feedback/Callout/__stories__/Callout.stories.tsx b/packages/twenty-ui/src/components/feedback/Callout/__stories__/Callout.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/primitives/feedback/Callout/__stories__/Callout.stories.tsx
rename to packages/twenty-ui/src/components/feedback/Callout/__stories__/Callout.stories.tsx
index 0b01b94b4a8..479974a702e 100644
--- a/packages/twenty-ui/src/primitives/feedback/Callout/__stories__/Callout.stories.tsx
+++ b/packages/twenty-ui/src/components/feedback/Callout/__stories__/Callout.stories.tsx
@@ -2,12 +2,12 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
- type CatalogStory,
ComponentDecorator,
+ type CatalogStory,
} from '@ui/testing';
-import { Callout } from '@ui/primitives/feedback';
-import { type CalloutVariant } from '@ui/primitives/feedback/Callout/Callout';
+import { Callout } from '@ui/components/feedback/Callout/Callout';
+import { type CalloutVariant } from '@ui/components/feedback/Callout/types/CalloutVariant';
const meta: Meta<typeof Callout> = {
title: 'UI/Feedback/Callout',
diff --git a/packages/twenty-ui/src/components/feedback/Callout/types/CalloutProps.ts b/packages/twenty-ui/src/components/feedback/Callout/types/CalloutProps.ts
new file mode 100644
index 00000000000..c171abdc64f
--- /dev/null
+++ b/packages/twenty-ui/src/components/feedback/Callout/types/CalloutProps.ts
@@ -0,0 +1,16 @@
+import { type IconComponent } from '@ui/icon/types/IconComponent';
+import { type CalloutVariant } from './CalloutVariant';
+
+export type CalloutProps = {
+ variant: CalloutVariant;
+ title: string;
+ description?: string;
+ fullWidth?: boolean;
+ Icon?: IconComponent;
+ action?: {
+ label: string;
+ onClick: () => void;
+ };
+ isClosable?: boolean;
+ onClose?: () => void;
+};
diff --git a/packages/twenty-ui/src/components/feedback/Callout/types/CalloutVariant.ts b/packages/twenty-ui/src/components/feedback/Callout/types/CalloutVariant.ts
new file mode 100644
index 00000000000..bcbba21611b
--- /dev/null
+++ b/packages/twenty-ui/src/components/feedback/Callout/types/CalloutVariant.ts
@@ -0,0 +1,6 @@
+export type CalloutVariant =
+ | 'info'
+ | 'warning'
+ | 'error'
+ | 'neutral'
+ | 'success';
diff --git a/packages/twenty-ui/src/primitives/feedback/Info/Info.module.scss b/packages/twenty-ui/src/components/feedback/Info/Info.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Info/Info.module.scss
rename to packages/twenty-ui/src/components/feedback/Info/Info.module.scss
diff --git a/packages/twenty-ui/src/primitives/feedback/Info/Info.module.scss.d.ts b/packages/twenty-ui/src/components/feedback/Info/Info.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Info/Info.module.scss.d.ts
rename to packages/twenty-ui/src/components/feedback/Info/Info.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Info/Info.tsx b/packages/twenty-ui/src/components/feedback/Info/Info.tsx
similarity index 73%
rename from packages/twenty-ui/src/primitives/feedback/Info/Info.tsx
rename to packages/twenty-ui/src/components/feedback/Info/Info.tsx
index 5b4ef88e2ec..82c9238ad71 100644
--- a/packages/twenty-ui/src/primitives/feedback/Info/Info.tsx
+++ b/packages/twenty-ui/src/components/feedback/Info/Info.tsx
@@ -1,22 +1,13 @@
-import { clsx } from 'clsx';
import { IconInfoCircle } from '@ui/icon/components/TablerIcons';
import { useTheme } from '@ui/theme-constants';
+import { clsx } from 'clsx';
+import { type InfoAccent } from './types/InfoAccent';
+import { type InfoProps } from './types/InfoProps';
import { Button } from '@ui/primitives/input/Button/Button';
-import React from 'react';
-import { Link } from 'react-router-dom';
import styles from './Info.module.scss';
-export type InfoAccent = 'blue' | 'danger';
-export type InfoProps = {
- accent?: InfoAccent;
- text: string;
- buttonTitle?: string;
- onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
- to?: string;
-};
-
const INFO_ACCENT_CLASS_NAMES: Record<InfoAccent, string> = {
blue: styles.accentBlue,
danger: styles.accentDanger,
@@ -27,7 +18,8 @@ export const Info = ({
text,
buttonTitle,
onClick,
- to,
+ href,
+ render,
}: InfoProps) => {
const theme = useTheme();
@@ -37,11 +29,11 @@ export const Info = ({
<IconInfoCircle size={theme.icon.size.md} />
{text}
</div>
- {buttonTitle && to && (
+ {buttonTitle && href && (
<span className={styles.linkContainer}>
<Button
- href={to}
- render={<Link to={to} />}
+ href={href}
+ render={render}
size="sm"
variant="outline"
color={accent === 'blue' ? 'accent' : 'danger'}
@@ -50,7 +42,7 @@ export const Info = ({
</Button>
</span>
)}
- {buttonTitle && onClick && !to && (
+ {buttonTitle && onClick && !href && (
<Button
onClick={onClick}
size="sm"
diff --git a/packages/twenty-ui/src/primitives/feedback/Info/__stories__/Info.stories.tsx b/packages/twenty-ui/src/components/feedback/Info/__stories__/Info.stories.tsx
similarity index 88%
rename from packages/twenty-ui/src/primitives/feedback/Info/__stories__/Info.stories.tsx
rename to packages/twenty-ui/src/components/feedback/Info/__stories__/Info.stories.tsx
index faee711ef1f..f2a7a62fae3 100644
--- a/packages/twenty-ui/src/primitives/feedback/Info/__stories__/Info.stories.tsx
+++ b/packages/twenty-ui/src/components/feedback/Info/__stories__/Info.stories.tsx
@@ -2,11 +2,12 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
- type CatalogStory,
ComponentDecorator,
+ type CatalogStory,
} from '@ui/testing';
-import { Info, type InfoAccent } from '@ui/primitives/feedback/Info/Info';
+import { Info } from '@ui/components/feedback/Info/Info';
+import { type InfoAccent } from '@ui/components/feedback/Info/types/InfoAccent';
const meta: Meta<typeof Info> = {
title: 'UI/Feedback/Info',
diff --git a/packages/twenty-ui/src/components/feedback/Info/types/InfoAccent.ts b/packages/twenty-ui/src/components/feedback/Info/types/InfoAccent.ts
new file mode 100644
index 00000000000..29a88df7616
--- /dev/null
+++ b/packages/twenty-ui/src/components/feedback/Info/types/InfoAccent.ts
@@ -0,0 +1 @@
+export type InfoAccent = 'blue' | 'danger';
diff --git a/packages/twenty-ui/src/components/feedback/Info/types/InfoProps.ts b/packages/twenty-ui/src/components/feedback/Info/types/InfoProps.ts
new file mode 100644
index 00000000000..f545504ab2f
--- /dev/null
+++ b/packages/twenty-ui/src/components/feedback/Info/types/InfoProps.ts
@@ -0,0 +1,12 @@
+import { type Button } from '@ui/primitives/input/Button/Button';
+import React from 'react';
+import { type InfoAccent } from './InfoAccent';
+
+export type InfoProps = {
+ accent?: InfoAccent;
+ text: string;
+ buttonTitle?: string;
+ onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
+ href?: string;
+ render?: React.ComponentProps<typeof Button>['render'];
+};
diff --git a/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.module.scss b/packages/twenty-ui/src/components/feedback/InlineBanner/InlineBanner.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.module.scss
rename to packages/twenty-ui/src/components/feedback/InlineBanner/InlineBanner.module.scss
diff --git a/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.module.scss.d.ts b/packages/twenty-ui/src/components/feedback/InlineBanner/InlineBanner.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.module.scss.d.ts
rename to packages/twenty-ui/src/components/feedback/InlineBanner/InlineBanner.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.tsx b/packages/twenty-ui/src/components/feedback/InlineBanner/InlineBanner.tsx
similarity index 93%
rename from packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.tsx
rename to packages/twenty-ui/src/components/feedback/InlineBanner/InlineBanner.tsx
index 68349da9116..9724a42d368 100644
--- a/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.tsx
+++ b/packages/twenty-ui/src/components/feedback/InlineBanner/InlineBanner.tsx
@@ -1,14 +1,14 @@
-import { isDefined } from '@ui/utilities/utils/isDefined';
-import { clsx } from 'clsx';
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
-import { useTheme } from '@ui/theme-constants';
-import { Button } from '@ui/primitives/input/Button/Button';
-import { type IconComponent } from '@ui/icon/types/IconComponent';
import { IconInfoCircle } from '@ui/icon/components/TablerIcons';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
import {
Banner,
type BannerColor,
} from '@ui/primitives/feedback/Banner/Banner';
+import { Button } from '@ui/primitives/input/Button/Button';
+import { OverflowingTextWithTooltip } from '@ui/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
+import { useTheme } from '@ui/theme-constants';
+import { isDefined } from '@ui/utilities/utils/isDefined';
+import { clsx } from 'clsx';
import styles from './InlineBanner.module.scss';
diff --git a/packages/twenty-ui/src/primitives/feedback/InlineBanner/__stories__/InlineBanner.stories.tsx b/packages/twenty-ui/src/components/feedback/InlineBanner/__stories__/InlineBanner.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/primitives/feedback/InlineBanner/__stories__/InlineBanner.stories.tsx
rename to packages/twenty-ui/src/components/feedback/InlineBanner/__stories__/InlineBanner.stories.tsx
index 01b0d32f25f..a83c77f922f 100644
--- a/packages/twenty-ui/src/primitives/feedback/InlineBanner/__stories__/InlineBanner.stories.tsx
+++ b/packages/twenty-ui/src/components/feedback/InlineBanner/__stories__/InlineBanner.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
-import { InlineBanner } from '@ui/primitives/feedback/InlineBanner/InlineBanner';
+import { InlineBanner } from '@ui/components/feedback/InlineBanner/InlineBanner';
import { IconExternalLink } from '@ui/icon';
import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/Toast.module.scss b/packages/twenty-ui/src/components/feedback/Toast/Toast.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/Toast.module.scss
rename to packages/twenty-ui/src/components/feedback/Toast/Toast.module.scss
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/Toast.module.scss.d.ts b/packages/twenty-ui/src/components/feedback/Toast/Toast.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/Toast.module.scss.d.ts
rename to packages/twenty-ui/src/components/feedback/Toast/Toast.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/Toast.tsx b/packages/twenty-ui/src/components/feedback/Toast/Toast.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/Toast.tsx
rename to packages/twenty-ui/src/components/feedback/Toast/Toast.tsx
index fd5e47f7075..fd842138662 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toast/Toast.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toast/Toast.tsx
@@ -2,13 +2,13 @@ import { useRender } from '@base-ui/react/use-render';
import { clsx } from 'clsx';
import { type MouseEvent, useState } from 'react';
-import { ProgressBar } from '@ui/primitives/feedback/ProgressBar/ProgressBar';
import {
IconAlertTriangle,
IconInfoCircle,
IconSquareRoundedCheck,
IconX,
} from '@ui/icon';
+import { ProgressBar } from '@ui/primitives/feedback/ProgressBar/ProgressBar';
import { Button } from '@ui/primitives/input/Button/Button';
import { HorizontalSeparator } from '@ui/primitives/layout/HorizontalSeparator/HorizontalSeparator';
import { useTheme } from '@ui/theme-constants';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/ToastProvider.tsx b/packages/twenty-ui/src/components/feedback/Toast/ToastProvider.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/ToastProvider.tsx
rename to packages/twenty-ui/src/components/feedback/Toast/ToastProvider.tsx
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/__stories__/Toast.stories.tsx b/packages/twenty-ui/src/components/feedback/Toast/__stories__/Toast.stories.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/__stories__/Toast.stories.tsx
rename to packages/twenty-ui/src/components/feedback/Toast/__stories__/Toast.stories.tsx
index 7535d283a73..08930c08ec2 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toast/__stories__/Toast.stories.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toast/__stories__/Toast.stories.tsx
@@ -8,8 +8,8 @@ import { ClickToActionLink } from '@ui/primitives/navigation/ClickToActionLink/C
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
- type CatalogStory,
ComponentDecorator,
+ type CatalogStory,
} from '@ui/testing';
import { Toast } from '../Toast';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/__tests__/Toast.test.tsx b/packages/twenty-ui/src/components/feedback/Toast/__tests__/Toast.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/__tests__/Toast.test.tsx
rename to packages/twenty-ui/src/components/feedback/Toast/__tests__/Toast.test.tsx
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/__tests__/ToastProvider.test.tsx b/packages/twenty-ui/src/components/feedback/Toast/__tests__/ToastProvider.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/__tests__/ToastProvider.test.tsx
rename to packages/twenty-ui/src/components/feedback/Toast/__tests__/ToastProvider.test.tsx
index c4271cbae5d..6450f19bb42 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toast/__tests__/ToastProvider.test.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toast/__tests__/ToastProvider.test.tsx
@@ -1,11 +1,11 @@
import { act, render, renderHook } from '@testing-library/react';
import { expect, it, vi } from 'vitest';
+import { ToastProvider } from '../ToastProvider';
import { ToastContext } from '../contexts/ToastContext';
import { useToast } from '../hooks/useToast';
import { useToastEntries } from '../hooks/useToastEntries';
import { createToastStore } from '../stores/createToastStore';
-import { ToastProvider } from '../ToastProvider';
it.each([0, -1, 1.5])('rejects an invalid toast limit of %s', (limit) => {
expect(() => render(<ToastProvider limit={limit} />)).toThrow(
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/constants/DefaultToastLimit.ts b/packages/twenty-ui/src/components/feedback/Toast/constants/DefaultToastLimit.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/constants/DefaultToastLimit.ts
rename to packages/twenty-ui/src/components/feedback/Toast/constants/DefaultToastLimit.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/contexts/ToastContext.ts b/packages/twenty-ui/src/components/feedback/Toast/contexts/ToastContext.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/contexts/ToastContext.ts
rename to packages/twenty-ui/src/components/feedback/Toast/contexts/ToastContext.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/__tests__/useToast.test.tsx b/packages/twenty-ui/src/components/feedback/Toast/hooks/__tests__/useToast.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/hooks/__tests__/useToast.test.tsx
rename to packages/twenty-ui/src/components/feedback/Toast/hooks/__tests__/useToast.test.tsx
index bf646df1b74..d3a6f3c7bfa 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/__tests__/useToast.test.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toast/hooks/__tests__/useToast.test.tsx
@@ -2,8 +2,8 @@ import { render, renderHook } from '@testing-library/react';
import { StrictMode, useEffect } from 'react';
import { expect, it, vi } from 'vitest';
-import { ToastContext } from '../../contexts/ToastContext';
import { ToasterLifecycleEffect } from '../../../Toaster/internal/ToasterLifecycleEffect';
+import { ToastContext } from '../../contexts/ToastContext';
import { createToastStore } from '../../stores/createToastStore';
import { completeToastExit } from '../../utils/completeToastExit';
import { useToast } from '../useToast';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/__tests__/useToastEntries.test.tsx b/packages/twenty-ui/src/components/feedback/Toast/hooks/__tests__/useToastEntries.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/hooks/__tests__/useToastEntries.test.tsx
rename to packages/twenty-ui/src/components/feedback/Toast/hooks/__tests__/useToastEntries.test.tsx
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/useCloseToast.ts b/packages/twenty-ui/src/components/feedback/Toast/hooks/useCloseToast.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/hooks/useCloseToast.ts
rename to packages/twenty-ui/src/components/feedback/Toast/hooks/useCloseToast.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/useEnqueueToast.ts b/packages/twenty-ui/src/components/feedback/Toast/hooks/useEnqueueToast.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/hooks/useEnqueueToast.ts
rename to packages/twenty-ui/src/components/feedback/Toast/hooks/useEnqueueToast.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/useToast.ts b/packages/twenty-ui/src/components/feedback/Toast/hooks/useToast.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/hooks/useToast.ts
rename to packages/twenty-ui/src/components/feedback/Toast/hooks/useToast.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/useToastContext.ts b/packages/twenty-ui/src/components/feedback/Toast/hooks/useToastContext.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/hooks/useToastContext.ts
rename to packages/twenty-ui/src/components/feedback/Toast/hooks/useToastContext.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/hooks/useToastEntries.ts b/packages/twenty-ui/src/components/feedback/Toast/hooks/useToastEntries.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/hooks/useToastEntries.ts
rename to packages/twenty-ui/src/components/feedback/Toast/hooks/useToastEntries.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/stores/createToastStore.ts b/packages/twenty-ui/src/components/feedback/Toast/stores/createToastStore.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/stores/createToastStore.ts
rename to packages/twenty-ui/src/components/feedback/Toast/stores/createToastStore.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/types/ToastEntry.ts b/packages/twenty-ui/src/components/feedback/Toast/types/ToastEntry.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/types/ToastEntry.ts
rename to packages/twenty-ui/src/components/feedback/Toast/types/ToastEntry.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/types/ToastNotification.ts b/packages/twenty-ui/src/components/feedback/Toast/types/ToastNotification.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/types/ToastNotification.ts
rename to packages/twenty-ui/src/components/feedback/Toast/types/ToastNotification.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/types/ToastOptions.ts b/packages/twenty-ui/src/components/feedback/Toast/types/ToastOptions.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/types/ToastOptions.ts
rename to packages/twenty-ui/src/components/feedback/Toast/types/ToastOptions.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/types/ToastProps.ts b/packages/twenty-ui/src/components/feedback/Toast/types/ToastProps.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/types/ToastProps.ts
rename to packages/twenty-ui/src/components/feedback/Toast/types/ToastProps.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/types/ToastProviderProps.ts b/packages/twenty-ui/src/components/feedback/Toast/types/ToastProviderProps.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/types/ToastProviderProps.ts
rename to packages/twenty-ui/src/components/feedback/Toast/types/ToastProviderProps.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/types/ToastStoreState.ts b/packages/twenty-ui/src/components/feedback/Toast/types/ToastStoreState.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/types/ToastStoreState.ts
rename to packages/twenty-ui/src/components/feedback/Toast/types/ToastStoreState.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/types/ToastVariant.ts b/packages/twenty-ui/src/components/feedback/Toast/types/ToastVariant.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/types/ToastVariant.ts
rename to packages/twenty-ui/src/components/feedback/Toast/types/ToastVariant.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/utils/completeToastExit.ts b/packages/twenty-ui/src/components/feedback/Toast/utils/completeToastExit.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/utils/completeToastExit.ts
rename to packages/twenty-ui/src/components/feedback/Toast/utils/completeToastExit.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/utils/dismissToasts.ts b/packages/twenty-ui/src/components/feedback/Toast/utils/dismissToasts.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/utils/dismissToasts.ts
rename to packages/twenty-ui/src/components/feedback/Toast/utils/dismissToasts.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/utils/isToastVisible.ts b/packages/twenty-ui/src/components/feedback/Toast/utils/isToastVisible.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toast/utils/isToastVisible.ts
rename to packages/twenty-ui/src/components/feedback/Toast/utils/isToastVisible.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/Toaster.module.scss b/packages/twenty-ui/src/components/feedback/Toaster/Toaster.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/Toaster.module.scss
rename to packages/twenty-ui/src/components/feedback/Toaster/Toaster.module.scss
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/Toaster.module.scss.d.ts b/packages/twenty-ui/src/components/feedback/Toaster/Toaster.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/Toaster.module.scss.d.ts
rename to packages/twenty-ui/src/components/feedback/Toaster/Toaster.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/Toaster.tsx b/packages/twenty-ui/src/components/feedback/Toaster/Toaster.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/Toaster.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/Toaster.tsx
index b2e1c8cac44..834ae329b63 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/Toaster.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/Toaster.tsx
@@ -1,14 +1,14 @@
-import { useRender } from '@base-ui/react/use-render';
import { useDirection } from '@base-ui/react/direction-provider';
+import { useRender } from '@base-ui/react/use-render';
import { clsx } from 'clsx';
import { createPortal } from 'react-dom';
import { useThemeContainer } from '@ui/theme-constants';
import { isDefined } from '@ui/utilities/utils/isDefined';
+import styles from './Toaster.module.scss';
import { ToasterItems } from './internal/ToasterItems';
import { ToasterLifecycleEffect } from './internal/ToasterLifecycleEffect';
-import styles from './Toaster.module.scss';
import { type ToasterProps } from './types/ToasterProps';
export const Toaster = ({
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToastControls.tsx b/packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToastControls.tsx
similarity index 92%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToastControls.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToastControls.tsx
index fa2abd627a1..bcdda81df33 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToastControls.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToastControls.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
-import { useToast } from '@ui/primitives/feedback/Toast/hooks/useToast';
-import { type ToastOptions } from '@ui/primitives/feedback/Toast/types/ToastOptions';
+import { useToast } from '@ui/components/feedback/Toast/hooks/useToast';
+import { type ToastOptions } from '@ui/components/feedback/Toast/types/ToastOptions';
type ToastControlsProps = {
onClose?: () => void;
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/Toaster.stories.tsx b/packages/twenty-ui/src/components/feedback/Toaster/__stories__/Toaster.stories.tsx
similarity index 99%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/Toaster.stories.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/__stories__/Toaster.stories.tsx
index 6f6380c98be..2255105c6dd 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/Toaster.stories.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/__stories__/Toaster.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { StrictMode, useState } from 'react';
import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
-import { ToastProvider } from '@ui/primitives/feedback/Toast/ToastProvider';
+import { ToastProvider } from '@ui/components/feedback/Toast/ToastProvider';
import { ComponentDecorator } from '@ui/testing';
import { ThemeProvider } from '@ui/theme-constants/ThemeProvider';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToasterExample.tsx b/packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToasterExample.tsx
similarity index 84%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToasterExample.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToasterExample.tsx
index d8763020cfa..18632bbe859 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToasterExample.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToasterExample.tsx
@@ -1,4 +1,4 @@
-import { ToastProvider } from '@ui/primitives/feedback/Toast/ToastProvider';
+import { ToastProvider } from '@ui/components/feedback/Toast/ToastProvider';
import { Toaster } from '../Toaster';
import { ToastControls } from './ToastControls';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToasterExampleProps.ts b/packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToasterExampleProps.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/__stories__/ToasterExampleProps.ts
rename to packages/twenty-ui/src/components/feedback/Toaster/__stories__/ToasterExampleProps.ts
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/__tests__/Toaster.test.tsx b/packages/twenty-ui/src/components/feedback/Toaster/__tests__/Toaster.test.tsx
similarity index 88%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/__tests__/Toaster.test.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/__tests__/Toaster.test.tsx
index 9b4e7ae38d4..ab4fe284799 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/__tests__/Toaster.test.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/__tests__/Toaster.test.tsx
@@ -1,7 +1,7 @@
import { type ReactNode } from 'react';
import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
-import { ToastProvider } from '@ui/primitives/feedback/Toast/ToastProvider';
+import { ToastProvider } from '@ui/components/feedback/Toast/ToastProvider';
import { Toaster } from '../Toaster';
import styles from '../Toaster.module.scss';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItem.tsx b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItem.tsx
similarity index 90%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItem.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItem.tsx
index 06438f9e2cb..b22b1544fc5 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItem.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItem.tsx
@@ -1,7 +1,7 @@
import { useRef } from 'react';
-import { Toast } from '@ui/primitives/feedback/Toast/Toast';
-import { type ToastEntry } from '@ui/primitives/feedback/Toast/types/ToastEntry';
+import { Toast } from '@ui/components/feedback/Toast/Toast';
+import { type ToastEntry } from '@ui/components/feedback/Toast/types/ToastEntry';
import styles from '../Toaster.module.scss';
import { type ToasterProps } from '../types/ToasterProps';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItemExitEffect.tsx b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItemExitEffect.tsx
similarity index 83%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItemExitEffect.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItemExitEffect.tsx
index 420c5e26a9e..c0d76ed3ca3 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItemExitEffect.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItemExitEffect.tsx
@@ -1,8 +1,8 @@
import { type RefObject, useLayoutEffect } from 'react';
-import { useToastContext } from '@ui/primitives/feedback/Toast/hooks/useToastContext';
-import { type ToastEntry } from '@ui/primitives/feedback/Toast/types/ToastEntry';
-import { completeToastExit } from '@ui/primitives/feedback/Toast/utils/completeToastExit';
+import { useToastContext } from '@ui/components/feedback/Toast/hooks/useToastContext';
+import { type ToastEntry } from '@ui/components/feedback/Toast/types/ToastEntry';
+import { completeToastExit } from '@ui/components/feedback/Toast/utils/completeToastExit';
type ToasterItemExitEffectProps = {
elementRef: RefObject<HTMLDivElement | null>;
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItems.tsx b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItems.tsx
similarity index 81%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItems.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItems.tsx
index dad23e6d9ad..b04e93d8329 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterItems.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterItems.tsx
@@ -1,5 +1,5 @@
-import { useCloseToast } from '@ui/primitives/feedback/Toast/hooks/useCloseToast';
-import { useToastEntries } from '@ui/primitives/feedback/Toast/hooks/useToastEntries';
+import { useCloseToast } from '@ui/components/feedback/Toast/hooks/useCloseToast';
+import { useToastEntries } from '@ui/components/feedback/Toast/hooks/useToastEntries';
import { type ToasterProps } from '../types/ToasterProps';
import { ToasterItem } from './ToasterItem';
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterLifecycleEffect.tsx b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterLifecycleEffect.tsx
similarity index 81%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterLifecycleEffect.tsx
rename to packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterLifecycleEffect.tsx
index 2bceea449ee..9f814c84055 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/internal/ToasterLifecycleEffect.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/internal/ToasterLifecycleEffect.tsx
@@ -1,7 +1,7 @@
import { useLayoutEffect } from 'react';
-import { useToastContext } from '@ui/primitives/feedback/Toast/hooks/useToastContext';
-import { isToastVisible } from '@ui/primitives/feedback/Toast/utils/isToastVisible';
+import { useToastContext } from '@ui/components/feedback/Toast/hooks/useToastContext';
+import { isToastVisible } from '@ui/components/feedback/Toast/utils/isToastVisible';
export const ToasterLifecycleEffect = () => {
const store = useToastContext();
diff --git a/packages/twenty-ui/src/primitives/feedback/Toaster/types/ToasterProps.ts b/packages/twenty-ui/src/components/feedback/Toaster/types/ToasterProps.ts
similarity index 76%
rename from packages/twenty-ui/src/primitives/feedback/Toaster/types/ToasterProps.ts
rename to packages/twenty-ui/src/components/feedback/Toaster/types/ToasterProps.ts
index 4747af64e7b..3ca97936586 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toaster/types/ToasterProps.ts
+++ b/packages/twenty-ui/src/components/feedback/Toaster/types/ToasterProps.ts
@@ -1,8 +1,8 @@
import { type useRender } from '@base-ui/react/use-render';
import { type ComponentPropsWithRef } from 'react';
-import { type ToastNotification } from '@ui/primitives/feedback/Toast/types/ToastNotification';
-import { type ToastProps } from '@ui/primitives/feedback/Toast/types/ToastProps';
+import { type ToastNotification } from '@ui/components/feedback/Toast/types/ToastNotification';
+import { type ToastProps } from '@ui/components/feedback/Toast/types/ToastProps';
export type ToasterProps = Omit<ComponentPropsWithRef<'div'>, 'children'> & {
container?: HTMLElement | null;
diff --git a/packages/twenty-ui/src/components/index.ts b/packages/twenty-ui/src/components/index.ts
index aec47cc1cc4..cb88f4b3a5e 100644
--- a/packages/twenty-ui/src/components/index.ts
+++ b/packages/twenty-ui/src/components/index.ts
@@ -7,18 +7,84 @@
* |___/
*/
-export { IconButton } from './IconButton/IconButton';
-export type { IconButtonProps } from './IconButton/types/IconButtonProps';
-export type { IconButtonSize } from './IconButton/types/IconButtonSize';
-export { LightButton } from './LightButton/LightButton';
-export type { LightButtonProps } from './LightButton/types/LightButtonProps';
-export { LightIconButton } from './LightIconButton/LightIconButton';
-export type { LightIconButtonProps } from './LightIconButton/types/LightIconButtonProps';
-export { MainButton } from './MainButton/MainButton';
-export { Section } from './Section/Section';
-export type { SectionHeaderProps } from './Section/types/SectionHeaderProps';
-export type { SectionRootProps } from './Section/types/SectionRootProps';
-export { SettingsRow } from './SettingsRow/SettingsRow';
-export type { SettingsRowProps } from './SettingsRow/types/SettingsRowProps';
-export { TabButton } from './TabButton/TabButton';
-export type { TabButtonProps } from './TabButton/types/TabButtonProps';
+export { AvatarGroup } from './data-display/AvatarGroup/AvatarGroup';
+export type { AvatarGroupProps } from './data-display/AvatarGroup/types/AvatarGroupProps';
+export { CommandBlock } from './data-display/CommandBlock/CommandBlock';
+export { JsonTree } from './data-display/JsonTree/JsonTree';
+export type { GetJsonNodeHighlighting } from './data-display/JsonTree/types/GetJsonNodeHighlighting';
+export type { JsonNodeHighlighting } from './data-display/JsonTree/types/JsonNodeHighlighting';
+export type { JsonTreeEntry } from './data-display/JsonTree/types/JsonTreeEntry';
+export type { JsonTreeProps } from './data-display/JsonTree/types/JsonTreeProps';
+export type { ShouldExpandNodeInitiallyProps } from './data-display/JsonTree/types/ShouldExpandNodeInitiallyProps';
+export { NotificationCounter } from './data-display/NotificationCounter/NotificationCounter';
+export { TintedIconTile } from './data-display/TintedIconTile/TintedIconTile';
+export type { TintedIconTileProps } from './data-display/TintedIconTile/types/TintedIconTileProps';
+export type { IconTileColorShades } from './data-display/TintedIconTile/utils/getIconTileColorShades';
+export { getIconTileColorShades } from './data-display/TintedIconTile/utils/getIconTileColorShades';
+export { Callout } from './feedback/Callout/Callout';
+export type { CalloutProps } from './feedback/Callout/types/CalloutProps';
+export type { CalloutVariant } from './feedback/Callout/types/CalloutVariant';
+export { Info } from './feedback/Info/Info';
+export type { InfoAccent } from './feedback/Info/types/InfoAccent';
+export type { InfoProps } from './feedback/Info/types/InfoProps';
+export { InlineBanner } from './feedback/InlineBanner/InlineBanner';
+export { DEFAULT_TOAST_LIMIT } from './feedback/Toast/constants/DefaultToastLimit';
+export { ToastContext } from './feedback/Toast/contexts/ToastContext';
+export { useCloseToast } from './feedback/Toast/hooks/useCloseToast';
+export { useEnqueueToast } from './feedback/Toast/hooks/useEnqueueToast';
+export { useToast } from './feedback/Toast/hooks/useToast';
+export { useToastContext } from './feedback/Toast/hooks/useToastContext';
+export { useToastEntries } from './feedback/Toast/hooks/useToastEntries';
+export { createToastStore } from './feedback/Toast/stores/createToastStore';
+export { Toast } from './feedback/Toast/Toast';
+export { ToastProvider } from './feedback/Toast/ToastProvider';
+export type { ToastEntry } from './feedback/Toast/types/ToastEntry';
+export type { ToastNotification } from './feedback/Toast/types/ToastNotification';
+export type { ToastOptions } from './feedback/Toast/types/ToastOptions';
+export type { ToastProps } from './feedback/Toast/types/ToastProps';
+export type { ToastProviderProps } from './feedback/Toast/types/ToastProviderProps';
+export type { ToastStoreState } from './feedback/Toast/types/ToastStoreState';
+export type { ToastVariant } from './feedback/Toast/types/ToastVariant';
+export { completeToastExit } from './feedback/Toast/utils/completeToastExit';
+export { dismissToasts } from './feedback/Toast/utils/dismissToasts';
+export { isToastVisible } from './feedback/Toast/utils/isToastVisible';
+export { Toaster } from './feedback/Toaster/Toaster';
+export type { ToasterProps } from './feedback/Toaster/types/ToasterProps';
+export { CardPicker } from './input/CardPicker/CardPicker';
+export type { CardPickerProps } from './input/CardPicker/types/CardPickerProps';
+export { ColorSchemePicker } from './input/ColorSchemePicker/ColorSchemePicker';
+export type { ColorSchemePickerProps } from './input/ColorSchemePicker/types/ColorSchemePickerProps';
+export { IconButton } from './input/IconButton/IconButton';
+export type { IconButtonProps } from './input/IconButton/types/IconButtonProps';
+export type { IconButtonSize } from './input/IconButton/types/IconButtonSize';
+export { LightButton } from './input/LightButton/LightButton';
+export type { LightButtonProps } from './input/LightButton/types/LightButtonProps';
+export { LightIconButton } from './input/LightIconButton/LightIconButton';
+export type { LightIconButtonProps } from './input/LightIconButton/types/LightIconButtonProps';
+export { MainButton } from './input/MainButton/MainButton';
+export { SearchInput } from './input/SearchInput/SearchInput';
+export type { SearchInputProps } from './input/SearchInput/types/SearchInputProps';
+export { SettingsRow } from './input/SettingsRow/SettingsRow';
+export type { SettingsRowProps } from './input/SettingsRow/types/SettingsRowProps';
+export { AnimatedIconCrossfade } from './layout/AnimatedIconCrossfade/AnimatedIconCrossfade';
+export { Section } from './layout/Section/Section';
+export type { SectionHeaderProps } from './layout/Section/types/SectionHeaderProps';
+export type { SectionRootProps } from './layout/Section/types/SectionRootProps';
+export { DEFAULT_COLOR_LABELS } from './navigation/MenuItem/constants/DefaultColorLabels';
+export { MenuItem } from './navigation/MenuItem/MenuItem';
+export type { ColorLabels } from './navigation/MenuItem/types/ColorLabels';
+export type { MenuItemAccent } from './navigation/MenuItem/types/MenuItemAccent';
+export type { MenuItemDraggableGripMode } from './navigation/MenuItem/types/MenuItemDraggableGripMode';
+export type { MenuItemProps } from './navigation/MenuItem/types/MenuItemProps';
+export { MenuItemAvatar } from './navigation/MenuItemAvatar/MenuItemAvatar';
+export type { MenuItemAvatarProps } from './navigation/MenuItemAvatar/types/MenuItemAvatarProps';
+export { MenuItemDraggable } from './navigation/MenuItemDraggable/MenuItemDraggable';
+export type { MenuItemDraggableProps } from './navigation/MenuItemDraggable/types/MenuItemDraggableProps';
+export { MenuItemSuggestion } from './navigation/MenuItemSuggestion/MenuItemSuggestion';
+export type { MenuItemSuggestionProps } from './navigation/MenuItemSuggestion/types/MenuItemSuggestionProps';
+export { MenuPicker } from './navigation/MenuPicker/MenuPicker';
+export type { MenuPickerProps } from './navigation/MenuPicker/types/MenuPickerProps';
+export { NavigationBar } from './navigation/NavigationBar/NavigationBar';
+export { RoundedLink } from './navigation/RoundedLink/RoundedLink';
+export { TabButton } from './navigation/TabButton/TabButton';
+export type { TabButtonProps } from './navigation/TabButton/types/TabButtonProps';
diff --git a/packages/twenty-ui/src/primitives/input/CardPicker/CardPicker.module.scss b/packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/CardPicker/CardPicker.module.scss
rename to packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss
diff --git a/packages/twenty-ui/src/primitives/input/CardPicker/CardPicker.module.scss.d.ts b/packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/CardPicker/CardPicker.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/input/CardPicker/CardPicker.tsx b/packages/twenty-ui/src/components/input/CardPicker/CardPicker.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/CardPicker/CardPicker.tsx
rename to packages/twenty-ui/src/components/input/CardPicker/CardPicker.tsx
diff --git a/packages/twenty-ui/src/components/input/CardPicker/__stories__/CardPicker.stories.tsx b/packages/twenty-ui/src/components/input/CardPicker/__stories__/CardPicker.stories.tsx
new file mode 100644
index 00000000000..433b4efca24
--- /dev/null
+++ b/packages/twenty-ui/src/components/input/CardPicker/__stories__/CardPicker.stories.tsx
@@ -0,0 +1,59 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { useState } from 'react';
+import { expect, fn, userEvent, within } from 'storybook/test';
+
+import { Input } from '@ui/primitives/input/Input/Input';
+import { RadioGroup } from '@ui/primitives/input/RadioGroup/RadioGroup';
+import { type RadioGroupProps } from '@ui/primitives/input/RadioGroup/types/RadioGroupProps';
+import { ComponentDecorator } from '@ui/testing';
+
+import { CardPicker } from '../CardPicker';
+
+const CardsExample = ({ onValueChange }: RadioGroupProps) => {
+ const [value, setValue] = useState('monthly');
+
+ return (
+ <RadioGroup
+ aria-label="Billing interval"
+ value={value}
+ onValueChange={(nextValue, details) => {
+ setValue(nextValue);
+ onValueChange?.(nextValue, details);
+ }}
+ >
+ <CardPicker value="monthly">Monthly</CardPicker>
+ <CardPicker value="yearly">Yearly</CardPicker>
+ {value === 'yearly' && <Input aria-label="Purchase order" />}
+ </RadioGroup>
+ );
+};
+
+const meta: Meta<typeof CardsExample> = {
+ title: 'UI/Input/Radio/Interactions',
+ component: CardsExample,
+ tags: ['!autodocs'],
+ args: { onValueChange: fn() },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof CardsExample>;
+
+export const Cards: Story = {
+ decorators: [ComponentDecorator],
+ render: (args) => <CardsExample {...args} />,
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ await userEvent.click(canvas.getByText('Yearly'));
+ await expect(canvas.getByRole('radio', { name: 'Yearly' })).toBeChecked();
+ await expect(args.onValueChange).toHaveBeenCalledTimes(1);
+ await userEvent.type(
+ canvas.getByRole('textbox', { name: 'Purchase order' }),
+ 'PO-42',
+ );
+ await expect(args.onValueChange).toHaveBeenCalledTimes(1);
+ await userEvent.click(canvas.getByRole('radio', { name: 'Monthly' }));
+ await userEvent.keyboard('{ArrowDown}');
+ await expect(canvas.getByRole('radio', { name: 'Yearly' })).toBeChecked();
+ },
+};
diff --git a/packages/twenty-ui/src/components/input/CardPicker/__tests__/CardPicker.test.tsx b/packages/twenty-ui/src/components/input/CardPicker/__tests__/CardPicker.test.tsx
new file mode 100644
index 00000000000..3e90b1ec8a3
--- /dev/null
+++ b/packages/twenty-ui/src/components/input/CardPicker/__tests__/CardPicker.test.tsx
@@ -0,0 +1,20 @@
+import { type ReactNode } from 'react';
+
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+import { RadioGroup } from '@ui/primitives/input/RadioGroup/RadioGroup';
+
+import { CardPicker } from '../CardPicker';
+import styles from '../CardPicker.module.scss';
+
+const RadioGroupWrapper = ({ children }: { children: ReactNode }) => (
+ <RadioGroup>{children}</RadioGroup>
+);
+
+runComponentConformance({
+ name: 'CardPicker',
+ element: <CardPicker value="option">Option</CardPicker>,
+ wrapper: RadioGroupWrapper,
+ refInstanceOf: HTMLDivElement,
+ ownClassName: styles.container,
+ renderPropTagName: 'div',
+});
diff --git a/packages/twenty-ui/src/primitives/input/CardPicker/types/CardPickerProps.ts b/packages/twenty-ui/src/components/input/CardPicker/types/CardPickerProps.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/CardPicker/types/CardPickerProps.ts
rename to packages/twenty-ui/src/components/input/CardPicker/types/CardPickerProps.ts
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemePicker/ColorSchemePicker.module.scss b/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/ColorSchemePicker/ColorSchemePicker.module.scss
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemePicker/ColorSchemePicker.module.scss.d.ts b/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/ColorSchemePicker/ColorSchemePicker.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemePicker/ColorSchemePicker.tsx b/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.tsx
similarity index 77%
rename from packages/twenty-ui/src/primitives/input/ColorSchemePicker/ColorSchemePicker.tsx
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.tsx
index ad627217b4b..a1716d62beb 100644
--- a/packages/twenty-ui/src/primitives/input/ColorSchemePicker/ColorSchemePicker.tsx
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.tsx
@@ -1,19 +1,9 @@
import { clsx } from 'clsx';
+import { type ColorSchemePickerProps } from './types/ColorSchemePickerProps';
-import { type ColorScheme } from '@ui/primitives/input/types/ColorScheme';
-
-import { ColorSchemeCard } from '@ui/primitives/input/ColorSchemeCard/ColorSchemeCard';
+import { ColorSchemeCard } from '@ui/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard';
import styles from './ColorSchemePicker.module.scss';
-export type ColorSchemePickerProps = {
- value: ColorScheme;
- className?: string;
- onChange: (value: ColorScheme) => void;
- lightLabel: string;
- darkLabel: string;
- systemLabel: string;
-};
-
export const ColorSchemePicker = ({
value,
onChange,
diff --git a/packages/twenty-ui/src/primitives/data-display/Checkmark/Checkmark.module.scss b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/Checkmark.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/Checkmark/Checkmark.module.scss
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/Checkmark.module.scss
diff --git a/packages/twenty-ui/src/primitives/data-display/Checkmark/Checkmark.module.scss.d.ts b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/Checkmark.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/Checkmark/Checkmark.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/Checkmark.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/data-display/Checkmark/Checkmark.tsx b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/Checkmark.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/data-display/Checkmark/Checkmark.tsx
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/Checkmark.tsx
diff --git a/packages/twenty-ui/src/primitives/data-display/Checkmark/__stories__/Checkmark.stories.tsx b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/__stories__/Checkmark.stories.tsx
similarity index 84%
rename from packages/twenty-ui/src/primitives/data-display/Checkmark/__stories__/Checkmark.stories.tsx
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/__stories__/Checkmark.stories.tsx
index 95ae681b052..ec9eb639ca4 100644
--- a/packages/twenty-ui/src/primitives/data-display/Checkmark/__stories__/Checkmark.stories.tsx
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/Checkmark/__stories__/Checkmark.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { Checkmark } from '@ui/primitives/data-display/Checkmark/Checkmark';
+import { Checkmark } from '@ui/components/input/ColorSchemePicker/internal/Checkmark/Checkmark';
const meta: Meta<typeof Checkmark> = {
title: 'UI/Data Display/Checkmark',
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/ColorSchemeCard.module.scss b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/ColorSchemeCard/ColorSchemeCard.module.scss
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/ColorSchemeCard.module.scss.d.ts b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/ColorSchemeCard/ColorSchemeCard.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/ColorSchemeCard.tsx b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.tsx
similarity index 97%
rename from packages/twenty-ui/src/primitives/input/ColorSchemeCard/ColorSchemeCard.tsx
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.tsx
index 231a3f07381..3944b79f4e6 100644
--- a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/ColorSchemeCard.tsx
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.tsx
@@ -2,8 +2,8 @@ import React from 'react';
import { clsx } from 'clsx';
+import { Checkmark } from '@ui/components/input/ColorSchemePicker/internal/Checkmark/Checkmark';
import { handleClickableElementKeyDown } from '@ui/primitives/accessibility/utils/handleClickableElementKeyDown';
-import { Checkmark } from '@ui/primitives/data-display/Checkmark/Checkmark';
import { type ColorScheme } from '@ui/primitives/input/types/ColorScheme';
import { GRAY_SCALE_DARK } from '@ui/theme/constants/GrayScaleDark';
import { GRAY_SCALE_LIGHT } from '@ui/theme/constants/GrayScaleLight';
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss.d.ts b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
similarity index 89%
rename from packages/twenty-ui/src/primitives/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
rename to packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
index b1b8b891afc..db6fdb833fd 100644
--- a/packages/twenty-ui/src/primitives/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { ColorSchemeCard } from '@ui/primitives/input/ColorSchemeCard/ColorSchemeCard';
+import { ColorSchemeCard } from '@ui/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard';
import styles from './ColorSchemeCard.stories.module.scss';
diff --git a/packages/twenty-ui/src/components/input/ColorSchemePicker/types/ColorSchemePickerProps.ts b/packages/twenty-ui/src/components/input/ColorSchemePicker/types/ColorSchemePickerProps.ts
new file mode 100644
index 00000000000..cfc9cdad43e
--- /dev/null
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/types/ColorSchemePickerProps.ts
@@ -0,0 +1,10 @@
+import { type ColorScheme } from '@ui/primitives/input/types/ColorScheme';
+
+export type ColorSchemePickerProps = {
+ value: ColorScheme;
+ className?: string;
+ onChange: (value: ColorScheme) => void;
+ lightLabel: string;
+ darkLabel: string;
+ systemLabel: string;
+};
diff --git a/packages/twenty-ui/src/components/IconButton/IconButton.module.scss b/packages/twenty-ui/src/components/input/IconButton/IconButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/IconButton/IconButton.module.scss
rename to packages/twenty-ui/src/components/input/IconButton/IconButton.module.scss
diff --git a/packages/twenty-ui/src/components/IconButton/IconButton.module.scss.d.ts b/packages/twenty-ui/src/components/input/IconButton/IconButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/IconButton/IconButton.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/IconButton/IconButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/IconButton/IconButton.tsx b/packages/twenty-ui/src/components/input/IconButton/IconButton.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/IconButton/IconButton.tsx
rename to packages/twenty-ui/src/components/input/IconButton/IconButton.tsx
diff --git a/packages/twenty-ui/src/components/IconButton/__stories__/IconButton.stories.tsx b/packages/twenty-ui/src/components/input/IconButton/__stories__/IconButton.stories.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/IconButton/__stories__/IconButton.stories.tsx
rename to packages/twenty-ui/src/components/input/IconButton/__stories__/IconButton.stories.tsx
diff --git a/packages/twenty-ui/src/components/IconButton/__tests__/IconButton.test.tsx b/packages/twenty-ui/src/components/input/IconButton/__tests__/IconButton.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/IconButton/__tests__/IconButton.test.tsx
rename to packages/twenty-ui/src/components/input/IconButton/__tests__/IconButton.test.tsx
diff --git a/packages/twenty-ui/src/components/IconButton/types/IconButtonProps.ts b/packages/twenty-ui/src/components/input/IconButton/types/IconButtonProps.ts
similarity index 100%
rename from packages/twenty-ui/src/components/IconButton/types/IconButtonProps.ts
rename to packages/twenty-ui/src/components/input/IconButton/types/IconButtonProps.ts
diff --git a/packages/twenty-ui/src/components/IconButton/types/IconButtonSize.ts b/packages/twenty-ui/src/components/input/IconButton/types/IconButtonSize.ts
similarity index 100%
rename from packages/twenty-ui/src/components/IconButton/types/IconButtonSize.ts
rename to packages/twenty-ui/src/components/input/IconButton/types/IconButtonSize.ts
diff --git a/packages/twenty-ui/src/components/LightButton/LightButton.module.scss b/packages/twenty-ui/src/components/input/LightButton/LightButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/LightButton/LightButton.module.scss
rename to packages/twenty-ui/src/components/input/LightButton/LightButton.module.scss
diff --git a/packages/twenty-ui/src/components/LightButton/LightButton.module.scss.d.ts b/packages/twenty-ui/src/components/input/LightButton/LightButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/LightButton/LightButton.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/LightButton/LightButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/LightButton/LightButton.tsx b/packages/twenty-ui/src/components/input/LightButton/LightButton.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/LightButton/LightButton.tsx
rename to packages/twenty-ui/src/components/input/LightButton/LightButton.tsx
diff --git a/packages/twenty-ui/src/components/LightButton/__stories__/LightButton.stories.tsx b/packages/twenty-ui/src/components/input/LightButton/__stories__/LightButton.stories.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/LightButton/__stories__/LightButton.stories.tsx
rename to packages/twenty-ui/src/components/input/LightButton/__stories__/LightButton.stories.tsx
diff --git a/packages/twenty-ui/src/components/LightButton/__tests__/LightButton.test.tsx b/packages/twenty-ui/src/components/input/LightButton/__tests__/LightButton.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/LightButton/__tests__/LightButton.test.tsx
rename to packages/twenty-ui/src/components/input/LightButton/__tests__/LightButton.test.tsx
diff --git a/packages/twenty-ui/src/components/LightButton/types/LightButtonProps.ts b/packages/twenty-ui/src/components/input/LightButton/types/LightButtonProps.ts
similarity index 100%
rename from packages/twenty-ui/src/components/LightButton/types/LightButtonProps.ts
rename to packages/twenty-ui/src/components/input/LightButton/types/LightButtonProps.ts
diff --git a/packages/twenty-ui/src/components/LightIconButton/LightIconButton.module.scss b/packages/twenty-ui/src/components/input/LightIconButton/LightIconButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/LightIconButton/LightIconButton.module.scss
rename to packages/twenty-ui/src/components/input/LightIconButton/LightIconButton.module.scss
diff --git a/packages/twenty-ui/src/components/LightIconButton/LightIconButton.module.scss.d.ts b/packages/twenty-ui/src/components/input/LightIconButton/LightIconButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/LightIconButton/LightIconButton.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/LightIconButton/LightIconButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/LightIconButton/LightIconButton.tsx b/packages/twenty-ui/src/components/input/LightIconButton/LightIconButton.tsx
similarity index 87%
rename from packages/twenty-ui/src/components/LightIconButton/LightIconButton.tsx
rename to packages/twenty-ui/src/components/input/LightIconButton/LightIconButton.tsx
index 84c6a1c1fa1..42554c1a809 100644
--- a/packages/twenty-ui/src/components/LightIconButton/LightIconButton.tsx
+++ b/packages/twenty-ui/src/components/input/LightIconButton/LightIconButton.tsx
@@ -1,4 +1,4 @@
-import { IconButton } from '@ui/components/IconButton/IconButton';
+import { IconButton } from '@ui/components/input/IconButton/IconButton';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from './LightIconButton.module.scss';
diff --git a/packages/twenty-ui/src/components/LightIconButton/__stories__/LightIconButton.stories.tsx b/packages/twenty-ui/src/components/input/LightIconButton/__stories__/LightIconButton.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/components/LightIconButton/__stories__/LightIconButton.stories.tsx
rename to packages/twenty-ui/src/components/input/LightIconButton/__stories__/LightIconButton.stories.tsx
index d98f652e79a..6d4323c8a78 100644
--- a/packages/twenty-ui/src/components/LightIconButton/__stories__/LightIconButton.stories.tsx
+++ b/packages/twenty-ui/src/components/input/LightIconButton/__stories__/LightIconButton.stories.tsx
@@ -1,7 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { expect, fn, userEvent, within } from 'storybook/test';
+import { IconButton } from '@ui/components/input/IconButton/IconButton';
import { IconSearch } from '@ui/icon';
-import { IconButton } from '@ui/components/IconButton/IconButton';
import { ButtonGroup } from '@ui/primitives/input/ButtonGroup/ButtonGroup';
import {
A11Y_DEFER_COLOR_CONTRAST,
@@ -9,6 +8,7 @@ import {
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
+import { expect, fn, userEvent, within } from 'storybook/test';
import { LightIconButton } from '../LightIconButton';
import { type LightIconButtonProps } from '../types/LightIconButtonProps';
diff --git a/packages/twenty-ui/src/components/input/LightIconButton/__stories__/LightIconButtonGroups.stories.tsx b/packages/twenty-ui/src/components/input/LightIconButton/__stories__/LightIconButtonGroups.stories.tsx
new file mode 100644
index 00000000000..aaf7cc0c409
--- /dev/null
+++ b/packages/twenty-ui/src/components/input/LightIconButton/__stories__/LightIconButtonGroups.stories.tsx
@@ -0,0 +1,138 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, within } from 'storybook/test';
+
+import { IconPlus, IconTrash } from '@ui/icon';
+import { Button } from '@ui/primitives/input/Button/Button';
+import { ButtonGroup } from '@ui/primitives/input/ButtonGroup/ButtonGroup';
+import { ComponentDecorator } from '@ui/testing';
+
+import { LightIconButton } from '../LightIconButton';
+
+const meta: Meta<typeof ButtonGroup> = {
+ title: 'UI/Input/Button/ButtonGroup',
+ component: ButtonGroup,
+ tags: ['!autodocs'],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof ButtonGroup>;
+
+export const Framed: Story = {
+ decorators: [ComponentDecorator],
+ render: () => (
+ <ButtonGroup
+ framed
+ attached={false}
+ aria-label="Record actions"
+ className="nodrag nopan"
+ >
+ <LightIconButton size="xs" aria-label="Add" emphasis="subtle">
+ <IconPlus />
+ </LightIconButton>
+ <LightIconButton
+ size="xs"
+ aria-label="Delete"
+ emphasis="subtle"
+ disabled
+ tooltip="Unavailable"
+ >
+ <IconTrash />
+ </LightIconButton>
+ </ButtonGroup>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const group = canvas.getByRole('group', { name: 'Record actions' });
+ const buttons = within(group).getAllByRole('button');
+ await expect(group).toHaveClass('nodrag', 'nopan');
+ await expect(group.getBoundingClientRect().height).toBe(26);
+ await expect(group.getBoundingClientRect().width).toBe(48);
+ for (const button of buttons) {
+ await expect(button.getBoundingClientRect().width).toBe(20);
+ await expect(button.getBoundingClientRect().height).toBe(20);
+ await expect(getComputedStyle(button).borderTopLeftRadius).toBe(
+ getComputedStyle(button).borderTopRightRadius,
+ );
+ await expect(
+ parseFloat(getComputedStyle(button).borderTopLeftRadius),
+ ).toBeGreaterThan(0);
+ }
+ await expect(
+ buttons[1].getBoundingClientRect().left -
+ buttons[0].getBoundingClientRect().right,
+ ).toBe(2);
+ },
+};
+export const FramedDocumentation: Story = {
+ ...Framed,
+ play: undefined,
+};
+
+export const FramedDark: Story = {
+ ...Framed,
+ globals: { colorScheme: 'dark' },
+};
+export const FramedSingle: Story = {
+ decorators: [ComponentDecorator],
+ render: () => (
+ <ButtonGroup framed attached={false} aria-label="Single action">
+ <LightIconButton size="xs" aria-label="Add">
+ <IconPlus />
+ </LightIconButton>
+ </ButtonGroup>
+ ),
+ play: async ({ canvasElement }) => {
+ await expect(
+ within(canvasElement).getByRole('group').getBoundingClientRect().width,
+ ).toBe(26);
+ },
+};
+export const FramedDisabledAction: Story = {
+ decorators: [ComponentDecorator],
+ args: { onClick: fn() },
+ render: (args) => (
+ <ButtonGroup framed attached={false} {...args}>
+ <LightIconButton size="xs" aria-label="Delete" disabled>
+ <IconTrash />
+ </LightIconButton>
+ </ButtonGroup>
+ ),
+ play: async ({ canvasElement, args }) => {
+ await userEvent.click(within(canvasElement).getByRole('button'));
+ await expect(args.onClick).not.toHaveBeenCalled();
+ },
+};
+
+export const FramedMixedButtons: Story = {
+ decorators: [ComponentDecorator],
+ render: () => (
+ <ButtonGroup framed attached={false} aria-label="Mixed actions">
+ <Button size="sm" variant="solid" color="accent">
+ Save
+ </Button>
+ <LightIconButton size="xs" aria-label="Add">
+ <IconPlus />
+ </LightIconButton>
+ <LightIconButton size="md" aria-label="Delete">
+ <IconTrash />
+ </LightIconButton>
+ </ButtonGroup>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const save = canvas.getByRole('button', { name: 'Save' });
+ const add = canvas.getByRole('button', { name: 'Add' });
+ const remove = canvas.getByRole('button', { name: 'Delete' });
+
+ await expect(save.getBoundingClientRect().height).toBe(24);
+ await expect(save).toHaveAttribute('data-variant', 'solid');
+ await expect(save).toHaveAttribute('data-color', 'accent');
+ await expect(add.getBoundingClientRect().width).toBe(20);
+ await expect(remove.getBoundingClientRect().width).toBe(32);
+ await expect(add).toHaveAttribute('data-variant', 'ghost');
+ await expect(canvas.getByRole('group').getBoundingClientRect().height).toBe(
+ 38,
+ );
+ },
+};
diff --git a/packages/twenty-ui/src/components/LightIconButton/__tests__/LightIconButton.test.tsx b/packages/twenty-ui/src/components/input/LightIconButton/__tests__/LightIconButton.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/LightIconButton/__tests__/LightIconButton.test.tsx
rename to packages/twenty-ui/src/components/input/LightIconButton/__tests__/LightIconButton.test.tsx
diff --git a/packages/twenty-ui/src/components/LightIconButton/types/LightIconButtonProps.ts b/packages/twenty-ui/src/components/input/LightIconButton/types/LightIconButtonProps.ts
similarity index 50%
rename from packages/twenty-ui/src/components/LightIconButton/types/LightIconButtonProps.ts
rename to packages/twenty-ui/src/components/input/LightIconButton/types/LightIconButtonProps.ts
index 649afffbd8e..d2f2fe98a08 100644
--- a/packages/twenty-ui/src/components/LightIconButton/types/LightIconButtonProps.ts
+++ b/packages/twenty-ui/src/components/input/LightIconButton/types/LightIconButtonProps.ts
@@ -1,4 +1,4 @@
-import { type IconButtonProps } from '@ui/components/IconButton/types/IconButtonProps';
+import { type IconButtonProps } from '@ui/components/input/IconButton/types/IconButtonProps';
export type LightIconButtonProps = IconButtonProps & {
emphasis?: 'standard' | 'subtle';
diff --git a/packages/twenty-ui/src/components/MainButton/MainButton.module.scss b/packages/twenty-ui/src/components/input/MainButton/MainButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/MainButton/MainButton.module.scss
rename to packages/twenty-ui/src/components/input/MainButton/MainButton.module.scss
diff --git a/packages/twenty-ui/src/components/MainButton/MainButton.module.scss.d.ts b/packages/twenty-ui/src/components/input/MainButton/MainButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/MainButton/MainButton.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/MainButton/MainButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/MainButton/MainButton.tsx b/packages/twenty-ui/src/components/input/MainButton/MainButton.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/MainButton/MainButton.tsx
rename to packages/twenty-ui/src/components/input/MainButton/MainButton.tsx
diff --git a/packages/twenty-ui/src/components/MainButton/__stories__/MainButton.stories.tsx b/packages/twenty-ui/src/components/input/MainButton/__stories__/MainButton.stories.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/MainButton/__stories__/MainButton.stories.tsx
rename to packages/twenty-ui/src/components/input/MainButton/__stories__/MainButton.stories.tsx
diff --git a/packages/twenty-ui/src/components/MainButton/__tests__/MainButton.test.tsx b/packages/twenty-ui/src/components/input/MainButton/__tests__/MainButton.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/MainButton/__tests__/MainButton.test.tsx
rename to packages/twenty-ui/src/components/input/MainButton/__tests__/MainButton.test.tsx
diff --git a/packages/twenty-ui/src/primitives/input/SearchInput/SearchInput.module.scss b/packages/twenty-ui/src/components/input/SearchInput/SearchInput.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/SearchInput/SearchInput.module.scss
rename to packages/twenty-ui/src/components/input/SearchInput/SearchInput.module.scss
diff --git a/packages/twenty-ui/src/primitives/input/SearchInput/SearchInput.module.scss.d.ts b/packages/twenty-ui/src/components/input/SearchInput/SearchInput.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/input/SearchInput/SearchInput.module.scss.d.ts
rename to packages/twenty-ui/src/components/input/SearchInput/SearchInput.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/input/SearchInput/SearchInput.tsx b/packages/twenty-ui/src/components/input/SearchInput/SearchInput.tsx
similarity index 82%
rename from packages/twenty-ui/src/primitives/input/SearchInput/SearchInput.tsx
rename to packages/twenty-ui/src/components/input/SearchInput/SearchInput.tsx
index 36ae8262910..bff305d1fbf 100644
--- a/packages/twenty-ui/src/primitives/input/SearchInput/SearchInput.tsx
+++ b/packages/twenty-ui/src/components/input/SearchInput/SearchInput.tsx
@@ -1,6 +1,7 @@
import { Input } from '@base-ui/react/input';
import { clsx } from 'clsx';
-import { type ReactNode, useId, useState } from 'react';
+import { useId, useState } from 'react';
+import { type SearchInputProps } from './types/SearchInputProps';
import { IconFilter, IconSearch } from '@ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
@@ -8,20 +9,6 @@ import { useTheme } from '@ui/theme-constants';
import styles from './SearchInput.module.scss';
-export type SearchInputProps = {
- value: string;
- onChange: (value: string) => void;
- placeholder?: string;
- filterDropdown?: (filterButton: ReactNode) => ReactNode;
- autoFocus?: boolean;
- disabled?: boolean;
- className?: string;
- id?: string;
- filterButtonAriaLabel?: string;
- 'aria-label'?: string;
- 'aria-labelledby'?: string;
-};
-
export const SearchInput = ({
value,
onChange,
diff --git a/packages/twenty-ui/src/primitives/input/SearchInput/__stories__/SearchInput.stories.tsx b/packages/twenty-ui/src/components/input/SearchInput/__stories__/SearchInput.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/primitives/input/SearchInput/__stories__/SearchInput.stories.tsx
rename to packages/twenty-ui/src/components/input/SearchInput/__stories__/SearchInput.stories.tsx
index bc49f3a4ded..74a17b93705 100644
--- a/packages/twenty-ui/src/primitives/input/SearchInput/__stories__/SearchInput.stories.tsx
+++ b/packages/twenty-ui/src/components/input/SearchInput/__stories__/SearchInput.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
import { useState } from 'react';
-import { SearchInput } from '@ui/primitives/input/SearchInput/SearchInput';
+import { SearchInput } from '@ui/components/input/SearchInput/SearchInput';
type InteractiveSearchInputProps = {
placeholder?: string;
diff --git a/packages/twenty-ui/src/components/input/SearchInput/types/SearchInputProps.ts b/packages/twenty-ui/src/components/input/SearchInput/types/SearchInputProps.ts
new file mode 100644
index 00000000000..745ace8a03f
--- /dev/null
+++ b/packages/twenty-ui/src/components/input/SearchInput/types/SearchInputProps.ts
@@ -0,0 +1,15 @@
+import { type ReactNode } from 'react';
+
+export type SearchInputProps = {
+ value: string;
+ onChange: (value: string) => void;
+ placeholder?: string;
+ filterDropdown?: (filterButton: ReactNode) => ReactNode;
+ autoFocus?: boolean;
+ disabled?: boolean;
+ className?: string;
+ id?: string;
+ filterButtonAriaLabel?: string;
+ 'aria-label'?: string;
+ 'aria-labelledby'?: string;
+};
diff --git a/packages/twenty-ui/src/components/SettingsRow/SettingsRow.tsx b/packages/twenty-ui/src/components/input/SettingsRow/SettingsRow.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/SettingsRow/SettingsRow.tsx
rename to packages/twenty-ui/src/components/input/SettingsRow/SettingsRow.tsx
diff --git a/packages/twenty-ui/src/components/SettingsRow/__stories__/ControlledSettingsRowExample.tsx b/packages/twenty-ui/src/components/input/SettingsRow/__stories__/ControlledSettingsRowExample.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/SettingsRow/__stories__/ControlledSettingsRowExample.tsx
rename to packages/twenty-ui/src/components/input/SettingsRow/__stories__/ControlledSettingsRowExample.tsx
diff --git a/packages/twenty-ui/src/components/SettingsRow/__stories__/SettingsRow.stories.tsx b/packages/twenty-ui/src/components/input/SettingsRow/__stories__/SettingsRow.stories.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/SettingsRow/__stories__/SettingsRow.stories.tsx
rename to packages/twenty-ui/src/components/input/SettingsRow/__stories__/SettingsRow.stories.tsx
diff --git a/packages/twenty-ui/src/components/SettingsRow/__stories__/SettingsRowInteractions.stories.tsx b/packages/twenty-ui/src/components/input/SettingsRow/__stories__/SettingsRowInteractions.stories.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/SettingsRow/__stories__/SettingsRowInteractions.stories.tsx
rename to packages/twenty-ui/src/components/input/SettingsRow/__stories__/SettingsRowInteractions.stories.tsx
diff --git a/packages/twenty-ui/src/components/SettingsRow/__tests__/SettingsRow.test.tsx b/packages/twenty-ui/src/components/input/SettingsRow/__tests__/SettingsRow.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/SettingsRow/__tests__/SettingsRow.test.tsx
rename to packages/twenty-ui/src/components/input/SettingsRow/__tests__/SettingsRow.test.tsx
diff --git a/packages/twenty-ui/src/components/SettingsRow/types/SettingsRowProps.ts b/packages/twenty-ui/src/components/input/SettingsRow/types/SettingsRowProps.ts
similarity index 100%
rename from packages/twenty-ui/src/components/SettingsRow/types/SettingsRowProps.ts
rename to packages/twenty-ui/src/components/input/SettingsRow/types/SettingsRowProps.ts
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss b/packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss
rename to packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss.d.ts b/packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss.d.ts
rename to packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.tsx b/packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.tsx
rename to packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.tsx
diff --git a/packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/__stories__/AnimatedIconCrossfade.stories.tsx b/packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/__stories__/AnimatedIconCrossfade.stories.tsx
new file mode 100644
index 00000000000..140d19bc213
--- /dev/null
+++ b/packages/twenty-ui/src/components/layout/AnimatedIconCrossfade/__stories__/AnimatedIconCrossfade.stories.tsx
@@ -0,0 +1,73 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { useState } from 'react';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+
+import { IconPencil, IconX } from '@ui/icon';
+import { Button } from '@ui/primitives/input/Button/Button';
+import { ComponentDecorator } from '@ui/testing';
+
+import { AnimatedIconCrossfade } from '../AnimatedIconCrossfade';
+
+const meta = {
+ title: 'UI/Input/Button/Button',
+ component: AnimatedIconCrossfade,
+ tags: ['!autodocs'],
+ args: { isActive: false, ActiveIcon: IconX, InactiveIcon: IconPencil },
+} satisfies Meta<typeof AnimatedIconCrossfade>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const AnimatedIcon: Story = {
+ decorators: [ComponentDecorator],
+ render: function Render() {
+ const [isEditing, setIsEditing] = useState(false);
+
+ return (
+ <Button
+ size="sm"
+ aria-expanded={isEditing}
+ onClick={() => setIsEditing(!isEditing)}
+ startIcon={
+ <AnimatedIconCrossfade
+ isActive={isEditing}
+ ActiveIcon={IconX}
+ InactiveIcon={IconPencil}
+ />
+ }
+ >
+ Edit actions
+ </Button>
+ );
+ },
+ play: async ({ canvasElement }) => {
+ const button = within(canvasElement).getByRole('button', {
+ name: 'Edit actions',
+ });
+ await document.fonts.load('500 1em Inter');
+ await document.fonts.ready;
+ const [pencil, cross] = button.querySelectorAll('svg');
+ const originalWidth = button.getBoundingClientRect().width;
+
+ await expect(button.getBoundingClientRect().height).toBe(24);
+ await expect(pencil.getBoundingClientRect().width).toBe(14);
+ button.focus();
+ await userEvent.keyboard('{Enter}');
+ await expect(button).toHaveAttribute('aria-expanded', 'true');
+ await waitFor(() => {
+ expect(getComputedStyle(pencil.parentElement!).opacity).toBe('0');
+ expect(getComputedStyle(cross.parentElement!).opacity).toBe('1');
+ });
+ await waitFor(() =>
+ expect(button.getBoundingClientRect().width).toBe(originalWidth),
+ );
+ await userEvent.keyboard(' ');
+ await expect(button).toHaveAttribute('aria-expanded', 'false');
+ await userEvent.tab();
+ },
+};
+export const AnimatedIconDocumentation: Story = {
+ ...AnimatedIcon,
+ play: undefined,
+};
diff --git a/packages/twenty-ui/src/components/Section/Section.tsx b/packages/twenty-ui/src/components/layout/Section/Section.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/Section/Section.tsx
rename to packages/twenty-ui/src/components/layout/Section/Section.tsx
diff --git a/packages/twenty-ui/src/components/Section/SectionHeader.module.scss b/packages/twenty-ui/src/components/layout/Section/SectionHeader.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/Section/SectionHeader.module.scss
rename to packages/twenty-ui/src/components/layout/Section/SectionHeader.module.scss
diff --git a/packages/twenty-ui/src/components/Section/SectionHeader.module.scss.d.ts b/packages/twenty-ui/src/components/layout/Section/SectionHeader.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/Section/SectionHeader.module.scss.d.ts
rename to packages/twenty-ui/src/components/layout/Section/SectionHeader.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/Section/SectionRoot.module.scss b/packages/twenty-ui/src/components/layout/Section/SectionRoot.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/Section/SectionRoot.module.scss
rename to packages/twenty-ui/src/components/layout/Section/SectionRoot.module.scss
diff --git a/packages/twenty-ui/src/components/Section/SectionRoot.module.scss.d.ts b/packages/twenty-ui/src/components/layout/Section/SectionRoot.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/Section/SectionRoot.module.scss.d.ts
rename to packages/twenty-ui/src/components/layout/Section/SectionRoot.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/Section/__stories__/Section.stories.tsx b/packages/twenty-ui/src/components/layout/Section/__stories__/Section.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/components/Section/__stories__/Section.stories.tsx
rename to packages/twenty-ui/src/components/layout/Section/__stories__/Section.stories.tsx
index 7c9f67acbca..79aca07b2a1 100644
--- a/packages/twenty-ui/src/components/Section/__stories__/Section.stories.tsx
+++ b/packages/twenty-ui/src/components/layout/Section/__stories__/Section.stories.tsx
@@ -1,4 +1,4 @@
-import { Section } from '@ui/components/Section/Section';
+import { Section } from '@ui/components/layout/Section/Section';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, within } from 'storybook/test';
diff --git a/packages/twenty-ui/src/components/Section/__tests__/SectionHeader.test.tsx b/packages/twenty-ui/src/components/layout/Section/__tests__/SectionHeader.test.tsx
similarity index 96%
rename from packages/twenty-ui/src/components/Section/__tests__/SectionHeader.test.tsx
rename to packages/twenty-ui/src/components/layout/Section/__tests__/SectionHeader.test.tsx
index 1afe106812e..d2a7a2c18a0 100644
--- a/packages/twenty-ui/src/components/Section/__tests__/SectionHeader.test.tsx
+++ b/packages/twenty-ui/src/components/layout/Section/__tests__/SectionHeader.test.tsx
@@ -1,4 +1,4 @@
-import { Section } from '@ui/components/Section/Section';
+import { Section } from '@ui/components/layout/Section/Section';
import { render, screen } from '@testing-library/react';
import { describe, expect, it } from 'vitest';
diff --git a/packages/twenty-ui/src/components/Section/__tests__/SectionRoot.test.tsx b/packages/twenty-ui/src/components/layout/Section/__tests__/SectionRoot.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/Section/__tests__/SectionRoot.test.tsx
rename to packages/twenty-ui/src/components/layout/Section/__tests__/SectionRoot.test.tsx
diff --git a/packages/twenty-ui/src/components/Section/internal/SectionHeader.tsx b/packages/twenty-ui/src/components/layout/Section/internal/SectionHeader.tsx
similarity index 93%
rename from packages/twenty-ui/src/components/Section/internal/SectionHeader.tsx
rename to packages/twenty-ui/src/components/layout/Section/internal/SectionHeader.tsx
index 85a41438ba4..8cdcb74c5be 100644
--- a/packages/twenty-ui/src/components/Section/internal/SectionHeader.tsx
+++ b/packages/twenty-ui/src/components/layout/Section/internal/SectionHeader.tsx
@@ -3,8 +3,8 @@ import { isNonEmptyString, isString } from '@sniptt/guards';
import { clsx } from 'clsx';
import { useId } from 'react';
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { Heading } from '@ui/primitives/typography/Heading/Heading';
+import { OverflowingTextWithTooltip } from '@ui/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { isDefined } from '@ui/utilities/utils/isDefined';
import { type SectionHeaderProps } from '../types/SectionHeaderProps';
diff --git a/packages/twenty-ui/src/components/Section/internal/SectionRoot.tsx b/packages/twenty-ui/src/components/layout/Section/internal/SectionRoot.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/Section/internal/SectionRoot.tsx
rename to packages/twenty-ui/src/components/layout/Section/internal/SectionRoot.tsx
diff --git a/packages/twenty-ui/src/components/Section/types/SectionHeaderProps.ts b/packages/twenty-ui/src/components/layout/Section/types/SectionHeaderProps.ts
similarity index 100%
rename from packages/twenty-ui/src/components/Section/types/SectionHeaderProps.ts
rename to packages/twenty-ui/src/components/layout/Section/types/SectionHeaderProps.ts
diff --git a/packages/twenty-ui/src/components/Section/types/SectionRootProps.ts b/packages/twenty-ui/src/components/layout/Section/types/SectionRootProps.ts
similarity index 100%
rename from packages/twenty-ui/src/components/Section/types/SectionRootProps.ts
rename to packages/twenty-ui/src/components/layout/Section/types/SectionRootProps.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/MenuItem.module.scss b/packages/twenty-ui/src/components/navigation/MenuItem/MenuItem.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/MenuItem.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuItem/MenuItem.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/MenuItem.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuItem/MenuItem.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/MenuItem.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/MenuItem.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/MenuItem.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/MenuItem.tsx
similarity index 62%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/MenuItem.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/MenuItem.tsx
index a9f6086cd2c..39a8b54721c 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/MenuItem.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/MenuItem.tsx
@@ -1,59 +1,18 @@
-import { IconChevronRight, type IconComponent } from '@ui/icon';
-import { type MouseEvent, type ReactNode } from 'react';
+import { IconChevronRight } from '@ui/icon';
+import { type MouseEvent } from 'react';
+import { type MenuItemProps } from './types/MenuItemProps';
-import { MenuItemHotKeys } from '@ui/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys';
-import { type ThemeColor } from '@ui/theme';
-import { useTheme } from '@ui/theme-constants';
-import { clsx } from 'clsx';
-import { type Nullable } from '@ui/utilities/types/Nullable';
-import { MenuItemLeftContent } from '@ui/primitives/navigation/MenuItem/parts/MenuItemLeftContent';
+import { MenuItemLeftContent } from '@ui/components/navigation/MenuItem/parts/MenuItemLeftContent';
import {
StyledHoverableMenuItemBase,
- StyledMenuItemIconCheck,
- StyledMenuItemLabel,
- StyledMenuItemLeftContent,
StyledMenuItemRightContent,
-} from '@ui/primitives/navigation/MenuItem/parts/StyledMenuItemBase';
-import { type MenuItemAccent } from '@ui/primitives/navigation/MenuItem/types/MenuItemAccent';
+} from '@ui/components/navigation/MenuItem/parts/StyledMenuItemBase';
+import { MenuItemHotKeys } from '@ui/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys';
+import { useTheme } from '@ui/theme-constants';
+import { clsx } from 'clsx';
import styles from './MenuItem.module.scss';
-export {
- MenuItemLeftContent,
- StyledHoverableMenuItemBase,
- StyledMenuItemIconCheck,
- StyledMenuItemLabel,
- StyledMenuItemLeftContent,
-};
-
-export type MenuItemProps = {
- accent?: MenuItemAccent;
- className?: string;
- withIconContainer?: boolean;
- withIconContainerBackground?: boolean;
- iconButtons?: ReactNode;
- isIconDisplayedOnHoverOnly?: boolean;
- isTooltipOpen?: boolean;
- LeftIcon?: IconComponent | null;
- iconThemeColor?: ThemeColor | null;
- LeftComponent?: ReactNode;
- RightIcon?: IconComponent | null;
- RightComponent?: ReactNode;
- onClick?: (event: MouseEvent<HTMLDivElement>) => void;
- onMouseEnter?: (event: MouseEvent<HTMLDivElement>) => void;
- onMouseLeave?: (event: MouseEvent<HTMLDivElement>) => void;
- testId?: string;
- disabled?: boolean;
- text: ReactNode;
- contextualTextPosition?: 'left' | 'right';
- contextualText?: ReactNode;
- hasSubMenu?: boolean;
- focused?: boolean;
- selected?: boolean;
- hotKeys?: Nullable<string[]>;
- isSubMenuOpened?: boolean;
-};
-
export const MenuItem = ({
accent = 'default',
className,
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/__stories__/MenuItem.stories.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/__stories__/MenuItem.stories.tsx
similarity index 97%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/__stories__/MenuItem.stories.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/__stories__/MenuItem.stories.tsx
index 6b534c0f18f..b428b4b6447 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/__stories__/MenuItem.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/__stories__/MenuItem.stories.tsx
@@ -1,17 +1,17 @@
import { ButtonGroup } from '@ui/primitives/input/ButtonGroup/ButtonGroup';
-import { LightIconButton } from '@ui/components/LightIconButton/LightIconButton';
+import { LightIconButton } from '@ui/components/input/LightIconButton/LightIconButton';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { action } from 'storybook/actions';
+import { MenuItem } from '@ui/components/navigation/MenuItem/MenuItem';
+import { type MenuItemAccent } from '@ui/components/navigation/MenuItem/types/MenuItemAccent';
import { IconBell } from '@ui/icon';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
- type CatalogStory,
ComponentDecorator,
+ type CatalogStory,
} from '@ui/testing';
-import { type MenuItemAccent } from '@ui/primitives/navigation/MenuItem/types/MenuItemAccent';
-import { MenuItem } from '@ui/primitives/navigation/MenuItem/MenuItem';
const meta: Meta<typeof MenuItem> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItem',
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/__tests__/MenuItemIconButtons.test.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/__tests__/MenuItemIconButtons.test.tsx
similarity index 89%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/__tests__/MenuItemIconButtons.test.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/__tests__/MenuItemIconButtons.test.tsx
index fadc4633e39..406fbd07ea9 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/__tests__/MenuItemIconButtons.test.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/__tests__/MenuItemIconButtons.test.tsx
@@ -2,12 +2,12 @@ import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, expect, it, vi } from 'vitest';
-import { LightIconButton } from '@ui/components/LightIconButton/LightIconButton';
+import { LightIconButton } from '@ui/components/input/LightIconButton/LightIconButton';
+import { MenuItem } from '@ui/components/navigation/MenuItem/MenuItem';
+import { MenuItemAvatar } from '@ui/components/navigation/MenuItemAvatar/MenuItemAvatar';
+import { MenuItemDraggable } from '@ui/components/navigation/MenuItemDraggable/MenuItemDraggable';
import { IconSearch, IconTrash } from '@ui/icon';
import { ButtonGroup } from '@ui/primitives/input/ButtonGroup/ButtonGroup';
-import { MenuItem } from '../MenuItem';
-import { MenuItemDraggable } from '@ui/primitives/navigation/MenuItemDraggable/MenuItemDraggable';
-import { MenuItemAvatar } from '@ui/primitives/navigation/MenuItemAvatar/MenuItemAvatar';
describe.each([
{ name: 'MenuItem', Component: MenuItem },
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/constants/DefaultColorLabels.ts b/packages/twenty-ui/src/components/navigation/MenuItem/constants/DefaultColorLabels.ts
similarity index 83%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/constants/DefaultColorLabels.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/constants/DefaultColorLabels.ts
index daa8524ff05..9c2e78dc3b6 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/constants/DefaultColorLabels.ts
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/constants/DefaultColorLabels.ts
@@ -1,6 +1,4 @@
-import { type ThemeColor } from '@ui/theme';
-
-export type ColorLabels = Record<ThemeColor, string>;
+import { type ColorLabels } from '../types/ColorLabels';
export const DEFAULT_COLOR_LABELS: ColorLabels = {
gray: 'Gray',
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIcon.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIcon.tsx
similarity index 88%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIcon.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIcon.tsx
index 23722eb32e6..65723d1bcee 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIcon.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIcon.tsx
@@ -1,9 +1,9 @@
-import { TintedIconTile } from '@ui/primitives/data-display';
+import { MenuItemIconBoxContainer } from '@ui/components/navigation/MenuItem/parts/MenuItemIconBoxContainer';
+import { TintedIconTile } from '@ui/components/data-display/TintedIconTile/TintedIconTile';
import { type IconComponent } from '@ui/icon';
import { type ThemeColor } from '@ui/theme';
import { useTheme } from '@ui/theme-constants';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { MenuItemIconBoxContainer } from '@ui/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer';
export type MenuItemIconProps = {
Icon: IconComponent | null | undefined;
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconBoxContainer.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconBoxContainer.tsx
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
similarity index 87%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
index bcee36a8ce6..6d3dc8f542a 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
@@ -1,10 +1,10 @@
-import { TintedIconTile } from '@ui/primitives/data-display';
-import { type IconComponent, IconGripVertical } from '@ui/icon';
+import { MenuItemIconBoxContainer } from '@ui/components/navigation/MenuItem/parts/MenuItemIconBoxContainer';
+import { TintedIconTile } from '@ui/components/data-display/TintedIconTile/TintedIconTile';
+import { IconGripVertical, type IconComponent } from '@ui/icon';
import { type ThemeColor } from '@ui/theme';
import { useTheme } from '@ui/theme-constants';
-import { clsx } from 'clsx';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { MenuItemIconBoxContainer } from '@ui/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer';
+import { clsx } from 'clsx';
import styles from './MenuItemIconWithGripSwap.module.scss';
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemLeftContent.module.scss b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemLeftContent.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemLeftContent.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemLeftContent.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemLeftContent.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemLeftContent.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemLeftContent.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemLeftContent.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemLeftContent.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemLeftContent.tsx
similarity index 88%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemLeftContent.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemLeftContent.tsx
index 2f476606969..2e468869a46 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/MenuItemLeftContent.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/parts/MenuItemLeftContent.tsx
@@ -1,21 +1,21 @@
import { isNonEmptyString, isString } from '@sniptt/guards';
import { type ReactNode } from 'react';
-import { type IconComponent, IconGripVertical } from '@ui/icon';
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces';
-import { type ThemeColor } from '@ui/theme';
-import { themeCssVariables, useTheme } from '@ui/theme-constants';
-import { type MenuItemDraggableGripMode } from '@ui/primitives/navigation/MenuItem/types/MenuItemDraggableGripMode';
-import { MenuItemIcon } from '@ui/primitives/navigation/MenuItem/parts/MenuItemIcon';
-import { MenuItemIconBoxContainer } from '@ui/primitives/navigation/MenuItem/parts/MenuItemIconBoxContainer';
-import { MenuItemIconWithGripSwap } from '@ui/primitives/navigation/MenuItem/parts/MenuItemIconWithGripSwap';
+import { MenuItemIcon } from '@ui/components/navigation/MenuItem/parts/MenuItemIcon';
+import { MenuItemIconBoxContainer } from '@ui/components/navigation/MenuItem/parts/MenuItemIconBoxContainer';
+import { MenuItemIconWithGripSwap } from '@ui/components/navigation/MenuItem/parts/MenuItemIconWithGripSwap';
import {
StyledDraggableItem,
StyledMenuItemContextualText,
StyledMenuItemLabel,
StyledMenuItemLeftContent,
StyledRightMenuItemContextualText,
-} from '@ui/primitives/navigation/MenuItem/parts/StyledMenuItemBase';
+} from '@ui/components/navigation/MenuItem/parts/StyledMenuItemBase';
+import { type MenuItemDraggableGripMode } from '@ui/components/navigation/MenuItem/types/MenuItemDraggableGripMode';
+import { OverflowingTextWithTooltip } from '@ui/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
+import { IconGripVertical, type IconComponent } from '@ui/icon';
+import { type ThemeColor } from '@ui/theme';
+import { themeCssVariables, useTheme } from '@ui/theme-constants';
import styles from './MenuItemLeftContent.module.scss';
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/StyledMenuItemBase.module.scss b/packages/twenty-ui/src/components/navigation/MenuItem/parts/StyledMenuItemBase.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/StyledMenuItemBase.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/StyledMenuItemBase.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/StyledMenuItemBase.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuItem/parts/StyledMenuItemBase.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/StyledMenuItemBase.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/StyledMenuItemBase.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/StyledMenuItemBase.tsx b/packages/twenty-ui/src/components/navigation/MenuItem/parts/StyledMenuItemBase.tsx
similarity index 98%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/parts/StyledMenuItemBase.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItem/parts/StyledMenuItemBase.tsx
index 8e270bc184d..336a37df6bb 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItem/parts/StyledMenuItemBase.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/parts/StyledMenuItemBase.tsx
@@ -1,8 +1,8 @@
import { clsx } from 'clsx';
import { type ComponentPropsWithoutRef, forwardRef } from 'react';
+import { type MenuItemAccent } from '@ui/components/navigation/MenuItem/types/MenuItemAccent';
import { IconCheck } from '@ui/icon';
-import { type MenuItemAccent } from '@ui/primitives/navigation/MenuItem/types/MenuItemAccent';
import styles from './StyledMenuItemBase.module.scss';
diff --git a/packages/twenty-ui/src/components/navigation/MenuItem/types/ColorLabels.ts b/packages/twenty-ui/src/components/navigation/MenuItem/types/ColorLabels.ts
new file mode 100644
index 00000000000..803a28e7662
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/types/ColorLabels.ts
@@ -0,0 +1,3 @@
+import { type ThemeColor } from '@ui/theme';
+
+export type ColorLabels = Record<ThemeColor, string>;
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/types/MenuItemAccent.ts b/packages/twenty-ui/src/components/navigation/MenuItem/types/MenuItemAccent.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/types/MenuItemAccent.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/types/MenuItemAccent.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItem/types/MenuItemDraggableGripMode.ts b/packages/twenty-ui/src/components/navigation/MenuItem/types/MenuItemDraggableGripMode.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItem/types/MenuItemDraggableGripMode.ts
rename to packages/twenty-ui/src/components/navigation/MenuItem/types/MenuItemDraggableGripMode.ts
diff --git a/packages/twenty-ui/src/components/navigation/MenuItem/types/MenuItemProps.ts b/packages/twenty-ui/src/components/navigation/MenuItem/types/MenuItemProps.ts
new file mode 100644
index 00000000000..a085ff9366b
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/MenuItem/types/MenuItemProps.ts
@@ -0,0 +1,33 @@
+import { type MenuItemAccent } from '@ui/components/navigation/MenuItem/types/MenuItemAccent';
+import { type IconComponent } from '@ui/icon';
+import { type ThemeColor } from '@ui/theme';
+import { type Nullable } from '@ui/utilities/types/Nullable';
+import { type MouseEvent, type ReactNode } from 'react';
+
+export type MenuItemProps = {
+ accent?: MenuItemAccent;
+ className?: string;
+ withIconContainer?: boolean;
+ withIconContainerBackground?: boolean;
+ iconButtons?: ReactNode;
+ isIconDisplayedOnHoverOnly?: boolean;
+ isTooltipOpen?: boolean;
+ LeftIcon?: IconComponent | null;
+ iconThemeColor?: ThemeColor | null;
+ LeftComponent?: ReactNode;
+ RightIcon?: IconComponent | null;
+ RightComponent?: ReactNode;
+ onClick?: (event: MouseEvent<HTMLDivElement>) => void;
+ onMouseEnter?: (event: MouseEvent<HTMLDivElement>) => void;
+ onMouseLeave?: (event: MouseEvent<HTMLDivElement>) => void;
+ testId?: string;
+ disabled?: boolean;
+ text: ReactNode;
+ contextualTextPosition?: 'left' | 'right';
+ contextualText?: ReactNode;
+ hasSubMenu?: boolean;
+ focused?: boolean;
+ selected?: boolean;
+ hotKeys?: Nullable<string[]>;
+ isSubMenuOpened?: boolean;
+};
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemAvatar/MenuItemAvatar.tsx b/packages/twenty-ui/src/components/navigation/MenuItemAvatar/MenuItemAvatar.tsx
similarity index 56%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemAvatar/MenuItemAvatar.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItemAvatar/MenuItemAvatar.tsx
index 48ef5b6fac8..d4dd2d37ea4 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItemAvatar/MenuItemAvatar.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItemAvatar/MenuItemAvatar.tsx
@@ -1,28 +1,7 @@
+import { MenuItem } from '@ui/components/navigation/MenuItem/MenuItem';
import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
-import { type AvatarProps } from '@ui/primitives/data-display/Avatar/types/AvatarProps';
-import { MenuItem } from '@ui/primitives/navigation/MenuItem/MenuItem';
-import { type MouseEvent, type ReactNode } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { type MenuItemAccent } from '@ui/primitives/navigation/MenuItem/types/MenuItemAccent';
-
-export type MenuItemAvatarProps = {
- accent?: MenuItemAccent;
- className?: string;
- iconButtons?: ReactNode;
- isIconDisplayedOnHoverOnly?: boolean;
- isTooltipOpen?: boolean;
- avatar?: Pick<
- AvatarProps,
- 'src' | 'colorSeed' | 'name' | 'size' | 'shape'
- > | null;
- onClick?: (event: MouseEvent<HTMLDivElement>) => void;
- onMouseEnter?: (event: MouseEvent<HTMLDivElement>) => void;
- onMouseLeave?: (event: MouseEvent<HTMLDivElement>) => void;
- testId?: string;
- text: string;
- hasSubMenu?: boolean;
- contextualText?: ReactNode;
-};
+import { type MenuItemAvatarProps } from './types/MenuItemAvatarProps';
export const MenuItemAvatar = ({
accent = 'default',
diff --git a/packages/twenty-ui/src/components/navigation/MenuItemAvatar/types/MenuItemAvatarProps.ts b/packages/twenty-ui/src/components/navigation/MenuItemAvatar/types/MenuItemAvatarProps.ts
new file mode 100644
index 00000000000..31602dcfa70
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/MenuItemAvatar/types/MenuItemAvatarProps.ts
@@ -0,0 +1,22 @@
+import { type MenuItemAccent } from '@ui/components/navigation/MenuItem/types/MenuItemAccent';
+import { type AvatarProps } from '@ui/primitives/data-display/Avatar/types/AvatarProps';
+import { type MouseEvent, type ReactNode } from 'react';
+
+export type MenuItemAvatarProps = {
+ accent?: MenuItemAccent;
+ className?: string;
+ iconButtons?: ReactNode;
+ isIconDisplayedOnHoverOnly?: boolean;
+ isTooltipOpen?: boolean;
+ avatar?: Pick<
+ AvatarProps,
+ 'src' | 'colorSeed' | 'name' | 'size' | 'shape'
+ > | null;
+ onClick?: (event: MouseEvent<HTMLDivElement>) => void;
+ onMouseEnter?: (event: MouseEvent<HTMLDivElement>) => void;
+ onMouseLeave?: (event: MouseEvent<HTMLDivElement>) => void;
+ testId?: string;
+ text: string;
+ hasSubMenu?: boolean;
+ contextualText?: ReactNode;
+};
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemDraggable/MenuItemDraggable.tsx b/packages/twenty-ui/src/components/navigation/MenuItemDraggable/MenuItemDraggable.tsx
similarity index 57%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemDraggable/MenuItemDraggable.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItemDraggable/MenuItemDraggable.tsx
index 029d0b74657..e85984d6abd 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItemDraggable/MenuItemDraggable.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItemDraggable/MenuItemDraggable.tsx
@@ -1,29 +1,9 @@
-import { MenuItemLeftContent } from '@ui/primitives/navigation/MenuItem/parts/MenuItemLeftContent';
+import { MenuItemLeftContent } from '@ui/components/navigation/MenuItem/parts/MenuItemLeftContent';
import {
StyledHoverableMenuItemBase,
StyledMenuItemRightContent,
-} from '@ui/primitives/navigation/MenuItem/parts/StyledMenuItemBase';
-import { type MenuItemAccent } from '@ui/primitives/navigation/MenuItem/types/MenuItemAccent';
-
-import { type IconComponent } from '@ui/icon';
-import { type ReactNode } from 'react';
-import { type MenuItemDraggableGripMode } from '@ui/primitives/navigation/MenuItem/types/MenuItemDraggableGripMode';
-
-export type MenuItemDraggableProps = {
- LeftIcon?: IconComponent | undefined;
- withIconContainer?: boolean;
- accent?: MenuItemAccent;
- iconButtons?: ReactNode;
- isTooltipOpen?: boolean;
- onClick?: () => void;
- text: ReactNode;
- contextualText?: ReactNode;
- className?: string;
- isIconDisplayedOnHoverOnly?: boolean;
- gripMode?: MenuItemDraggableGripMode;
- isDragDisabled?: boolean;
- isHoverDisabled?: boolean;
-};
+} from '@ui/components/navigation/MenuItem/parts/StyledMenuItemBase';
+import { type MenuItemDraggableProps } from './types/MenuItemDraggableProps';
export const MenuItemDraggable = ({
LeftIcon,
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx b/packages/twenty-ui/src/components/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
index 73ac8ed4219..c360cf21035 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
@@ -1,17 +1,17 @@
-import { LightIconButton } from '@ui/components/LightIconButton/LightIconButton';
+import { LightIconButton } from '@ui/components/input/LightIconButton/LightIconButton';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { action } from 'storybook/actions';
+import { type MenuItemAccent } from '@ui/components/navigation/MenuItem/types/MenuItemAccent';
+import { MenuItemDraggable } from '@ui/components/navigation/MenuItemDraggable/MenuItemDraggable';
import { IconBell, IconMinus } from '@ui/icon';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
+ ComponentDecorator,
type CatalogDimension,
type CatalogOptions,
- ComponentDecorator,
} from '@ui/testing';
-import { type MenuItemAccent } from '@ui/primitives/navigation/MenuItem/types/MenuItemAccent';
-import { MenuItemDraggable } from '@ui/primitives/navigation/MenuItemDraggable/MenuItemDraggable';
const meta: Meta<typeof MenuItemDraggable> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemDraggable',
diff --git a/packages/twenty-ui/src/components/navigation/MenuItemDraggable/types/MenuItemDraggableProps.ts b/packages/twenty-ui/src/components/navigation/MenuItemDraggable/types/MenuItemDraggableProps.ts
new file mode 100644
index 00000000000..55dce59158b
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/MenuItemDraggable/types/MenuItemDraggableProps.ts
@@ -0,0 +1,20 @@
+import { type MenuItemAccent } from '@ui/components/navigation/MenuItem/types/MenuItemAccent';
+import { type MenuItemDraggableGripMode } from '@ui/components/navigation/MenuItem/types/MenuItemDraggableGripMode';
+import { type IconComponent } from '@ui/icon';
+import { type ReactNode } from 'react';
+
+export type MenuItemDraggableProps = {
+ LeftIcon?: IconComponent | undefined;
+ withIconContainer?: boolean;
+ accent?: MenuItemAccent;
+ iconButtons?: ReactNode;
+ isTooltipOpen?: boolean;
+ onClick?: () => void;
+ text: ReactNode;
+ contextualText?: ReactNode;
+ className?: string;
+ isIconDisplayedOnHoverOnly?: boolean;
+ gripMode?: MenuItemDraggableGripMode;
+ isDragDisabled?: boolean;
+ isHoverDisabled?: boolean;
+};
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss b/packages/twenty-ui/src/components/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx b/packages/twenty-ui/src/components/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
similarity index 75%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
rename to packages/twenty-ui/src/components/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
index 11438fea636..c68d48a3443 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
@@ -1,25 +1,14 @@
import { clsx } from 'clsx';
import { type MouseEvent } from 'react';
+import { type MenuItemSuggestionProps } from './types/MenuItemSuggestionProps';
+import { MenuItemLeftContent } from '@ui/components/navigation/MenuItem/parts/MenuItemLeftContent';
+import { StyledMenuItemLeftContent } from '@ui/components/navigation/MenuItem/parts/StyledMenuItemBase';
import { handleClickableElementKeyDown } from '@ui/primitives/accessibility/utils/handleClickableElementKeyDown';
-import { type IconComponent } from '@ui/icon';
-import { MenuItemLeftContent } from '@ui/primitives/navigation/MenuItem/parts/MenuItemLeftContent';
-import { StyledMenuItemLeftContent } from '@ui/primitives/navigation/MenuItem/parts/StyledMenuItemBase';
import { isDefined } from '@ui/utilities/utils/isDefined';
import styles from './MenuItemSuggestion.module.scss';
-export type MenuItemSuggestionProps = {
- LeftIcon?: IconComponent | null;
- withIconContainer?: boolean;
- text: string;
- contextualText?: string;
- contextualTextPosition?: 'left' | 'right';
- selected?: boolean;
- className?: string;
- onClick?: (event: MouseEvent<HTMLLIElement>) => void;
-};
-
export const MenuItemSuggestion = ({
LeftIcon,
withIconContainer = false,
diff --git a/packages/twenty-ui/src/components/navigation/MenuItemSuggestion/types/MenuItemSuggestionProps.ts b/packages/twenty-ui/src/components/navigation/MenuItemSuggestion/types/MenuItemSuggestionProps.ts
new file mode 100644
index 00000000000..8b1a2e9d664
--- /dev/null
+++ b/packages/twenty-ui/src/components/navigation/MenuItemSuggestion/types/MenuItemSuggestionProps.ts
@@ -0,0 +1,13 @@
+import { type IconComponent } from '@ui/icon';
+import { type MouseEvent } from 'react';
+
+export type MenuItemSuggestionProps = {
+ LeftIcon?: IconComponent | null;
+ withIconContainer?: boolean;
+ text: string;
+ contextualText?: string;
+ contextualTextPosition?: 'left' | 'right';
+ selected?: boolean;
+ className?: string;
+ onClick?: (event: MouseEvent<HTMLLIElement>) => void;
+};
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/MenuPicker.module.scss b/packages/twenty-ui/src/components/navigation/MenuPicker/MenuPicker.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuPicker/MenuPicker.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuPicker/MenuPicker.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/MenuPicker.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuPicker/MenuPicker.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuPicker/MenuPicker.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuPicker/MenuPicker.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/MenuPicker.tsx b/packages/twenty-ui/src/components/navigation/MenuPicker/MenuPicker.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuPicker/MenuPicker.tsx
rename to packages/twenty-ui/src/components/navigation/MenuPicker/MenuPicker.tsx
index 9873b29133f..814029f131e 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuPicker/MenuPicker.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuPicker/MenuPicker.tsx
@@ -1,6 +1,6 @@
import { isNonEmptyString } from '@sniptt/guards';
-import { clsx } from 'clsx';
import { isDefined } from '@ui/utilities/utils/isDefined';
+import { clsx } from 'clsx';
import { Tooltip } from '@ui/primitives/surfaces/Tooltip/Tooltip';
import { useTheme } from '@ui/theme-constants';
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss b/packages/twenty-ui/src/components/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
rename to packages/twenty-ui/src/components/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx b/packages/twenty-ui/src/components/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
similarity index 97%
rename from packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
rename to packages/twenty-ui/src/components/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
index b1e2b3c6d60..708e1cba0a6 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
@@ -1,7 +1,7 @@
-import { Heading } from '@ui/primitives/typography/Heading/Heading';
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { MenuPicker } from '@ui/components/navigation/MenuPicker/MenuPicker';
import { IconChartPie } from '@ui/icon';
-import { MenuPicker } from '@ui/primitives/navigation/MenuPicker/MenuPicker';
+import { Heading } from '@ui/primitives/typography/Heading/Heading';
import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
import { type ReactNode } from 'react';
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/types/MenuPickerProps.ts b/packages/twenty-ui/src/components/navigation/MenuPicker/types/MenuPickerProps.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuPicker/types/MenuPickerProps.ts
rename to packages/twenty-ui/src/components/navigation/MenuPicker/types/MenuPickerProps.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/NavigationBar/NavigationBar.module.scss b/packages/twenty-ui/src/components/navigation/NavigationBar/NavigationBar.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/NavigationBar/NavigationBar.module.scss
rename to packages/twenty-ui/src/components/navigation/NavigationBar/NavigationBar.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/NavigationBar/NavigationBar.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/NavigationBar/NavigationBar.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/NavigationBar/NavigationBar.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/NavigationBar/NavigationBar.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/NavigationBar/NavigationBar.tsx b/packages/twenty-ui/src/components/navigation/NavigationBar/NavigationBar.tsx
similarity index 86%
rename from packages/twenty-ui/src/primitives/navigation/NavigationBar/NavigationBar.tsx
rename to packages/twenty-ui/src/components/navigation/NavigationBar/NavigationBar.tsx
index 33dffdd3497..e6c4be86b4b 100644
--- a/packages/twenty-ui/src/primitives/navigation/NavigationBar/NavigationBar.tsx
+++ b/packages/twenty-ui/src/components/navigation/NavigationBar/NavigationBar.tsx
@@ -1,6 +1,6 @@
import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { NavigationBarItem } from '@ui/primitives/navigation/NavigationBarItem/NavigationBarItem';
+import { NavigationBarItem } from '@ui/components/navigation/NavigationBar/internal/NavigationBarItem/NavigationBarItem';
import styles from './NavigationBar.module.scss';
diff --git a/packages/twenty-ui/src/primitives/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx b/packages/twenty-ui/src/components/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
similarity index 96%
rename from packages/twenty-ui/src/primitives/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
rename to packages/twenty-ui/src/components/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
index 9c14385a194..c5508cb5105 100644
--- a/packages/twenty-ui/src/primitives/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
@@ -3,7 +3,7 @@ import { IconHome, IconSearch, IconSettings } from '@ui/icon';
import { ComponentDecorator } from '@ui/testing';
import { expect, fn, userEvent, within } from 'storybook/test';
-import { NavigationBar } from '@ui/primitives/navigation/NavigationBar/NavigationBar';
+import { NavigationBar } from '@ui/components/navigation/NavigationBar/NavigationBar';
const meta: Meta<typeof NavigationBar> = {
title: 'UI/Navigation/NavigationBar/NavigationBar',
diff --git a/packages/twenty-ui/src/primitives/navigation/NavigationBarItem/NavigationBarItem.module.scss b/packages/twenty-ui/src/components/navigation/NavigationBar/internal/NavigationBarItem/NavigationBarItem.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/NavigationBarItem/NavigationBarItem.module.scss
rename to packages/twenty-ui/src/components/navigation/NavigationBar/internal/NavigationBarItem/NavigationBarItem.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/NavigationBarItem/NavigationBarItem.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/NavigationBar/internal/NavigationBarItem/NavigationBarItem.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/NavigationBarItem/NavigationBarItem.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/NavigationBar/internal/NavigationBarItem/NavigationBarItem.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/NavigationBarItem/NavigationBarItem.tsx b/packages/twenty-ui/src/components/navigation/NavigationBar/internal/NavigationBarItem/NavigationBarItem.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/NavigationBarItem/NavigationBarItem.tsx
rename to packages/twenty-ui/src/components/navigation/NavigationBar/internal/NavigationBarItem/NavigationBarItem.tsx
diff --git a/packages/twenty-ui/src/primitives/navigation/RoundedLink/RoundedLink.module.scss b/packages/twenty-ui/src/components/navigation/RoundedLink/RoundedLink.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/RoundedLink/RoundedLink.module.scss
rename to packages/twenty-ui/src/components/navigation/RoundedLink/RoundedLink.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/RoundedLink/RoundedLink.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/RoundedLink/RoundedLink.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/RoundedLink/RoundedLink.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/RoundedLink/RoundedLink.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/RoundedLink/RoundedLink.tsx b/packages/twenty-ui/src/components/navigation/RoundedLink/RoundedLink.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/RoundedLink/RoundedLink.tsx
rename to packages/twenty-ui/src/components/navigation/RoundedLink/RoundedLink.tsx
diff --git a/packages/twenty-ui/src/primitives/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx b/packages/twenty-ui/src/components/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/primitives/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
rename to packages/twenty-ui/src/components/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
index 6a9735791a7..02081642247 100644
--- a/packages/twenty-ui/src/primitives/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, within } from 'storybook/test';
+import { RoundedLink } from '@ui/components/navigation/RoundedLink/RoundedLink';
import { ComponentWithRouterDecorator } from '@ui/testing';
-import { RoundedLink } from '@ui/primitives/navigation/RoundedLink/RoundedLink';
const meta: Meta<typeof RoundedLink> = {
title: 'UI/Navigation/Link/RoundedLink',
diff --git a/packages/twenty-ui/src/components/TabButton/TabButton.module.scss b/packages/twenty-ui/src/components/navigation/TabButton/TabButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/TabButton/TabButton.module.scss
rename to packages/twenty-ui/src/components/navigation/TabButton/TabButton.module.scss
diff --git a/packages/twenty-ui/src/components/TabButton/TabButton.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/TabButton/TabButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/TabButton/TabButton.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/TabButton/TabButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/TabButton/TabButton.tsx b/packages/twenty-ui/src/components/navigation/TabButton/TabButton.tsx
similarity index 81%
rename from packages/twenty-ui/src/components/TabButton/TabButton.tsx
rename to packages/twenty-ui/src/components/navigation/TabButton/TabButton.tsx
index 1248325b6db..f5d8ff2937c 100644
--- a/packages/twenty-ui/src/components/TabButton/TabButton.tsx
+++ b/packages/twenty-ui/src/components/navigation/TabButton/TabButton.tsx
@@ -1,10 +1,10 @@
import { clsx } from 'clsx';
import { Button } from '@ui/primitives/input/Button/Button';
-import { TabsTabContent } from '@ui/primitives/navigation/Tabs/internal/TabsTabContent';
+import { TabsTabContent } from '@ui/primitives/navigation/internal/tab/TabsTabContent';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
-import tabStyles from '@ui/primitives/navigation/Tabs/Tabs.module.scss';
+import tabStyles from '@ui/primitives/navigation/internal/tab/Tab.module.scss';
import styles from './TabButton.module.scss';
import { type TabButtonProps } from './types/TabButtonProps';
diff --git a/packages/twenty-ui/src/components/TabButton/__stories__/TabButton.stories.module.scss b/packages/twenty-ui/src/components/navigation/TabButton/__stories__/TabButton.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/TabButton/__stories__/TabButton.stories.module.scss
rename to packages/twenty-ui/src/components/navigation/TabButton/__stories__/TabButton.stories.module.scss
diff --git a/packages/twenty-ui/src/components/TabButton/__stories__/TabButton.stories.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/TabButton/__stories__/TabButton.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/TabButton/__stories__/TabButton.stories.module.scss.d.ts
rename to packages/twenty-ui/src/components/navigation/TabButton/__stories__/TabButton.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/TabButton/__stories__/TabButton.stories.tsx b/packages/twenty-ui/src/components/navigation/TabButton/__stories__/TabButton.stories.tsx
similarity index 99%
rename from packages/twenty-ui/src/components/TabButton/__stories__/TabButton.stories.tsx
rename to packages/twenty-ui/src/components/navigation/TabButton/__stories__/TabButton.stories.tsx
index f886f7da0a7..a6697fcde8d 100644
--- a/packages/twenty-ui/src/components/TabButton/__stories__/TabButton.stories.tsx
+++ b/packages/twenty-ui/src/components/navigation/TabButton/__stories__/TabButton.stories.tsx
@@ -1,4 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { TabButton } from '@ui/components/navigation/TabButton/TabButton';
import {
IconCheckbox,
IconChevronDown,
@@ -7,18 +8,17 @@ import {
IconSettings,
IconUser,
} from '@ui/icon';
-import { TabButton } from '@ui/components/TabButton/TabButton';
+import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
+import { Pill } from '@ui/primitives/data-display/Pill/Pill';
+import { Tabs } from '@ui/primitives/navigation/Tabs/Tabs';
import {
A11Y_DEFER_COLOR_CONTRAST,
AVATAR_URL_MOCK,
CatalogDecorator,
- type CatalogStory,
ComponentDecorator,
+ type CatalogStory,
} from '@ui/testing';
import { type ReactNode } from 'react';
-import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
-import { Tabs } from '@ui/primitives/navigation/Tabs/Tabs';
-import { Pill } from '@ui/primitives/data-display/Pill/Pill';
import { expect, fn, userEvent, within } from 'storybook/test';
import styles from './TabButton.stories.module.scss';
diff --git a/packages/twenty-ui/src/components/TabButton/__tests__/TabButton.test.tsx b/packages/twenty-ui/src/components/navigation/TabButton/__tests__/TabButton.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/components/TabButton/__tests__/TabButton.test.tsx
rename to packages/twenty-ui/src/components/navigation/TabButton/__tests__/TabButton.test.tsx
diff --git a/packages/twenty-ui/src/components/TabButton/types/TabButtonProps.ts b/packages/twenty-ui/src/components/navigation/TabButton/types/TabButtonProps.ts
similarity index 100%
rename from packages/twenty-ui/src/components/TabButton/types/TabButtonProps.ts
rename to packages/twenty-ui/src/components/navigation/TabButton/types/TabButtonProps.ts
diff --git a/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx b/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx
index 953cef32bda..a9bd3b28aa6 100644
--- a/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx
+++ b/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx
@@ -1,4 +1,4 @@
-import { Section } from '@ui/components/Section/Section';
+import { Section } from '@ui/components/layout/Section/Section';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import * as publicIconExports from '@ui/icon';
diff --git a/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.module.scss b/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.module.scss
deleted file mode 100644
index 5f721ddb07a..00000000000
--- a/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.module.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.root {
- position: absolute;
- width: 1px;
- height: 1px;
- padding: 0;
- margin: -1px;
- overflow: hidden;
- clip: rect(0, 0, 0, 0);
- white-space: nowrap;
- border-width: 0;
-}
diff --git a/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.module.scss.d.ts b/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.module.scss.d.ts
deleted file mode 100644
index 4d6743c3dcd..00000000000
--- a/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly root: 'root';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.tsx b/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.tsx
deleted file mode 100644
index 916339c86d6..00000000000
--- a/packages/twenty-ui/src/primitives/accessibility/components/VisibilityHiddenInput.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { clsx } from 'clsx';
-import { forwardRef } from 'react';
-
-import styles from './VisibilityHiddenInput.module.scss';
-
-// The deprecated Linaria styled.input forwarded refs and accepted all native
-// input props, so the port preserves that contract.
-export const VisibilityHiddenInput = forwardRef<
- HTMLInputElement,
- React.ComponentPropsWithoutRef<'input'>
->(({ className, ...props }, ref) => (
- <input ref={ref} className={clsx(styles.root, className)} {...props} />
-));
-
-VisibilityHiddenInput.displayName = 'VisibilityHiddenInput';
diff --git a/packages/twenty-ui/src/primitives/accessibility/index.ts b/packages/twenty-ui/src/primitives/accessibility/index.ts
index ebf8674bc48..3773afc0e0f 100644
--- a/packages/twenty-ui/src/primitives/accessibility/index.ts
+++ b/packages/twenty-ui/src/primitives/accessibility/index.ts
@@ -8,5 +8,4 @@
*/
export { VisibilityHidden } from './components/VisibilityHidden';
-export { VisibilityHiddenInput } from './components/VisibilityHiddenInput';
export { handleClickableElementKeyDown } from './utils/handleClickableElementKeyDown';
diff --git a/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.module.scss b/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.module.scss
deleted file mode 100644
index 18a111b0023..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.module.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.animatedPath {
- animation: draw-checkmark var(--animated-checkmark-duration, 0.5s) ease
- forwards;
-}
-
-@keyframes draw-checkmark {
- from {
- stroke-dashoffset: 1;
- }
-
- to {
- stroke-dashoffset: 0;
- }
-}
diff --git a/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.module.scss.d.ts b/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.module.scss.d.ts
deleted file mode 100644
index 969d1bc3e19..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/AnimatedCheckmark/AnimatedCheckmark.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly animatedPath: 'animatedPath';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.module.scss b/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.module.scss
deleted file mode 100644
index 1d3501f3b82..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.module.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.iconWithBackgroundContainer {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 14px;
- height: 14px;
- border-radius: var(--t-border-radius-sm);
- background-color: var(
- --avatar-or-icon-background,
- var(--t-background-inverted-secondary)
- );
-}
-
-.wrapper {
- cursor: inherit;
- display: flex;
-
- &[data-clickable] {
- cursor: pointer;
- }
-}
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.module.scss.d.ts b/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.module.scss.d.ts
deleted file mode 100644
index 545cc9c2ae3..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/AvatarOrIcon.module.scss.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const classNames: {
- readonly iconWithBackgroundContainer: 'iconWithBackgroundContainer';
- readonly wrapper: 'wrapper';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/types/AvatarOrIconProps.ts b/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/types/AvatarOrIconProps.ts
deleted file mode 100644
index 36f76009af4..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/AvatarOrIcon/types/AvatarOrIconProps.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { type AvatarProps } from '@ui/primitives/data-display/Avatar/types/AvatarProps';
-import { type AvatarShape } from '@ui/primitives/data-display/Avatar/types/AvatarShape';
-import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { type Nullable } from '@ui/utilities';
-
-export type AvatarOrIconProps = Pick<
- AvatarProps,
- 'src' | 'name' | 'colorSeed'
-> & {
- shape?: Nullable<AvatarShape>;
- Icon?: IconComponent;
- IconColor?: string;
- IconBackgroundColor?: string;
- isIconInverted?: boolean;
- onClick?: () => void;
-};
diff --git a/packages/twenty-ui/src/primitives/data-display/Chip/Chip.tsx b/packages/twenty-ui/src/primitives/data-display/Chip/Chip.tsx
index 3c44d6ac6d4..2f4e72c537b 100644
--- a/packages/twenty-ui/src/primitives/data-display/Chip/Chip.tsx
+++ b/packages/twenty-ui/src/primitives/data-display/Chip/Chip.tsx
@@ -3,7 +3,7 @@ import { useRender } from '@base-ui/react/use-render';
import { clsx } from 'clsx';
import { type CSSProperties } from 'react';
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
+import { OverflowingTextWithTooltip } from '@ui/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { isDefined } from '@ui/utilities/utils/isDefined';
import styles from './Chip.module.scss';
diff --git a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.module.scss b/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.module.scss
deleted file mode 100644
index acbd3b63b66..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.module.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.ellipsis {
- align-items: center;
- display: flex;
- height: 20px;
- max-width: 100%;
- width: 100%;
-}
diff --git a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.module.scss.d.ts b/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.module.scss.d.ts
deleted file mode 100644
index f37f71a55e6..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/EllipsisDisplay/EllipsisDisplay.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly ellipsis: 'ellipsis';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.module.scss b/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.module.scss
deleted file mode 100644
index e5da170d022..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.module.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.linkContainer {
- display: inline-flex;
- min-width: 0;
- vertical-align: middle;
-
- & > a {
- max-width: 100%;
- min-width: 0;
- text-decoration: none;
- }
-}
diff --git a/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.module.scss.d.ts b/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.module.scss.d.ts
deleted file mode 100644
index b084afd07e1..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/LinkChip/LinkChip.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly linkContainer: 'linkContainer';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/data-display/NumberDisplay/NumberDisplay.tsx b/packages/twenty-ui/src/primitives/data-display/NumberDisplay/NumberDisplay.tsx
deleted file mode 100644
index e9cbbc1fc39..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/NumberDisplay/NumberDisplay.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { EllipsisDisplay } from '@ui/primitives/data-display/EllipsisDisplay/EllipsisDisplay';
-
-type NumberDisplayProps = {
- value: string | number | null | undefined;
- decimals?: number;
-};
-
-export const NumberDisplay = ({ value }: NumberDisplayProps) => (
- <EllipsisDisplay>{value}</EllipsisDisplay>
-);
diff --git a/packages/twenty-ui/src/primitives/data-display/NumberDisplay/__stories__/NumberDisplay.stories.tsx b/packages/twenty-ui/src/primitives/data-display/NumberDisplay/__stories__/NumberDisplay.stories.tsx
deleted file mode 100644
index b607b756e29..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/NumberDisplay/__stories__/NumberDisplay.stories.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-
-import { ComponentDecorator } from '@ui/testing';
-
-import { NumberDisplay } from '@ui/primitives/data-display/NumberDisplay/NumberDisplay';
-
-const meta: Meta<typeof NumberDisplay> = {
- title: 'UI/Data Display/NumberDisplay',
- component: NumberDisplay,
- decorators: [ComponentDecorator],
-};
-
-export default meta;
-
-type Story = StoryObj<typeof NumberDisplay>;
-
-export const Default: Story = {
- args: {
- value: 42,
- },
-};
diff --git a/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.ts b/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.ts
index 83cb48d2c11..3700321e0d3 100644
--- a/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.ts
+++ b/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.ts
@@ -1,8 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { Pill } from '@ui/primitives/data-display/Pill/Pill';
-import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing';
-import { ComponentDecorator } from '../../../../testing/decorators/ComponentDecorator';
+import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
const meta: Meta<typeof Pill> = {
title: 'UI/Data Display/Pill',
diff --git a/packages/twenty-ui/src/primitives/data-display/Tag/Tag.tsx b/packages/twenty-ui/src/primitives/data-display/Tag/Tag.tsx
index d71cf3d802d..55e11ba2c23 100644
--- a/packages/twenty-ui/src/primitives/data-display/Tag/Tag.tsx
+++ b/packages/twenty-ui/src/primitives/data-display/Tag/Tag.tsx
@@ -7,7 +7,7 @@ import {
type SyntheticEvent,
} from 'react';
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
+import { OverflowingTextWithTooltip } from '@ui/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { themeCssVariables } from '@ui/theme-constants';
import { isDefined } from '@ui/utilities/utils/isDefined';
diff --git a/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.module.scss b/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.module.scss
deleted file mode 100644
index 784ed8b118e..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.module.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.container {
- align-items: center;
- display: flex;
- height: auto;
-}
-
-.fixHeight {
- height: 20px;
-}
diff --git a/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.module.scss.d.ts b/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.module.scss.d.ts
deleted file mode 100644
index 0e0ad354d4d..00000000000
--- a/packages/twenty-ui/src/primitives/data-display/TextDisplay/TextDisplay.module.scss.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
- readonly fixHeight: 'fixHeight';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/data-display/index.ts b/packages/twenty-ui/src/primitives/data-display/index.ts
index 7876ee3ad89..e423fe3fe9c 100644
--- a/packages/twenty-ui/src/primitives/data-display/index.ts
+++ b/packages/twenty-ui/src/primitives/data-display/index.ts
@@ -7,21 +7,12 @@
* |___/
*/
-export type { AnimatedCheckmarkProps } from './AnimatedCheckmark/AnimatedCheckmark';
-export { AnimatedCheckmark } from './AnimatedCheckmark/AnimatedCheckmark';
export { Avatar } from './Avatar/Avatar';
export { AVATAR_PROPERTIES_BY_SIZE } from './Avatar/constants/AvatarPropertiesBySize';
export type { AvatarProps } from './Avatar/types/AvatarProps';
export type { AvatarShape } from './Avatar/types/AvatarShape';
export type { AvatarSize } from './Avatar/types/AvatarSize';
-export type { AvatarGroupProps } from './AvatarGroup/AvatarGroup';
-export { AvatarGroup } from './AvatarGroup/AvatarGroup';
-export { AvatarOrIcon } from './AvatarOrIcon/AvatarOrIcon';
-export type { AvatarOrIconProps } from './AvatarOrIcon/types/AvatarOrIconProps';
-export type { CheckmarkProps } from './Checkmark/Checkmark';
-export { Checkmark } from './Checkmark/Checkmark';
export { Chip } from './Chip/Chip';
-export { LINK_CHIP_CLICK_OUTSIDE_ID } from './Chip/constants/LinkChipClickOutsideId';
export type { ChipProps } from './Chip/types/ChipProps';
export type { ChipSize } from './Chip/types/ChipSize';
export type { ChipVariant } from './Chip/types/ChipVariant';
@@ -30,23 +21,9 @@ export type {
ColorSampleProps,
} from './ColorSample/ColorSample';
export { ColorSample } from './ColorSample/ColorSample';
-export { CommandBlock } from './CommandBlock/CommandBlock';
-export { EllipsisDisplay } from './EllipsisDisplay/EllipsisDisplay';
-export { JsonDisplay } from './JsonDisplay/JsonDisplay';
-export type { LinkChipProps } from './LinkChip/LinkChip';
-export { LinkChip } from './LinkChip/LinkChip';
-export { NotificationCounter } from './NotificationCounter/NotificationCounter';
-export { NumberDisplay } from './NumberDisplay/NumberDisplay';
export { Pill } from './Pill/Pill';
-export { SelectDisplay } from './SelectDisplay/SelectDisplay';
export { Status } from './Status/Status';
export type { StatusProps } from './Status/types/StatusProps';
-export { StyledTintedIconTileContainer } from './StyledTintedIconTileContainer/StyledTintedIconTileContainer';
export { Tag } from './Tag/Tag';
export type { TagColor } from './Tag/types/TagColor';
export type { TagProps } from './Tag/types/TagProps';
-export { TextDisplay } from './TextDisplay/TextDisplay';
-export type { TintedIconTileProps } from './TintedIconTile/TintedIconTile';
-export { TintedIconTile } from './TintedIconTile/TintedIconTile';
-export type { IconTileColorShades } from './TintedIconTile/utils/getIconTileColorShades';
-export { getIconTileColorShades } from './TintedIconTile/utils/getIconTileColorShades';
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss.d.ts b/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss.d.ts
deleted file mode 100644
index 67b3c4492d6..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
- readonly backgroundImage: 'backgroundImage';
- readonly backgroundImageLarge: 'backgroundImageLarge';
- readonly movingImage: 'movingImage';
- readonly movingImageLarge: 'movingImageLarge';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/types/AnimatedPlaceholderType.ts b/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/types/AnimatedPlaceholderType.ts
deleted file mode 100644
index f9ae8d476da..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/AnimatedPlaceholder/types/AnimatedPlaceholderType.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { type BACKGROUND } from '@ui/primitives/feedback/AnimatedPlaceholder/constants/Background';
-import { type MOVING_IMAGE } from '@ui/primitives/feedback/AnimatedPlaceholder/constants/MovingImage';
-
-export type AnimatedPlaceholderType =
- | keyof typeof BACKGROUND
- | keyof typeof MOVING_IMAGE;
diff --git a/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx b/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx
index 9371acecb83..60c1a016716 100644
--- a/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx
+++ b/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx
@@ -8,7 +8,6 @@ import {
ComponentDecorator,
} from '@ui/testing';
import { Button } from '@ui/primitives/input/Button/Button';
-import { IconButton } from '@ui/components/IconButton/IconButton';
import {
Banner,
type BannerColor,
@@ -28,23 +27,21 @@ const BannerCloseButton = ({
variant?: BannerVariant;
}) =>
variant === 'primary' ? (
- <IconButton
+ <Button
className={styles.invertedIconButton}
size="sm"
variant="ghost"
aria-label="Close"
- >
- <IconX />
- </IconButton>
+ startIcon={<IconX />}
+ />
) : (
- <IconButton
+ <Button
size="sm"
variant="ghost"
color={getButtonColor(color)}
aria-label="Close"
- >
- <IconX />
- </IconButton>
+ startIcon={<IconX />}
+ />
);
const meta: Meta<typeof Banner> = {
diff --git a/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss.d.ts b/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss.d.ts
deleted file mode 100644
index 2dab28b3574..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare const classNames: {
- readonly emptyContainer: 'emptyContainer';
- readonly emptyTextContainer: 'emptyTextContainer';
- readonly emptyTitle: 'emptyTitle';
- readonly emptySubTitle: 'emptySubTitle';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.tsx b/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.tsx
deleted file mode 100644
index fe47ab421ba..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { clsx } from 'clsx';
-import { type ComponentPropsWithoutRef, type ReactNode } from 'react';
-import { isDefined } from '@ui/utilities/utils/isDefined';
-
-import styles from './EmptyPlaceholderStyled.module.scss';
-
-type AnimatedPlaceholderEmptyContainerProps = {
- children?: ReactNode;
- className?: string;
- width?: number;
-};
-
-export const AnimatedPlaceholderEmptyContainer = ({
- children,
- className,
- width,
-}: AnimatedPlaceholderEmptyContainerProps) => {
- return (
- <div
- className={clsx(styles.emptyContainer, className)}
- style={isDefined(width) ? { width: `${width}px` } : undefined}
- >
- {children}
- </div>
- );
-};
-
-export const AnimatedPlaceholderEmptyTextContainer = ({
- className,
- ...rest
-}: ComponentPropsWithoutRef<'div'>) => (
- <div className={clsx(styles.emptyTextContainer, className)} {...rest} />
-);
-
-export const AnimatedPlaceholderEmptyTitle = ({
- className,
- ...rest
-}: ComponentPropsWithoutRef<'div'>) => (
- <div className={clsx(styles.emptyTitle, className)} {...rest} />
-);
-
-export const AnimatedPlaceholderEmptySubTitle = ({
- className,
- ...rest
-}: ComponentPropsWithoutRef<'div'>) => (
- <div className={clsx(styles.emptySubTitle, className)} {...rest} />
-);
diff --git a/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss.d.ts b/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss.d.ts
deleted file mode 100644
index b8784af7aa3..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare const classNames: {
- readonly errorContainer: 'errorContainer';
- readonly errorTextContainer: 'errorTextContainer';
- readonly errorTitle: 'errorTitle';
- readonly errorSubTitle: 'errorSubTitle';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.tsx b/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.tsx
deleted file mode 100644
index c80e11aaa54..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { clsx } from 'clsx';
-import { type ComponentPropsWithoutRef } from 'react';
-
-import styles from './ErrorPlaceholderStyled.module.scss';
-
-export const AnimatedPlaceholderErrorContainer = ({
- className,
- ...rest
-}: ComponentPropsWithoutRef<'div'>) => (
- <div className={clsx(styles.errorContainer, className)} {...rest} />
-);
-
-export const AnimatedPlaceholderErrorTextContainer = ({
- className,
- ...rest
-}: ComponentPropsWithoutRef<'div'>) => (
- <div className={clsx(styles.errorTextContainer, className)} {...rest} />
-);
-
-export const AnimatedPlaceholderErrorTitle = ({
- className,
- ...rest
-}: ComponentPropsWithoutRef<'div'>) => (
- <div className={clsx(styles.errorTitle, className)} {...rest} />
-);
-
-export const AnimatedPlaceholderErrorSubTitle = ({
- className,
- ...rest
-}: ComponentPropsWithoutRef<'div'>) => (
- <div className={clsx(styles.errorSubTitle, className)} {...rest} />
-);
diff --git a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss b/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss
deleted file mode 100644
index 360daf9e18d..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-.banner {
- align-items: center;
- background-color: var(--t-accent-secondary);
- border-radius: var(--t-border-radius-md);
- box-sizing: border-box;
- display: flex;
- gap: var(--t-spacing-2);
- padding: var(--t-spacing-2);
- width: 100%;
-}
-
-.iconContainer {
- align-items: center;
- color: var(--t-color-blue);
- display: flex;
- flex-shrink: 0;
- height: 16px;
- justify-content: center;
- width: 16px;
-}
-
-.message {
- color: var(--t-color-blue);
- flex-grow: 1;
- font-family: var(--t-font-family);
- font-size: var(--t-font-size-sm);
- font-style: normal;
- font-weight: var(--t-font-weight-medium);
- line-height: 1.4;
- margin: 0;
- min-width: 0;
-}
diff --git a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss.d.ts b/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss.d.ts
deleted file mode 100644
index 399d2e3aede..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare const classNames: {
- readonly banner: 'banner';
- readonly iconContainer: 'iconContainer';
- readonly message: 'message';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx b/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
deleted file mode 100644
index b62415ca4cc..00000000000
--- a/packages/twenty-ui/src/primitives/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { clsx } from 'clsx';
-import { isDefined } from '@ui/utilities/utils/isDefined';
-
-import { IconAlertTriangle, IconInfoCircle } from '@ui/icon';
-import { Tooltip } from '@ui/primitives/surfaces/Tooltip/Tooltip';
-
-import styles from './SidePanelInformationBanner.module.scss';
-
-import { type SidePanelInformationBannerProps } from './types/SidePanelInformationBannerProps';
-
-export const SidePanelInformationBanner = ({
- message,
- className,
- variant = 'default',
- tooltipMessage,
-}: SidePanelInformationBannerProps) => {
- return (
- <Tooltip
- content={tooltipMessage}
- disabled={!isDefined(tooltipMessage)}
- side="bottom"
- delay={500}
- >
- <div className={clsx(styles.banner, className)}>
- <div className={styles.iconContainer}>
- {variant === 'default' ? (
- <IconInfoCircle size={16} />
- ) : (
- <IconAlertTriangle size={16} />
- )}
- </div>
- <p className={styles.message}>{message}</p>
- </div>
- </Tooltip>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/feedback/index.ts b/packages/twenty-ui/src/primitives/feedback/index.ts
index 27b398ddbe3..785aa450ff1 100644
--- a/packages/twenty-ui/src/primitives/feedback/index.ts
+++ b/packages/twenty-ui/src/primitives/feedback/index.ts
@@ -7,56 +7,9 @@
* |___/
*/
-export { AnimatedPlaceholder } from './AnimatedPlaceholder/AnimatedPlaceholder';
-export { BACKGROUND } from './AnimatedPlaceholder/constants/Background';
-export { DARK_BACKGROUND } from './AnimatedPlaceholder/constants/DarkBackground';
-export { DARK_MOVING_IMAGE } from './AnimatedPlaceholder/constants/DarkMovingImage';
-export { MOVING_IMAGE } from './AnimatedPlaceholder/constants/MovingImage';
-export type { AnimatedPlaceholderType } from './AnimatedPlaceholder/types/AnimatedPlaceholderType';
export type { BannerColor, BannerVariant } from './Banner/Banner';
export { Banner } from './Banner/Banner';
-export type { CalloutVariant, CalloutProps } from './Callout/Callout';
-export { Callout } from './Callout/Callout';
export { CircularProgressBar } from './CircularProgressBar/CircularProgressBar';
-export {
- AnimatedPlaceholderEmptyContainer,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
- AnimatedPlaceholderEmptySubTitle,
-} from './EmptyPlaceholderStyled/EmptyPlaceholderStyled';
-export {
- AnimatedPlaceholderErrorContainer,
- AnimatedPlaceholderErrorTextContainer,
- AnimatedPlaceholderErrorTitle,
- AnimatedPlaceholderErrorSubTitle,
-} from './ErrorPlaceholderStyled/ErrorPlaceholderStyled';
-export type { InfoAccent, InfoProps } from './Info/Info';
-export { Info } from './Info/Info';
-export { InlineBanner } from './InlineBanner/InlineBanner';
export { Loader } from './Loader/Loader';
export type { ProgressBarProps } from './ProgressBar/ProgressBar';
export { ProgressBar } from './ProgressBar/ProgressBar';
-export { SidePanelInformationBanner } from './SidePanelInformationBanner/SidePanelInformationBanner';
-export type { SidePanelInformationBannerProps } from './SidePanelInformationBanner/types/SidePanelInformationBannerProps';
-export { DEFAULT_TOAST_LIMIT } from './Toast/constants/DefaultToastLimit';
-export { ToastContext } from './Toast/contexts/ToastContext';
-export { useCloseToast } from './Toast/hooks/useCloseToast';
-export { useEnqueueToast } from './Toast/hooks/useEnqueueToast';
-export { useToast } from './Toast/hooks/useToast';
-export { useToastContext } from './Toast/hooks/useToastContext';
-export { useToastEntries } from './Toast/hooks/useToastEntries';
-export { createToastStore } from './Toast/stores/createToastStore';
-export { Toast } from './Toast/Toast';
-export { ToastProvider } from './Toast/ToastProvider';
-export type { ToastEntry } from './Toast/types/ToastEntry';
-export type { ToastNotification } from './Toast/types/ToastNotification';
-export type { ToastOptions } from './Toast/types/ToastOptions';
-export type { ToastProps } from './Toast/types/ToastProps';
-export type { ToastProviderProps } from './Toast/types/ToastProviderProps';
-export type { ToastStoreState } from './Toast/types/ToastStoreState';
-export type { ToastVariant } from './Toast/types/ToastVariant';
-export { completeToastExit } from './Toast/utils/completeToastExit';
-export { dismissToasts } from './Toast/utils/dismissToasts';
-export { isToastVisible } from './Toast/utils/isToastVisible';
-export { Toaster } from './Toaster/Toaster';
-export type { ToasterProps } from './Toaster/types/ToasterProps';
diff --git a/packages/twenty-ui/src/primitives/index.ts b/packages/twenty-ui/src/primitives/index.ts
index 07c480db053..f1db45754d0 100644
--- a/packages/twenty-ui/src/primitives/index.ts
+++ b/packages/twenty-ui/src/primitives/index.ts
@@ -11,7 +11,6 @@ export * from './accessibility';
export * from './data-display';
export * from './feedback';
export * from './input';
-export * from './json-visualizer';
export * from './layout';
export * from './navigation';
export * from './surfaces';
diff --git a/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx b/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx
index 2d8f0baf8f7..5dc6cb3703e 100644
--- a/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx
+++ b/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx
@@ -1,9 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { expect, fn, userEvent, within } from 'storybook/test';
-import { IconArrowRight, IconPencil, IconPlus, IconX } from '@ui/icon';
-import { AnimatedIconCrossfade } from '@ui/primitives/layout/AnimatedIconCrossfade/AnimatedIconCrossfade';
+import { IconArrowRight, IconPlus } from '@ui/icon';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
@@ -24,58 +23,6 @@ export default meta;
type Story = StoryObj<typeof Button>;
export const Default: Story = { decorators: [ComponentDecorator] };
-export const AnimatedIcon: Story = {
- ...Default,
- render: function Render() {
- const [isEditing, setIsEditing] = useState(false);
-
- return (
- <Button
- size="sm"
- aria-expanded={isEditing}
- onClick={() => setIsEditing(!isEditing)}
- startIcon={
- <AnimatedIconCrossfade
- isActive={isEditing}
- ActiveIcon={IconX}
- InactiveIcon={IconPencil}
- />
- }
- >
- Edit actions
- </Button>
- );
- },
- play: async ({ canvasElement }) => {
- const button = within(canvasElement).getByRole('button', {
- name: 'Edit actions',
- });
- await document.fonts.load('500 1em Inter');
- await document.fonts.ready;
- const [pencil, cross] = button.querySelectorAll('svg');
- const originalWidth = button.getBoundingClientRect().width;
-
- await expect(button.getBoundingClientRect().height).toBe(24);
- await expect(pencil.getBoundingClientRect().width).toBe(14);
- button.focus();
- await userEvent.keyboard('{Enter}');
- await expect(button).toHaveAttribute('aria-expanded', 'true');
- await waitFor(() => {
- expect(getComputedStyle(pencil.parentElement!).opacity).toBe('0');
- expect(getComputedStyle(cross.parentElement!).opacity).toBe('1');
- });
- await waitFor(() =>
- expect(button.getBoundingClientRect().width).toBe(originalWidth),
- );
- await userEvent.keyboard(' ');
- await expect(button).toHaveAttribute('aria-expanded', 'false');
- await userEvent.tab();
- },
-};
-export const AnimatedIconDocumentation: Story = {
- ...AnimatedIcon,
- play: undefined,
-};
export const Keyboard: Story = {
...Default,
args: { onClick: fn(), onFocus: fn(), onBlur: fn() },
diff --git a/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx b/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
index 5b0892ab8c0..25e4b984c9b 100644
--- a/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
+++ b/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
@@ -1,13 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { expect, fn, userEvent, within } from 'storybook/test';
-import {
- IconCheckbox,
- IconNotes,
- IconPlus,
- IconTimelineEvent,
- IconTrash,
-} from '@ui/icon';
-import { LightIconButton } from '@ui/components/LightIconButton/LightIconButton';
+import { expect, userEvent, within } from 'storybook/test';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/icon';
import { ComponentDecorator } from '@ui/testing';
import { Button } from '@ui/primitives/input/Button/Button';
import { ButtonGroup } from '@ui/primitives/input/ButtonGroup/ButtonGroup';
@@ -145,125 +138,6 @@ export const UnspecifiedAppearance: Story = {
},
};
-export const Framed: Story = {
- decorators: [ComponentDecorator],
- render: () => (
- <ButtonGroup
- framed
- attached={false}
- aria-label="Record actions"
- className="nodrag nopan"
- >
- <LightIconButton size="xs" aria-label="Add" emphasis="subtle">
- <IconPlus />
- </LightIconButton>
- <LightIconButton
- size="xs"
- aria-label="Delete"
- emphasis="subtle"
- disabled
- tooltip="Unavailable"
- >
- <IconTrash />
- </LightIconButton>
- </ButtonGroup>
- ),
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
- const group = canvas.getByRole('group', { name: 'Record actions' });
- const buttons = within(group).getAllByRole('button');
- await expect(group).toHaveClass('nodrag', 'nopan');
- await expect(group.getBoundingClientRect().height).toBe(26);
- await expect(group.getBoundingClientRect().width).toBe(48);
- for (const button of buttons) {
- await expect(button.getBoundingClientRect().width).toBe(20);
- await expect(button.getBoundingClientRect().height).toBe(20);
- await expect(getComputedStyle(button).borderTopLeftRadius).toBe(
- getComputedStyle(button).borderTopRightRadius,
- );
- await expect(
- parseFloat(getComputedStyle(button).borderTopLeftRadius),
- ).toBeGreaterThan(0);
- }
- await expect(
- buttons[1].getBoundingClientRect().left -
- buttons[0].getBoundingClientRect().right,
- ).toBe(2);
- },
-};
-export const FramedDocumentation: Story = {
- ...Framed,
- play: undefined,
-};
-
-export const FramedDark: Story = {
- ...Framed,
- globals: { colorScheme: 'dark' },
-};
-export const FramedSingle: Story = {
- decorators: [ComponentDecorator],
- render: () => (
- <ButtonGroup framed attached={false} aria-label="Single action">
- <LightIconButton size="xs" aria-label="Add">
- <IconPlus />
- </LightIconButton>
- </ButtonGroup>
- ),
- play: async ({ canvasElement }) => {
- await expect(
- within(canvasElement).getByRole('group').getBoundingClientRect().width,
- ).toBe(26);
- },
-};
-export const FramedDisabledAction: Story = {
- decorators: [ComponentDecorator],
- args: { onClick: fn() },
- render: (args) => (
- <ButtonGroup framed attached={false} {...args}>
- <LightIconButton size="xs" aria-label="Delete" disabled>
- <IconTrash />
- </LightIconButton>
- </ButtonGroup>
- ),
- play: async ({ canvasElement, args }) => {
- await userEvent.click(within(canvasElement).getByRole('button'));
- await expect(args.onClick).not.toHaveBeenCalled();
- },
-};
-
-export const FramedMixedButtons: Story = {
- decorators: [ComponentDecorator],
- render: () => (
- <ButtonGroup framed attached={false} aria-label="Mixed actions">
- <Button size="sm" variant="solid" color="accent">
- Save
- </Button>
- <LightIconButton size="xs" aria-label="Add">
- <IconPlus />
- </LightIconButton>
- <LightIconButton size="md" aria-label="Delete">
- <IconTrash />
- </LightIconButton>
- </ButtonGroup>
- ),
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
- const save = canvas.getByRole('button', { name: 'Save' });
- const add = canvas.getByRole('button', { name: 'Add' });
- const remove = canvas.getByRole('button', { name: 'Delete' });
-
- await expect(save.getBoundingClientRect().height).toBe(24);
- await expect(save).toHaveAttribute('data-variant', 'solid');
- await expect(save).toHaveAttribute('data-color', 'accent');
- await expect(add.getBoundingClientRect().width).toBe(20);
- await expect(remove.getBoundingClientRect().width).toBe(32);
- await expect(add).toHaveAttribute('data-variant', 'ghost');
- await expect(canvas.getByRole('group').getBoundingClientRect().height).toBe(
- 38,
- );
- },
-};
-
export const FramedAttached: Story = {
...Default,
args: { ...Default.args, framed: true },
diff --git a/packages/twenty-ui/src/primitives/input/InputHint/InputHint.module.scss b/packages/twenty-ui/src/primitives/input/InputHint/InputHint.module.scss
deleted file mode 100644
index 667515fe277..00000000000
--- a/packages/twenty-ui/src/primitives/input/InputHint/InputHint.module.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.hint {
- color: var(--t-font-color-light);
- font-size: var(--t-font-size-xs);
- font-weight: var(--t-font-weight-regular);
- margin-top: var(--t-spacing-0_5);
-}
-
-.danger {
- color: var(--t-font-color-danger);
-}
diff --git a/packages/twenty-ui/src/primitives/input/InputHint/InputHint.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/InputHint/InputHint.module.scss.d.ts
deleted file mode 100644
index 44fc7df3e09..00000000000
--- a/packages/twenty-ui/src/primitives/input/InputHint/InputHint.module.scss.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const classNames: {
- readonly hint: 'hint';
- readonly danger: 'danger';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.module.scss b/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.module.scss
deleted file mode 100644
index de60e7cfe68..00000000000
--- a/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.module.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.label {
- color: var(--t-font-color-light);
- display: block;
- font-size: 11px;
- font-weight: var(--t-font-weight-semi-bold);
- margin-bottom: var(--t-spacing-1);
-}
diff --git a/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.module.scss.d.ts
deleted file mode 100644
index 2bc360f7d84..00000000000
--- a/packages/twenty-ui/src/primitives/input/InputLabel/InputLabel.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly label: 'label';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/Radio/__stories__/Radio.interactions.stories.tsx b/packages/twenty-ui/src/primitives/input/Radio/__stories__/Radio.interactions.stories.tsx
index f53b906b055..90f39a3481d 100644
--- a/packages/twenty-ui/src/primitives/input/Radio/__stories__/Radio.interactions.stories.tsx
+++ b/packages/twenty-ui/src/primitives/input/Radio/__stories__/Radio.interactions.stories.tsx
@@ -1,10 +1,9 @@
-import { Field as FieldPrimitive } from '@base-ui/react/field';
import { DirectionProvider } from '@base-ui/react/direction-provider';
+import { Field as FieldPrimitive } from '@base-ui/react/field';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useRef, useState } from 'react';
import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
-import { CardPicker } from '@ui/primitives/input/CardPicker/CardPicker';
import { Field } from '@ui/primitives/input/Field/Field';
import { RadioGroup } from '@ui/primitives/input/RadioGroup/RadioGroup';
import { type RadioGroupProps } from '@ui/primitives/input/RadioGroup/types/RadioGroupProps';
@@ -322,41 +321,3 @@ export const RightToLeft: Story = {
);
},
};
-
-const CardsExample = ({ onValueChange }: RadioGroupProps) => {
- const [value, setValue] = useState('monthly');
-
- return (
- <RadioGroup
- aria-label="Billing interval"
- value={value}
- onValueChange={(nextValue, details) => {
- setValue(nextValue);
- onValueChange?.(nextValue, details);
- }}
- >
- <CardPicker value="monthly">Monthly</CardPicker>
- <CardPicker value="yearly">Yearly</CardPicker>
- {value === 'yearly' && <input aria-label="Purchase order" />}
- </RadioGroup>
- );
-};
-
-export const Cards: Story = {
- decorators: [ComponentDecorator],
- render: (args) => <CardsExample {...args} />,
- play: async ({ canvasElement, args }) => {
- const canvas = within(canvasElement);
- await userEvent.click(canvas.getByText('Yearly'));
- await expect(canvas.getByRole('radio', { name: 'Yearly' })).toBeChecked();
- await expect(args.onValueChange).toHaveBeenCalledTimes(1);
- await userEvent.type(
- canvas.getByRole('textbox', { name: 'Purchase order' }),
- 'PO-42',
- );
- await expect(args.onValueChange).toHaveBeenCalledTimes(1);
- await userEvent.click(canvas.getByRole('radio', { name: 'Monthly' }));
- await userEvent.keyboard('{ArrowDown}');
- await expect(canvas.getByRole('radio', { name: 'Yearly' })).toBeChecked();
- },
-};
diff --git a/packages/twenty-ui/src/primitives/input/Radio/__tests__/Radio.test.tsx b/packages/twenty-ui/src/primitives/input/Radio/__tests__/Radio.test.tsx
index bb3f4cbbb88..53fdbea9056 100644
--- a/packages/twenty-ui/src/primitives/input/Radio/__tests__/Radio.test.tsx
+++ b/packages/twenty-ui/src/primitives/input/Radio/__tests__/Radio.test.tsx
@@ -1,8 +1,6 @@
import { type ReactNode } from 'react';
import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
-import { CardPicker } from '@ui/primitives/input/CardPicker/CardPicker';
-import cardPickerStyles from '@ui/primitives/input/CardPicker/CardPicker.module.scss';
import { RadioGroup } from '@ui/primitives/input/RadioGroup/RadioGroup';
import groupStyles from '@ui/primitives/input/RadioGroup/RadioGroup.module.scss';
@@ -27,12 +25,3 @@ runComponentConformance({
refInstanceOf: HTMLDivElement,
ownClassName: groupStyles.root,
});
-
-runComponentConformance({
- name: 'CardPicker',
- element: <CardPicker value="option">Option</CardPicker>,
- wrapper: RadioGroupWrapper,
- refInstanceOf: HTMLDivElement,
- ownClassName: cardPickerStyles.container,
- renderPropTagName: 'div',
-});
diff --git a/packages/twenty-ui/src/primitives/input/index.ts b/packages/twenty-ui/src/primitives/input/index.ts
index 1f732215cfb..15aeadb0f00 100644
--- a/packages/twenty-ui/src/primitives/input/index.ts
+++ b/packages/twenty-ui/src/primitives/input/index.ts
@@ -14,35 +14,21 @@ export type { ButtonSize } from './Button/types/ButtonSize';
export type { ButtonVariant } from './Button/types/ButtonVariant';
export { ButtonGroup } from './ButtonGroup/ButtonGroup';
export type { ButtonGroupProps } from './ButtonGroup/types/ButtonGroupProps';
-export { CardPicker } from './CardPicker/CardPicker';
-export type { CardPickerProps } from './CardPicker/types/CardPickerProps';
export { Checkbox } from './Checkbox/Checkbox';
export type { CheckboxColor } from './Checkbox/types/CheckboxColor';
export type { CheckboxProps } from './Checkbox/types/CheckboxProps';
export type { CheckboxShape } from './Checkbox/types/CheckboxShape';
export type { CheckboxSize } from './Checkbox/types/CheckboxSize';
export type { CheckboxVariant } from './Checkbox/types/CheckboxVariant';
-export type {
- ColorSchemeSegmentProps,
- ColorSchemeCardProps,
-} from './ColorSchemeCard/ColorSchemeCard';
-export { ColorSchemeCard } from './ColorSchemeCard/ColorSchemeCard';
-export type { ColorSchemePickerProps } from './ColorSchemePicker/ColorSchemePicker';
-export { ColorSchemePicker } from './ColorSchemePicker/ColorSchemePicker';
export { Field } from './Field/Field';
-export { IconListViewGrip } from './IconListViewGrip/IconListViewGrip';
export { Input } from './Input/Input';
export type { InputProps } from './Input/types/InputProps';
export { InputGroup } from './InputGroup/InputGroup';
export type { InputGroupProps } from './InputGroup/types/InputGroupProps';
-export { InputHint } from './InputHint/InputHint';
-export { InputLabel } from './InputLabel/InputLabel';
export { Radio } from './Radio/Radio';
export type { RadioProps } from './Radio/types/RadioProps';
export { RadioGroup } from './RadioGroup/RadioGroup';
export type { RadioGroupProps } from './RadioGroup/types/RadioGroupProps';
-export type { SearchInputProps } from './SearchInput/SearchInput';
-export { SearchInput } from './SearchInput/SearchInput';
export type {
SegmentedControlOption,
SegmentedControlProps,
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonTree.tsx b/packages/twenty-ui/src/primitives/json-visualizer/components/JsonTree.tsx
deleted file mode 100644
index 6b4c5e8ddf5..00000000000
--- a/packages/twenty-ui/src/primitives/json-visualizer/components/JsonTree.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { JsonList } from '@ui/primitives/json-visualizer/components/internal/JsonList';
-import { JsonNode } from '@ui/primitives/json-visualizer/components/JsonNode';
-import { JsonTreeContextProvider } from '@ui/primitives/json-visualizer/components/JsonTreeContextProvider';
-import { type ShouldExpandNodeInitiallyProps } from '@ui/primitives/json-visualizer/contexts/JsonTreeContext';
-import { type GetJsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/GetJsonNodeHighlighting';
-import { type JsonValue } from 'type-fest';
-
-export const JsonTree = ({
- value,
- getNodeHighlighting,
- shouldExpandNodeInitially,
- emptyArrayLabel,
- emptyObjectLabel,
- emptyStringLabel,
- arrowButtonCollapsedLabel,
- arrowButtonExpandedLabel,
- onNodeValueClick,
-}: {
- value: JsonValue;
- getNodeHighlighting?: GetJsonNodeHighlighting;
- shouldExpandNodeInitially: (
- params: ShouldExpandNodeInitiallyProps,
- ) => boolean;
- emptyArrayLabel: string;
- emptyObjectLabel: string;
- emptyStringLabel: string;
- arrowButtonCollapsedLabel: string;
- arrowButtonExpandedLabel: string;
- onNodeValueClick?: (valueAsString: string) => void;
-}) => {
- return (
- <JsonTreeContextProvider
- value={{
- getNodeHighlighting,
- shouldExpandNodeInitially,
- emptyArrayLabel,
- emptyObjectLabel,
- emptyStringLabel,
- arrowButtonCollapsedLabel,
- arrowButtonExpandedLabel,
- onNodeValueClick,
- }}
- >
- <JsonList depth={0}>
- <JsonNode value={value} depth={0} keyPath="" />
- </JsonList>
- </JsonTreeContextProvider>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/index.ts b/packages/twenty-ui/src/primitives/json-visualizer/index.ts
deleted file mode 100644
index 0cc10da58e7..00000000000
--- a/packages/twenty-ui/src/primitives/json-visualizer/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * _____ _
- *|_ _|_ _____ _ __ | |_ _ _
- * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
- * | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
- * |_| \_/\_/ \___|_| |_|\__|\__, |
- * |___/
- */
-
-export { JsonArrayNode } from './components/JsonArrayNode';
-export { JsonNestedNode } from './components/JsonNestedNode';
-export { JsonNode } from './components/JsonNode';
-export { JsonObjectNode } from './components/JsonObjectNode';
-export { JsonTree } from './components/JsonTree';
-export { JsonTreeContextProvider } from './components/JsonTreeContextProvider';
-export { JsonValueNode } from './components/JsonValueNode';
-export type {
- ShouldExpandNodeInitiallyProps,
- JsonTreeContextType,
-} from './contexts/JsonTreeContext';
-export { JsonTreeContext } from './contexts/JsonTreeContext';
-export { useJsonTreeContextOrThrow } from './hooks/useJsonTreeContextOrThrow';
-export type { GetJsonNodeHighlighting } from './types/GetJsonNodeHighlighting';
-export type { JsonNodeHighlighting } from './types/JsonNodeHighlighting';
-export { isArray } from './utils/isArray';
-export { isTwoFirstDepths } from './utils/isTwoFirstDepths';
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/types/GetJsonNodeHighlighting.ts b/packages/twenty-ui/src/primitives/json-visualizer/types/GetJsonNodeHighlighting.ts
deleted file mode 100644
index 48b418b7fde..00000000000
--- a/packages/twenty-ui/src/primitives/json-visualizer/types/GetJsonNodeHighlighting.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { type JsonNodeHighlighting } from '@ui/primitives/json-visualizer/types/JsonNodeHighlighting';
-
-export type GetJsonNodeHighlighting = (
- keyPath: string,
-) => JsonNodeHighlighting | undefined;
diff --git a/packages/twenty-ui/src/primitives/json-visualizer/utils/isTwoFirstDepths.ts b/packages/twenty-ui/src/primitives/json-visualizer/utils/isTwoFirstDepths.ts
deleted file mode 100644
index 3ab4de00fae..00000000000
--- a/packages/twenty-ui/src/primitives/json-visualizer/utils/isTwoFirstDepths.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { type ShouldExpandNodeInitiallyProps } from '@ui/primitives/json-visualizer/contexts/JsonTreeContext';
-
-export const isTwoFirstDepths = ({ depth }: ShouldExpandNodeInitiallyProps) =>
- depth <= 1;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss b/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss
deleted file mode 100644
index 05d81ca271e..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.container {
- align-items: center;
- display: flex;
- justify-content: center;
- animation: animatedCircleLoadingSpin duration(slow) ease-in-out infinite;
-}
-
-@keyframes animatedCircleLoadingSpin {
- from {
- transform: rotate(0deg);
- }
-
- to {
- transform: rotate(360deg);
- }
-}
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss.d.ts b/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss.d.ts
deleted file mode 100644
index 8df71b4dead..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.tsx b/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.tsx
deleted file mode 100644
index cde11122f36..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedCircleLoading/AnimatedCircleLoading.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import styles from './AnimatedCircleLoading.module.scss';
-
-export const AnimatedCircleLoading = ({
- children,
-}: {
- children: React.ReactNode;
-}) => <div className={styles.container}>{children}</div>;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.module.scss b/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.module.scss
deleted file mode 100644
index 1d08450eaac..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.module.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.container {
- animation: animatedContainerFadeIn duration(fast) ease;
- transition: transform duration(fast) ease;
-
- &:hover {
- transform: scale(1.04);
- }
-}
-
-@keyframes animatedContainerFadeIn {
- from {
- opacity: 0;
- }
-
- to {
- opacity: 1;
- }
-}
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.module.scss.d.ts b/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.module.scss.d.ts
deleted file mode 100644
index 8df71b4dead..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.tsx b/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.tsx
deleted file mode 100644
index a21ee14c3d3..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedContainer/AnimatedContainer.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import styles from './AnimatedContainer.module.scss';
-
-export const AnimatedContainer = ({
- children,
-}: {
- children: React.ReactNode;
-}) => <div className={styles.container}>{children}</div>;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.module.scss b/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.module.scss
deleted file mode 100644
index 84d9e73bced..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.module.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.fadeIn {
- --animated-ease-in-duration: #{duration(normal)};
-
- animation: animatedEaseInFadeIn var(--animated-ease-in-duration) linear;
-
- &[data-duration='instant'] {
- --animated-ease-in-duration: #{duration(instant)};
- }
-
- &[data-duration='fast'] {
- --animated-ease-in-duration: #{duration(fast)};
- }
-
- &[data-duration='slow'] {
- --animated-ease-in-duration: #{duration(slow)};
- }
-}
-
-@keyframes animatedEaseInFadeIn {
- from {
- opacity: 0;
- }
-
- to {
- opacity: 1;
- }
-}
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.module.scss.d.ts b/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.module.scss.d.ts
deleted file mode 100644
index c9a9048a6da..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly fadeIn: 'fadeIn';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.tsx b/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.tsx
deleted file mode 100644
index 5121c86d23d..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedEaseIn/AnimatedEaseIn.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { type AnimationDuration } from '@ui/theme';
-
-import styles from './AnimatedEaseIn.module.scss';
-
-type AnimatedEaseInProps = {
- children?: React.ReactNode;
- duration?: AnimationDuration;
-};
-
-export const AnimatedEaseIn = ({
- children,
- duration = 'normal',
-}: AnimatedEaseInProps) => (
- <div className={styles.fadeIn} data-duration={duration}>
- {children}
- </div>
-);
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.module.scss b/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.module.scss
deleted file mode 100644
index ded2fe616b0..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.module.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.panel {
- --animated-ease-in-out-duration: #{duration(normal)};
-
- overflow: hidden;
- opacity: 1;
- height: var(--collapsible-panel-height);
- margin-top: var(--animated-ease-in-out-margin-top, 0);
- margin-bottom: var(--animated-ease-in-out-margin-bottom, 0);
- transition:
- height var(--animated-ease-in-out-duration) ease-in-out,
- opacity var(--animated-ease-in-out-duration) ease-in-out,
- margin var(--animated-ease-in-out-duration) ease-in-out;
-
- &[data-duration='instant'] {
- --animated-ease-in-out-duration: #{duration(instant)};
- }
-
- &[data-duration='fast'] {
- --animated-ease-in-out-duration: #{duration(fast)};
- }
-
- &[data-duration='slow'] {
- --animated-ease-in-out-duration: #{duration(slow)};
- }
-
- &[data-starting-style] {
- height: 0;
- opacity: 0;
- }
-
- &[data-ending-style] {
- height: 0;
- opacity: 0;
- margin-top: 0;
- margin-bottom: 0;
- }
-}
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.module.scss.d.ts b/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.module.scss.d.ts
deleted file mode 100644
index 25ca51db313..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly panel: 'panel';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.tsx b/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.tsx
deleted file mode 100644
index 7f691187f02..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedEaseInOut/AnimatedEaseInOut.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Collapsible } from '@base-ui/react/collapsible';
-import { type AnimationDuration } from '@ui/theme';
-
-import styles from './AnimatedEaseInOut.module.scss';
-
-type AnimatedEaseInOutProps = {
- isOpen: boolean;
- children: React.ReactNode;
- duration?: AnimationDuration;
- marginBottom?: string;
- marginTop?: string;
- initial?: boolean;
-};
-
-export const AnimatedEaseInOut = ({
- children,
- isOpen,
- marginBottom,
- marginTop,
- duration = 'normal',
-}: AnimatedEaseInOutProps) => (
- <Collapsible.Root open={isOpen}>
- <Collapsible.Panel
- className={styles.panel}
- data-duration={duration}
- style={
- {
- '--animated-ease-in-out-margin-top': marginTop ?? '0',
- '--animated-ease-in-out-margin-bottom': marginBottom ?? '0',
- } as React.CSSProperties
- }
- >
- {children}
- </Collapsible.Panel>
- </Collapsible.Root>
-);
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.module.scss b/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.module.scss
index 30589138f41..e490686ff7c 100644
--- a/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.module.scss
+++ b/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.module.scss
@@ -44,3 +44,10 @@
width: 100%;
}
}
+
+@each $duration in (instant, fast, normal, slow) {
+ .panel[data-duration='#{$duration}'] {
+ --animated-expandable-opacity-duration: #{duration($duration)};
+ --animated-expandable-size-duration: #{duration($duration)};
+ }
+}
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.tsx b/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.tsx
index 6178bcb6747..3fc6197b5c4 100644
--- a/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.tsx
+++ b/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.tsx
@@ -1,4 +1,5 @@
import { Collapsible } from '@base-ui/react/collapsible';
+import { type AnimationDuration } from '@ui/theme';
import { clsx } from 'clsx';
import { type AnimationDimension } from '@ui/primitives/layout/AnimatedExpandableContainer/types/AnimationDimension';
@@ -15,6 +16,7 @@ type AnimatedExpandableContainerProps = {
mode?: AnimationMode;
containAnimation?: boolean;
initial?: boolean;
+ duration?: AnimationDuration;
};
export const AnimatedExpandableContainer = ({
@@ -23,6 +25,7 @@ export const AnimatedExpandableContainer = ({
dimension = 'height',
animationDurations = 'default',
containAnimation = true,
+ duration,
}: AnimatedExpandableContainerProps) => {
const durationStyle =
animationDurations === 'default'
@@ -37,6 +40,7 @@ export const AnimatedExpandableContainer = ({
<Collapsible.Panel
className={clsx(styles.panel, containAnimation && styles.contained)}
data-dimension={dimension}
+ data-duration={duration}
style={durationStyle}
>
{children}
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.module.scss b/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.module.scss
deleted file mode 100644
index 837dd539cf7..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.module.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-.container {
- --animated-rotate-duration: #{duration(fast)};
-
- align-items: center;
- display: flex;
- justify-content: center;
- animation: animatedRotateIn var(--animated-rotate-duration) ease;
-
- &[data-duration='instant'] {
- --animated-rotate-duration: #{duration(instant)};
- }
-
- &[data-duration='normal'] {
- --animated-rotate-duration: #{duration(normal)};
- }
-
- &[data-duration='slow'] {
- --animated-rotate-duration: #{duration(slow)};
- }
-}
-
-.animateOnHover {
- transition: transform duration(fast) ease;
-
- &:hover {
- transform: rotate(45deg);
- }
-}
-
-@keyframes animatedRotateIn {
- from {
- opacity: 0;
- transform: rotate(-90deg);
- }
-
- to {
- opacity: 1;
- transform: rotate(0deg);
- }
-}
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.module.scss.d.ts b/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.module.scss.d.ts
deleted file mode 100644
index a453a68ad43..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.module.scss.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
- readonly animateOnHover: 'animateOnHover';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.tsx b/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.tsx
deleted file mode 100644
index f49f286f717..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AnimatedRotate/AnimatedRotate.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { clsx } from 'clsx';
-import { type JSX } from 'react';
-
-import { type AnimationDuration } from '@ui/theme';
-
-import styles from './AnimatedRotate.module.scss';
-
-type AnimatedRotateProps = {
- children?: React.ReactNode;
- duration?: AnimationDuration;
- animateOnHover?: boolean;
-};
-
-export const AnimatedRotate = ({
- children,
- duration = 'fast',
- animateOnHover,
-}: AnimatedRotateProps): JSX.Element => (
- <div
- className={clsx(styles.container, animateOnHover && styles.animateOnHover)}
- data-duration={duration}
- >
- {children}
- </div>
-);
diff --git a/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.module.scss b/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.module.scss
deleted file mode 100644
index 444896e83fe..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.module.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.container {
- max-width: 100%;
- position: relative;
-}
-
-.nodeWrapper {
- pointer-events: none;
- visibility: hidden;
- white-space: pre;
-}
-
-.childWrapper {
- left: 0;
- top: 0;
- position: absolute;
- width: 100%;
-}
diff --git a/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.module.scss.d.ts b/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.module.scss.d.ts
deleted file mode 100644
index 8489fa3143d..00000000000
--- a/packages/twenty-ui/src/primitives/layout/AutogrowWrapper/AutogrowWrapper.module.scss.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
- readonly nodeWrapper: 'nodeWrapper';
- readonly childWrapper: 'childWrapper';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/layout/HorizontalSeparator/HorizontalSeparator.tsx b/packages/twenty-ui/src/primitives/layout/HorizontalSeparator/HorizontalSeparator.tsx
index 9c389bc1be8..5935eff6439 100644
--- a/packages/twenty-ui/src/primitives/layout/HorizontalSeparator/HorizontalSeparator.tsx
+++ b/packages/twenty-ui/src/primitives/layout/HorizontalSeparator/HorizontalSeparator.tsx
@@ -1,6 +1,6 @@
import { type JSX } from 'react';
-import { Label } from '@ui/primitives/typography';
+import { Label } from '@ui/primitives/typography/internal/Label/Label';
import styles from './HorizontalSeparator.module.scss';
diff --git a/packages/twenty-ui/src/primitives/layout/index.ts b/packages/twenty-ui/src/primitives/layout/index.ts
index 5a2f1b62fda..d655915c2af 100644
--- a/packages/twenty-ui/src/primitives/layout/index.ts
+++ b/packages/twenty-ui/src/primitives/layout/index.ts
@@ -7,19 +7,12 @@
* |___/
*/
-export { AnimatedCircleLoading } from './AnimatedCircleLoading/AnimatedCircleLoading';
-export { AnimatedContainer } from './AnimatedContainer/AnimatedContainer';
-export { AnimatedEaseIn } from './AnimatedEaseIn/AnimatedEaseIn';
-export { AnimatedEaseInOut } from './AnimatedEaseInOut/AnimatedEaseInOut';
export { AnimatedExpandableContainer } from './AnimatedExpandableContainer/AnimatedExpandableContainer';
export type { AnimationDimension } from './AnimatedExpandableContainer/types/AnimationDimension';
export type { AnimationDurationObject } from './AnimatedExpandableContainer/types/AnimationDurationObject';
export type { AnimationDurations } from './AnimatedExpandableContainer/types/AnimationDurations';
export type { AnimationMode } from './AnimatedExpandableContainer/types/AnimationMode';
export type { AnimationSize } from './AnimatedExpandableContainer/types/AnimationSize';
-export { AnimatedIconCrossfade } from './AnimatedIconCrossfade/AnimatedIconCrossfade';
-export { AnimatedRotate } from './AnimatedRotate/AnimatedRotate';
-export { AutogrowWrapper } from './AutogrowWrapper/AutogrowWrapper';
export { HorizontalSeparator } from './HorizontalSeparator/HorizontalSeparator';
export { useResizeHandle } from './ResizeHandle/hooks/useResizeHandle';
export { ResizeHandle } from './ResizeHandle/ResizeHandle';
diff --git a/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.module.scss b/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.module.scss
deleted file mode 100644
index 76bb4505753..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.module.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.root {
- color: inherit;
- overflow: hidden;
- text-decoration: underline;
- text-decoration-color: var(--t-border-color-strong);
- text-overflow: ellipsis;
- white-space: nowrap;
- width: 100%;
-
- max-width: var(--contact-link-max-width);
-
- &:hover {
- text-decoration-color: var(--t-font-color-primary);
- }
-}
diff --git a/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.module.scss.d.ts b/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.module.scss.d.ts
deleted file mode 100644
index 4d6743c3dcd..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/ContactLink/ContactLink.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly root: 'root';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/navigation/GithubVersionLink/GithubVersionLink.tsx b/packages/twenty-ui/src/primitives/navigation/GithubVersionLink/GithubVersionLink.tsx
deleted file mode 100644
index 04d626c399b..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/GithubVersionLink/GithubVersionLink.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { IconBrandGithub } from '@ui/icon';
-import { ClickToActionLink } from '@ui/primitives/navigation/ClickToActionLink/ClickToActionLink';
-import { GITHUB_LINK } from '@ui/primitives/navigation/Link/constants/GithubLink';
-import { useTheme } from '@ui/theme-constants';
-
-interface GithubVersionLinkProps {
- version: string;
-}
-
-export const GithubVersionLink = ({ version }: GithubVersionLinkProps) => {
- const theme = useTheme();
-
- return (
- <ClickToActionLink href={GITHUB_LINK} target="_blank" rel="noreferrer">
- <IconBrandGithub size={theme.icon.size.md} />
- {version}
- </ClickToActionLink>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/navigation/GithubVersionLink/__stories__/GithubVersionLink.stories.tsx b/packages/twenty-ui/src/primitives/navigation/GithubVersionLink/__stories__/GithubVersionLink.stories.tsx
deleted file mode 100644
index 6fd5a382a60..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/GithubVersionLink/__stories__/GithubVersionLink.stories.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-
-import {
- A11Y_DEFER_COLOR_CONTRAST,
- ComponentWithRouterDecorator,
-} from '@ui/testing';
-import { GithubVersionLink } from '@ui/primitives/navigation/GithubVersionLink/GithubVersionLink';
-
-const meta: Meta<typeof GithubVersionLink> = {
- title: 'UI/Navigation/Link/GithubVersionLink',
- component: GithubVersionLink,
- decorators: [ComponentWithRouterDecorator],
-};
-
-export default meta;
-type Story = StoryObj<typeof GithubVersionLink>;
-
-export const Default: Story = {
- parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
- args: { version: '0.1.0' },
-};
diff --git a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
index 275d7f3ccec..7f9498fd8fe 100644
--- a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
+++ b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
@@ -129,6 +129,7 @@
opacity: 0;
}
+ .root[data-actions-visibility='always'] .actions,
.root:hover .actions,
.root:focus-within .actions {
opacity: 1;
diff --git a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.tsx b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.tsx
index 55009448f53..0f4b5d6b8e7 100644
--- a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.tsx
@@ -4,8 +4,8 @@ import { clsx } from 'clsx';
import { type MouseEvent } from 'react';
import { IconCheck, IconChevronRight } from '@ui/icon';
-import { MenuItemHotKeys } from '@ui/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys';
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
+import { MenuItemHotKeys } from '@ui/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys';
+import { OverflowingTextWithTooltip } from '@ui/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { isDefined } from '@ui/utilities/utils/isDefined';
import { isRenderableSlot } from './internal/isRenderableSlot';
@@ -24,6 +24,7 @@ export const ListItem = ({
description,
descriptionPlacement = 'inline',
actions,
+ actionsVisibility = 'hover',
hotkeys,
hasSubmenu = false,
className,
@@ -55,6 +56,7 @@ export const ListItem = ({
state: { color, indicator, selected, highlighted: focused, disabled },
props: {
...props,
+ 'data-actions-visibility': actionsVisibility,
className: clsx(styles.root, className),
'aria-disabled': disabled || undefined,
onClick: handleClick,
diff --git a/packages/twenty-ui/src/primitives/navigation/ListItem/__stories__/ListItem.stories.tsx b/packages/twenty-ui/src/primitives/navigation/ListItem/__stories__/ListItem.stories.tsx
index 6ad065702af..abc53b0522d 100644
--- a/packages/twenty-ui/src/primitives/navigation/ListItem/__stories__/ListItem.stories.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/ListItem/__stories__/ListItem.stories.tsx
@@ -5,12 +5,12 @@ import { expect, userEvent, within } from 'storybook/test';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
- type CatalogStory,
ComponentDecorator,
+ type CatalogStory,
} from '@ui/testing';
+import { Button } from '@ui/primitives/input/Button/Button';
import { IconBell, IconEdit, IconSettings, IconTrash } from '@ui/icon';
-import { LightIconButton } from '@ui/components/LightIconButton/LightIconButton';
import { ListItem } from '@ui/primitives/navigation/ListItem/ListItem';
import { type ListItemColor } from '@ui/primitives/navigation/ListItem/types/ListItemColor';
import { type ListItemIndicator } from '@ui/primitives/navigation/ListItem/types/ListItemIndicator';
@@ -30,12 +30,20 @@ const START_ICON = <IconBell />;
const ACTIONS = (
<>
- <LightIconButton aria-label="Edit" onClick={action('Edit')}>
- <IconEdit />
- </LightIconButton>
- <LightIconButton aria-label="Delete" onClick={action('Delete')}>
- <IconTrash />
- </LightIconButton>
+ <Button
+ aria-label="Edit"
+ onClick={action('Edit')}
+ variant="ghost"
+ size="sm"
+ startIcon={<IconEdit />}
+ />
+ <Button
+ aria-label="Delete"
+ onClick={action('Delete')}
+ variant="ghost"
+ size="sm"
+ startIcon={<IconTrash />}
+ />
</>
);
@@ -77,6 +85,17 @@ export const WithActions: Story = {
args: { startIcon: START_ICON, actions: ACTIONS },
};
+export const WithPersistentActions: Story = {
+ ...WithActions,
+ args: { ...WithActions.args, actionsVisibility: 'always' },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(canvas.getByRole('button', { name: 'Edit' })).toBeVisible();
+ expect(canvas.getByRole('button', { name: 'Delete' })).toBeVisible();
+ },
+};
+
export const WithCheckbox: Story = {
decorators: [ComponentDecorator],
parameters: { container: { width: 240 } },
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss b/packages/twenty-ui/src/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss
rename to packages/twenty-ui/src/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys.module.scss
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss.d.ts b/packages/twenty-ui/src/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss.d.ts
rename to packages/twenty-ui/src/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys.tsx b/packages/twenty-ui/src/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/MenuItemHotKeys/MenuItemHotKeys.tsx
rename to packages/twenty-ui/src/primitives/navigation/ListItem/internal/MenuItemHotKeys/MenuItemHotKeys.tsx
diff --git a/packages/twenty-ui/src/primitives/navigation/ListItem/types/ListItemProps.ts b/packages/twenty-ui/src/primitives/navigation/ListItem/types/ListItemProps.ts
index 5bba14ed425..1a25bf50e72 100644
--- a/packages/twenty-ui/src/primitives/navigation/ListItem/types/ListItemProps.ts
+++ b/packages/twenty-ui/src/primitives/navigation/ListItem/types/ListItemProps.ts
@@ -39,6 +39,7 @@ export type ListItemProps = Omit<
descriptionPlacement?: ListItemDescriptionPlacement;
/** Trailing content, such as buttons, rendered after the content. */
actions?: ReactNode;
+ actionsVisibility?: 'hover' | 'always';
/**
* Keyboard shortcut keys displayed at the end of the row. Registering the
* shortcut is up to the application.
diff --git a/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.module.scss b/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.module.scss
deleted file mode 100644
index aee5531c7b7..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.module.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.clickable {
- display: flex;
- overflow: hidden;
- white-space: nowrap;
-
- a {
- color: inherit;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-}
diff --git a/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.module.scss.d.ts b/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.module.scss.d.ts
deleted file mode 100644
index 2dba195b149..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly clickable: 'clickable';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.tsx b/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.tsx
deleted file mode 100644
index 841e8694b03..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/RawLink/RawLink.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { clsx } from 'clsx';
-import * as React from 'react';
-import { Link as ReactLink } from 'react-router-dom';
-
-import styles from './RawLink.module.scss';
-
-type RawLinkProps = {
- className?: string;
- href: string;
- children?: React.ReactNode;
- onClick?: (event: React.MouseEvent<HTMLElement>) => void;
-};
-
-export const RawLink = ({
- className,
- href,
- children,
- onClick,
-}: RawLinkProps) => (
- <div>
- <div className={clsx(styles.clickable, className)}>
- <ReactLink target="_blank" onClick={onClick} to={href}>
- {children}
- </ReactLink>
- </div>
- </div>
-);
diff --git a/packages/twenty-ui/src/primitives/navigation/RawLink/__stories__/RawLink.stories.tsx b/packages/twenty-ui/src/primitives/navigation/RawLink/__stories__/RawLink.stories.tsx
deleted file mode 100644
index ed7c7a8f72f..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/RawLink/__stories__/RawLink.stories.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { expect, fn, userEvent, within } from 'storybook/test';
-
-import { ComponentWithRouterDecorator } from '@ui/testing';
-import { RawLink } from '@ui/primitives/navigation/RawLink/RawLink';
-
-const meta: Meta<typeof RawLink> = {
- title: 'UI/Navigation/Link/RawLink',
- component: RawLink,
- decorators: [ComponentWithRouterDecorator],
- args: {
- className: 'RawLink',
- href: '/test',
- children: 'Raw Link',
- },
-};
-
-export default meta;
-type Story = StoryObj<typeof RawLink>;
-const clickJestFn = fn();
-
-export const Default: Story = {
- args: {
- onClick: clickJestFn,
- },
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
-
- await expect(clickJestFn).toHaveBeenCalledTimes(0);
- const link = canvas.getByRole('link');
- await userEvent.click(link);
-
- await expect(clickJestFn).toHaveBeenCalledTimes(1);
- },
-};
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/Tabs.stories.tsx b/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/Tabs.stories.tsx
index 55586763677..eca0d6a721b 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/Tabs.stories.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/Tabs.stories.tsx
@@ -3,14 +3,14 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
import { expect, userEvent, within } from 'storybook/test';
-import { NotificationCounter } from '@ui/primitives/data-display/NotificationCounter/NotificationCounter';
+import { Tag } from '@ui/primitives/data-display/Tag/Tag';
import { IconInfoCircle } from '@ui/icon';
import { Input } from '@ui/primitives/input/Input/Input';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
- type CatalogStory,
ComponentDecorator,
+ type CatalogStory,
} from '@ui/testing';
import { Tabs } from '../Tabs';
@@ -138,15 +138,6 @@ export const AutomaticActivation: Story = {
),
};
-export const WithIconAndBadge: Story = {
- decorators: [ComponentDecorator],
- parameters: { container: { width: 360 } },
- args: {
- startIcon: <IconInfoCircle />,
- badge: <NotificationCounter count={3} variant="secondary" />,
- },
-};
-
export const Disabled: Story = {
decorators: [ComponentDecorator],
parameters: { container: { width: 360 } },
@@ -244,7 +235,7 @@ const TABS_CATALOG_CONTENT_PROPS: Record<
plain: {},
icon: { startIcon: <IconInfoCircle /> },
badge: {
- badge: <NotificationCounter count={3} variant="secondary" />,
+ badge: <Tag color="gray">3</Tag>,
},
};
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/TabsInteractions.stories.tsx b/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/TabsInteractions.stories.tsx
index bf7345fd5b2..654133c5a66 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/TabsInteractions.stories.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/Tabs/__stories__/TabsInteractions.stories.tsx
@@ -5,8 +5,8 @@ import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { ComponentDecorator } from '@ui/testing';
+import tabStyles from '../../internal/tab/Tab.module.scss';
import { Tabs } from '../Tabs';
-import tabStyles from '../Tabs.module.scss';
import { type TabsListProps } from '../types/TabsListProps';
import { type TabsRootProps } from '../types/TabsRootProps';
import { type TabsTabProps } from '../types/TabsTabProps';
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/__tests__/Tabs.test.tsx b/packages/twenty-ui/src/primitives/navigation/Tabs/__tests__/Tabs.test.tsx
index d8f81b67807..f6aad0b2c3e 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/__tests__/Tabs.test.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/Tabs/__tests__/Tabs.test.tsx
@@ -2,8 +2,8 @@ import { type ReactNode } from 'react';
import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+import styles from '../../internal/tab/Tab.module.scss';
import { Tabs } from '../Tabs';
-import styles from '../Tabs.module.scss';
const RootWrapper = ({ children }: { children: ReactNode }) => (
<Tabs.Root defaultValue="overview">{children}</Tabs.Root>
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsList.tsx b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsList.tsx
index 09fed23f168..f5f9110ac14 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsList.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsList.tsx
@@ -3,7 +3,7 @@ import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
-import styles from '../Tabs.module.scss';
+import styles from '../../internal/tab/Tab.module.scss';
import { type TabsListProps } from '../types/TabsListProps';
import { focusNextEnabledTab } from './focusNextEnabledTab';
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsPanel.tsx b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsPanel.tsx
index fac3f4e13cc..8b3ed5d0e3a 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsPanel.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsPanel.tsx
@@ -2,7 +2,7 @@ import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
-import styles from '../Tabs.module.scss';
+import styles from '../../internal/tab/Tab.module.scss';
import { type TabsPanelProps } from '../types/TabsPanelProps';
export const TabsPanel = ({ className, ...props }: TabsPanelProps) => (
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsRoot.tsx b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsRoot.tsx
index 916e0305c0d..eb9be8644af 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsRoot.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsRoot.tsx
@@ -2,7 +2,7 @@ import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
-import styles from '../Tabs.module.scss';
+import styles from '../../internal/tab/Tab.module.scss';
import { type TabsRootProps } from '../types/TabsRootProps';
export const TabsRoot = ({ className, ...props }: TabsRootProps) => (
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsTab.tsx b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsTab.tsx
index d135a6d1165..b270f6b47fc 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsTab.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsTab.tsx
@@ -2,9 +2,9 @@ import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
-import styles from '../Tabs.module.scss';
+import styles from '../../internal/tab/Tab.module.scss';
+import { TabsTabContent } from '../../internal/tab/TabsTabContent';
import { type TabsTabProps } from '../types/TabsTabProps';
-import { TabsTabContent } from './TabsTabContent';
export const TabsTab = ({
className,
diff --git a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.module.scss b/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.module.scss
deleted file mode 100644
index 104971c1f71..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.module.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.undecoratedLink {
- text-decoration: none;
-}
diff --git a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.module.scss.d.ts b/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.module.scss.d.ts
deleted file mode 100644
index df9d63d432b..00000000000
--- a/packages/twenty-ui/src/primitives/navigation/UndecoratedLink/UndecoratedLink.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly undecoratedLink: 'undecoratedLink';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/navigation/index.ts b/packages/twenty-ui/src/primitives/navigation/index.ts
index ee593264846..58cd320ece0 100644
--- a/packages/twenty-ui/src/primitives/navigation/index.ts
+++ b/packages/twenty-ui/src/primitives/navigation/index.ts
@@ -8,8 +8,6 @@
*/
export { ClickToActionLink } from './ClickToActionLink/ClickToActionLink';
-export { ContactLink } from './ContactLink/ContactLink';
-export { GithubVersionLink } from './GithubVersionLink/GithubVersionLink';
export { CAL_LINK } from './Link/constants/Cal';
export { GITHUB_LINK } from './Link/constants/GithubLink';
export { TWENTY_PRICING_LINK } from './Link/constants/TwentyPricingLink';
@@ -19,41 +17,9 @@ export type { ListItemDescriptionPlacement } from './ListItem/types/ListItemDesc
export type { ListItemIndicator } from './ListItem/types/ListItemIndicator';
export type { ListItemProps } from './ListItem/types/ListItemProps';
export type { ListItemState } from './ListItem/types/ListItemState';
-export type { ColorLabels } from './MenuItem/constants/DefaultColorLabels';
-export { DEFAULT_COLOR_LABELS } from './MenuItem/constants/DefaultColorLabels';
-export type { MenuItemProps } from './MenuItem/MenuItem';
-export {
- MenuItemLeftContent,
- StyledHoverableMenuItemBase,
- StyledMenuItemIconCheck,
- StyledMenuItemLabel,
- StyledMenuItemLeftContent,
- MenuItem,
-} from './MenuItem/MenuItem';
-export type { MenuItemAccent } from './MenuItem/types/MenuItemAccent';
-export type { MenuItemDraggableGripMode } from './MenuItem/types/MenuItemDraggableGripMode';
-export type { MenuItemAvatarProps } from './MenuItemAvatar/MenuItemAvatar';
-export { MenuItemAvatar } from './MenuItemAvatar/MenuItemAvatar';
-export type { MenuItemDraggableProps } from './MenuItemDraggable/MenuItemDraggable';
-export { MenuItemDraggable } from './MenuItemDraggable/MenuItemDraggable';
-export type { MenuItemHotKeysProps } from './MenuItemHotKeys/MenuItemHotKeys';
-export { MenuItemHotKeys } from './MenuItemHotKeys/MenuItemHotKeys';
-export type { MenuItemSuggestionProps } from './MenuItemSuggestion/MenuItemSuggestion';
-export { MenuItemSuggestion } from './MenuItemSuggestion/MenuItemSuggestion';
-export { MenuPicker } from './MenuPicker/MenuPicker';
-export type { MenuPickerProps } from './MenuPicker/types/MenuPickerProps';
-export { NavigationBar } from './NavigationBar/NavigationBar';
-export { NavigationBarItem } from './NavigationBarItem/NavigationBarItem';
-export { RawLink } from './RawLink/RawLink';
-export { RoundedLink } from './RoundedLink/RoundedLink';
-export { LinkType } from './SocialLink/LinkType';
-export { SocialLink } from './SocialLink/SocialLink';
-export type { SocialLinkProvider } from './SocialLink/socialLinkProviders';
-export { SOCIAL_LINK_PROVIDERS } from './SocialLink/socialLinkProviders';
export { Tabs } from './Tabs/Tabs';
export type { TabsListProps } from './Tabs/types/TabsListProps';
export type { TabsPanelProps } from './Tabs/types/TabsPanelProps';
export type { TabsRootProps } from './Tabs/types/TabsRootProps';
export type { TabsSize } from './Tabs/types/TabsSize';
export type { TabsTabProps } from './Tabs/types/TabsTabProps';
-export { UndecoratedLink } from './UndecoratedLink/UndecoratedLink';
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/Tabs.module.scss b/packages/twenty-ui/src/primitives/navigation/internal/tab/Tab.module.scss
similarity index 98%
rename from packages/twenty-ui/src/primitives/navigation/Tabs/Tabs.module.scss
rename to packages/twenty-ui/src/primitives/navigation/internal/tab/Tab.module.scss
index e4c9936fcd5..c0218216e41 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/Tabs.module.scss
+++ b/packages/twenty-ui/src/primitives/navigation/internal/tab/Tab.module.scss
@@ -1,4 +1,4 @@
-@use '../../../styles/abstracts/mixins' as *;
+@use '../../../../styles/abstracts/mixins' as *;
.root {
display: flex;
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/Tabs.module.scss.d.ts b/packages/twenty-ui/src/primitives/navigation/internal/tab/Tab.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/navigation/Tabs/Tabs.module.scss.d.ts
rename to packages/twenty-ui/src/primitives/navigation/internal/tab/Tab.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsTabContent.tsx b/packages/twenty-ui/src/primitives/navigation/internal/tab/TabsTabContent.tsx
similarity index 78%
rename from packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsTabContent.tsx
rename to packages/twenty-ui/src/primitives/navigation/internal/tab/TabsTabContent.tsx
index cdeb9363594..1c8016e1513 100644
--- a/packages/twenty-ui/src/primitives/navigation/Tabs/internal/TabsTabContent.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/internal/tab/TabsTabContent.tsx
@@ -1,7 +1,7 @@
-import { type TabsTabProps } from '../types/TabsTabProps';
-import { isRenderableSlot } from './isRenderableSlot';
+import { isRenderableSlot } from '../../Tabs/internal/isRenderableSlot';
+import { type TabsTabProps } from '../../Tabs/types/TabsTabProps';
-import styles from '../Tabs.module.scss';
+import styles from './Tab.module.scss';
type TabsTabContentProps = Pick<
TabsTabProps,
diff --git a/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx
index 00444bb5ee0..e2252492039 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx
@@ -4,7 +4,6 @@ import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { IconX } from '@ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
-import { IconButton } from '@ui/components/IconButton/IconButton';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
@@ -53,11 +52,7 @@ const PopoverStory = ({
</Button>
<Popover.Close
style={{ alignSelf: 'flex-start' }}
- render={
- <IconButton aria-label="Close" size="sm">
- <IconX />
- </IconButton>
- }
+ render={<Button aria-label="Close" size="sm" startIcon={<IconX />} />}
/>
</Popover.Popup>
</Popover.Root>
diff --git a/packages/twenty-ui/src/primitives/surfaces/index.ts b/packages/twenty-ui/src/primitives/surfaces/index.ts
index 9916a1daea1..143bb945994 100644
--- a/packages/twenty-ui/src/primitives/surfaces/index.ts
+++ b/packages/twenty-ui/src/primitives/surfaces/index.ts
@@ -49,7 +49,6 @@ export type { MenuSide } from './Menu/types/MenuSide';
export type { MenuSubmenuRootProps } from './Menu/types/MenuSubmenuRootProps';
export type { MenuSubmenuTriggerProps } from './Menu/types/MenuSubmenuTriggerProps';
export type { MenuTriggerProps } from './Menu/types/MenuTriggerProps';
-export { OverflowingTextWithTooltip } from './OverflowingTextWithTooltip/OverflowingTextWithTooltip';
export { Popover } from './Popover/Popover';
export type { PopoverAlign } from './Popover/types/PopoverAlign';
export type { PopoverCloseProps } from './Popover/types/PopoverCloseProps';
diff --git a/packages/twenty-ui/src/primitives/typography/Heading/__stories__/Heading.stories.tsx b/packages/twenty-ui/src/primitives/typography/Heading/__stories__/Heading.stories.tsx
index 0b5b22be3bb..fe462bdc6af 100644
--- a/packages/twenty-ui/src/primitives/typography/Heading/__stories__/Heading.stories.tsx
+++ b/packages/twenty-ui/src/primitives/typography/Heading/__stories__/Heading.stories.tsx
@@ -1,4 +1,3 @@
-import { Section } from '@ui/components/Section/Section';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, within } from 'storybook/test';
@@ -44,9 +43,9 @@ const HEADING_COLORS = ['primary', 'secondary'] as const;
export const Catalog: Story = {
decorators: [ComponentDecorator],
render: () => (
- <Section.Root>
+ <div>
{HEADING_COLORS.map((color) => (
- <Section.Root key={color}>
+ <div key={color}>
{HEADING_SIZES.map((size) => (
<Heading
key={size}
@@ -57,9 +56,9 @@ export const Catalog: Story = {
{size} {color} heading
</Heading>
))}
- </Section.Root>
+ </div>
))}
- </Section.Root>
+ </div>
),
};
diff --git a/packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
diff --git a/packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
similarity index 96%
rename from packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
index d46fc2623d3..e7069606a89 100644
--- a/packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
+++ b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
@@ -1,12 +1,12 @@
-import { memo, type MouseEvent, type ReactNode, useRef, useState } from 'react';
+import { memo, useRef, useState, type MouseEvent, type ReactNode } from 'react';
import { isNonEmptyString } from '@sniptt/guards';
-import { clsx } from 'clsx';
import { Tooltip } from '@ui/primitives/surfaces/Tooltip/Tooltip';
import { type TooltipSide } from '@ui/primitives/surfaces/Tooltip/types/TooltipSide';
-import { LinkifiedText } from '@ui/primitives/typography/LinkifiedText/LinkifiedText';
import { Text } from '@ui/primitives/typography/Text/Text';
+import { LinkifiedText } from './internal/LinkifiedText/LinkifiedText';
import { isDefined } from '@ui/utilities/utils/isDefined';
+import { clsx } from 'clsx';
import styles from './OverflowingTextWithTooltip.module.scss';
diff --git a/packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/__stories__/OverflowTextWithTooltip.stories.tsx b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/__stories__/OverflowTextWithTooltip.stories.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/__stories__/OverflowTextWithTooltip.stories.tsx
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/__stories__/OverflowTextWithTooltip.stories.tsx
diff --git a/packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/__tests__/OverflowingTextWithTooltip.test.tsx b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/__tests__/OverflowingTextWithTooltip.test.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/surfaces/OverflowingTextWithTooltip/__tests__/OverflowingTextWithTooltip.test.tsx
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/__tests__/OverflowingTextWithTooltip.test.tsx
diff --git a/packages/twenty-ui/src/primitives/typography/LinkifiedText/LinkifiedText.module.scss b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/internal/LinkifiedText/LinkifiedText.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/typography/LinkifiedText/LinkifiedText.module.scss
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/internal/LinkifiedText/LinkifiedText.module.scss
diff --git a/packages/twenty-ui/src/primitives/typography/LinkifiedText/LinkifiedText.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/internal/LinkifiedText/LinkifiedText.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/typography/LinkifiedText/LinkifiedText.module.scss.d.ts
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/internal/LinkifiedText/LinkifiedText.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/typography/LinkifiedText/LinkifiedText.tsx b/packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/internal/LinkifiedText/LinkifiedText.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/typography/LinkifiedText/LinkifiedText.tsx
rename to packages/twenty-ui/src/primitives/typography/OverflowingTextWithTooltip/internal/LinkifiedText/LinkifiedText.tsx
diff --git a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.module.scss b/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.module.scss
deleted file mode 100644
index e2537443f79..00000000000
--- a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.module.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.container {
- display: flex;
- align-items: center;
- width: 100%;
- font-size: var(--t-font-size-md);
- font-weight: var(--t-font-weight-semi-bold);
- color: var(--t-font-color-extra-light);
-
- &::before,
- &::after {
- content: '';
- height: 1px;
- flex-grow: 1;
- background: var(--t-background-transparent-light);
- }
-
- &::before {
- margin: 0 var(--t-spacing-4) 0 0;
- }
-
- &::after {
- margin: 0 0 0 var(--t-spacing-4);
- }
-}
diff --git a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.module.scss.d.ts
deleted file mode 100644
index 8df71b4dead..00000000000
--- a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.tsx b/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.tsx
deleted file mode 100644
index 46f0d64f278..00000000000
--- a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/SeparatorLineText.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import styles from './SeparatorLineText.module.scss';
-
-export const SeparatorLineText = ({
- children,
-}: {
- children: React.ReactNode;
-}) => {
- return <div className={styles.container}>{children}</div>;
-};
diff --git a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/__stories__/SeparatorLineText.stories.tsx b/packages/twenty-ui/src/primitives/typography/SeparatorLineText/__stories__/SeparatorLineText.stories.tsx
deleted file mode 100644
index 61040abe532..00000000000
--- a/packages/twenty-ui/src/primitives/typography/SeparatorLineText/__stories__/SeparatorLineText.stories.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
-
-import { SeparatorLineText } from '@ui/primitives/typography/SeparatorLineText/SeparatorLineText';
-
-const meta: Meta<typeof SeparatorLineText> = {
- title: 'UI/Typography/SeparatorLineText',
- component: SeparatorLineText,
- args: { children: 'Or' },
- decorators: [ComponentDecorator],
-};
-
-export default meta;
-type Story = StoryObj<typeof SeparatorLineText>;
-
-export const Default: Story = {
- parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
-};
diff --git a/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.module.scss b/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.module.scss
deleted file mode 100644
index 296c89c73e0..00000000000
--- a/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.module.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-.content {
- font-size: var(--t-font-size-sm);
- font-weight: var(--t-font-weight-regular);
-
- overflow: hidden;
- padding-left: 0;
-
- white-space: nowrap;
-}
-
-.wrapper {
- --horizontal-padding: var(--t-spacing-1);
- --vertical-padding: var(--t-spacing-2);
-
- cursor: initial;
-
- display: flex;
-
- flex-direction: row;
-
- font-size: var(--t-font-size-sm);
-
- gap: var(--t-spacing-2);
-
- padding: var(--vertical-padding) 0;
-
- color: var(--styled-text-color, var(--t-font-color-primary));
-}
diff --git a/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.module.scss.d.ts
deleted file mode 100644
index 98d24e6a059..00000000000
--- a/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.module.scss.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const classNames: {
- readonly content: 'content';
- readonly wrapper: 'wrapper';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.tsx b/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.tsx
deleted file mode 100644
index 9cc7f6ae993..00000000000
--- a/packages/twenty-ui/src/primitives/typography/StyledText/StyledText.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { type ReactElement, type ReactNode } from 'react';
-import { clsx } from 'clsx';
-
-import styles from './StyledText.module.scss';
-
-type StyledTextProps = {
- PrefixComponent?: ReactElement;
- text: ReactNode;
- color?: string;
-};
-
-type StyledTextContentProps = React.ComponentPropsWithoutRef<'div'>;
-
-export const StyledTextContent = ({
- className,
- ...divProps
-}: StyledTextContentProps) => (
- <div className={clsx(styles.content, className)} {...divProps} />
-);
-
-type StyledTextWrapperProps = React.ComponentPropsWithoutRef<'div'> & {
- color?: string;
-};
-
-export const StyledTextWrapper = ({
- color,
- className,
- style,
- ...divProps
-}: StyledTextWrapperProps) => (
- <div
- className={clsx(styles.wrapper, className)}
- style={
- color
- ? ({ '--styled-text-color': color, ...style } as React.CSSProperties)
- : style
- }
- {...divProps}
- />
-);
-
-export const StyledText = ({
- PrefixComponent,
- text,
- color,
-}: StyledTextProps) => {
- return (
- <StyledTextWrapper color={color}>
- {PrefixComponent ? PrefixComponent : null}
- <StyledTextContent>{text}</StyledTextContent>
- </StyledTextWrapper>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/typography/index.ts b/packages/twenty-ui/src/primitives/typography/index.ts
index 9ea72a657f9..63e4e6350d4 100644
--- a/packages/twenty-ui/src/primitives/typography/index.ts
+++ b/packages/twenty-ui/src/primitives/typography/index.ts
@@ -9,13 +9,5 @@
export { Heading } from './Heading/Heading';
export type { HeadingProps } from './Heading/types/HeadingProps';
-export type { LabelVariant } from './Label/Label';
-export { Label } from './Label/Label';
-export { LinkifiedText } from './LinkifiedText/LinkifiedText';
-export { SeparatorLineText } from './SeparatorLineText/SeparatorLineText';
-export {
- StyledTextContent,
- StyledTextWrapper,
- StyledText,
-} from './StyledText/StyledText';
+export { OverflowingTextWithTooltip } from './OverflowingTextWithTooltip/OverflowingTextWithTooltip';
export { Text } from './Text/Text';
diff --git a/packages/twenty-ui/src/primitives/typography/Label/Label.module.scss b/packages/twenty-ui/src/primitives/typography/internal/Label/Label.module.scss
similarity index 100%
rename from packages/twenty-ui/src/primitives/typography/Label/Label.module.scss
rename to packages/twenty-ui/src/primitives/typography/internal/Label/Label.module.scss
diff --git a/packages/twenty-ui/src/primitives/typography/Label/Label.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/internal/Label/Label.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/primitives/typography/Label/Label.module.scss.d.ts
rename to packages/twenty-ui/src/primitives/typography/internal/Label/Label.module.scss.d.ts
diff --git a/packages/twenty-ui/src/primitives/typography/Label/Label.tsx b/packages/twenty-ui/src/primitives/typography/internal/Label/Label.tsx
similarity index 100%
rename from packages/twenty-ui/src/primitives/typography/Label/Label.tsx
rename to packages/twenty-ui/src/primitives/typography/internal/Label/Label.tsx
diff --git a/packages/twenty-ui/src/primitives/typography/Label/__stories__/Label.stories.tsx b/packages/twenty-ui/src/primitives/typography/internal/Label/__stories__/Label.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/primitives/typography/Label/__stories__/Label.stories.tsx
rename to packages/twenty-ui/src/primitives/typography/internal/Label/__stories__/Label.stories.tsx
index 95d02ea1206..5e5693b32bb 100644
--- a/packages/twenty-ui/src/primitives/typography/Label/__stories__/Label.stories.tsx
+++ b/packages/twenty-ui/src/primitives/typography/internal/Label/__stories__/Label.stories.tsx
@@ -1,14 +1,14 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing/a11yParameters';
import { CatalogDecorator } from '@ui/testing/decorators/CatalogDecorator';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing/a11yParameters';
import { type CatalogStory } from '@ui/testing/types/CatalogStory';
import {
Label,
type LabelVariant,
-} from '@ui/primitives/typography/Label/Label';
+} from '@ui/primitives/typography/internal/Label/Label';
const meta: Meta<typeof Label> = {
title: 'UI/Typography/Label',
diff --git a/packages/twenty-ui/src/utilities/index.ts b/packages/twenty-ui/src/utilities/index.ts
index 63a5b737dd9..9c27c9be13e 100644
--- a/packages/twenty-ui/src/utilities/index.ts
+++ b/packages/twenty-ui/src/utilities/index.ts
@@ -17,16 +17,11 @@ export { themeColorSchema } from './color/utils/themeColorSchema';
export { getOsControlSymbol } from './device/getOsControlSymbol';
export { getOsShortcutSeparator } from './device/getOsShortcutSeparator';
export { getUserDevice } from './device/getUserDevice';
-export { useMouseDownNavigation } from './navigation/hooks/useMouseDownNavigation';
-export { useResetLocationHash } from './navigation/hooks/useResetLocationHash';
-export { isNavigationModifierPressed } from './navigation/isNavigationModifierPressed';
-export type { TriggerEventType } from './navigation/types/trigger-event.type';
export { useIsMobile } from './responsive/hooks/useIsMobile';
export { useIsTouchDevice } from './responsive/hooks/useIsTouchDevice';
export { useScreenSize } from './screen-size/hooks/useScreenSize';
export type { ClickOutsideAttributes } from './types/ClickOutsideAttributes';
export type { Nullable } from './types/Nullable';
-export { getDisplayValueByUrlType } from './utils/getDisplayValueByUrlType';
export { getSafeUrl } from './utils/getSafeUrl';
export { isDefined } from './utils/isDefined';
export type { LinkifyMatch } from './utils/linkifyText';
diff --git a/packages/twenty-ui/test-utilities/conformance/runComponentConformance.tsx b/packages/twenty-ui/test-utilities/conformance/runComponentConformance.tsx
index c4cf88a270e..cddbe623131 100644
--- a/packages/twenty-ui/test-utilities/conformance/runComponentConformance.tsx
+++ b/packages/twenty-ui/test-utilities/conformance/runComponentConformance.tsx
@@ -13,12 +13,12 @@ import {
describe,
expect,
it,
- type MockInstance,
vi,
+ type MockInstance,
} from 'vitest';
-import { ThemeProvider } from '@ui/theme-constants/ThemeProvider';
-import { isDefined } from '@ui/utilities/utils/isDefined';
+import { ThemeProvider } from '@ui/theme-constants';
+import { isDefined } from '@ui/utilities';
import { type ComponentConformanceCase } from './types/ComponentConformanceCase';
import { type ComponentConformanceOptions } from './types/ComponentConformanceOptions';
diff --git a/packages/twenty-ui/test-utilities/conformance/utils/hideGlobals.ts b/packages/twenty-ui/test-utilities/conformance/utils/hideGlobals.ts
index 07e314a6d46..315e6dcfa56 100644
--- a/packages/twenty-ui/test-utilities/conformance/utils/hideGlobals.ts
+++ b/packages/twenty-ui/test-utilities/conformance/utils/hideGlobals.ts
@@ -1,4 +1,4 @@
-import { isDefined } from '@ui/utilities/utils/isDefined';
+import { isDefined } from '@ui/utilities';
type HiddenGlobal = {
globalName: string;
diff --git a/packages/twenty-ui/tsconfig.json b/packages/twenty-ui/tsconfig.json
index 064c7b4d11d..c731563661b 100644
--- a/packages/twenty-ui/tsconfig.json
+++ b/packages/twenty-ui/tsconfig.json
@@ -34,6 +34,7 @@
"scripts/generateDocsData.ts",
"docs/**/*.ts",
"scripts/checkDocsExamples.ts",
- "scripts/checkOptionalDependencies.ts"
+ "scripts/checkOptionalDependencies.ts",
+ "scripts/checkModuleOwnership.ts"
]
}
diff --git a/yarn.lock b/yarn.lock
index 13fcd19f55d..63f73b186ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -50621,11 +50621,14 @@ __metadata:
monaco-editor: ">= 0.25.0 < 1"
react: ^19.0.0
react-dom: ^19.0.0
+ react-router-dom: ^7.18.4
peerDependenciesMeta:
"@monaco-editor/react":
optional: true
monaco-editor:
optional: true
+ react-router-dom:
+ optional: true
languageName: unknown
linkType: soft