Skip to content

The open alternative to Salesforce, designed for AI.

Move the Slack app to twenty-ui 2.x and use its Skeleton (#28604)

Abdul Rahman27f4ec9eeba4
diff --git a/packages/twenty-apps/public/slack/package.json b/packages/twenty-apps/public/slack/package.json
index 22ddbc58268..97d1dfbfc77 100644
--- a/packages/twenty-apps/public/slack/package.json
+++ b/packages/twenty-apps/public/slack/package.json
@@ -43,7 +43,7 @@
"react-dom": "^18.2.0",
"twenty-client-sdk": "^2.46.0",
"twenty-sdk": "^2.46.0",
- "twenty-ui": "^1.0.0-alpha.1",
+ "twenty-ui": "^2.50.0",
"typescript": "^5.9.3",
"vite-tsconfig-paths": "^4.2.1",
"vitest": "^4.0.0",
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPicker.tsx b/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPicker.tsx
index bac7178fd7b..a3db9ef7ab5 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPicker.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPicker.tsx
@@ -1,9 +1,9 @@
import styled from '@emotion/styled';
import { useState } from 'react';
import { isDefined } from 'twenty-sdk/utils';
-import { Avatar } from 'twenty-ui/data-display';
-import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { themeCssVariables } from 'twenty-ui/theme';
import { InlineWorkspaceMemberPickerPanel } from 'src/front-components/components/InlineWorkspaceMemberPickerPanel';
import { type WorkspaceMemberOption } from 'src/front-components/types/workspace-member-option.type';
@@ -95,9 +95,9 @@ export const InlineWorkspaceMemberPicker = ({
{isDefined(selectedMember) ? (
<StyledSelectedValue>
<Avatar
- placeholder={getMemberDisplayName(selectedMember)}
- placeholderColorSeed={selectedMember.id}
- type="rounded"
+ name={getMemberDisplayName(selectedMember)}
+ colorSeed={selectedMember.id}
+ shape="circle"
size="sm"
/>
<StyledValueName>
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPickerPanel.tsx b/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPickerPanel.tsx
index 12ebba98294..798fbe6d396 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPickerPanel.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/InlineWorkspaceMemberPickerPanel.tsx
@@ -1,8 +1,10 @@
import styled from '@emotion/styled';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import { MenuItem, MenuItemAvatar } from 'twenty-ui/navigation';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { ListItemButton } from 'twenty-ui/components/navigation';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { ListItem } from 'twenty-ui/primitives/navigation';
+import { themeCssVariables } from 'twenty-ui/theme';
import { useWorkspaceMemberSearch } from 'src/front-components/hooks/use-workspace-member-search';
import { type WorkspaceMemberOption } from 'src/front-components/types/workspace-member-option.type';
@@ -115,24 +117,26 @@ export const InlineWorkspaceMemberPickerPanel = ({
<StyledOptions role="listbox" aria-label="Workspace members">
{options.map((member) => (
<div key={member.id} role="option" aria-selected={false}>
- <MenuItemAvatar
- avatar={{
- type: 'rounded',
- size: 'md',
- placeholder: getMemberDisplayName(member),
- placeholderColorSeed: member.id,
- }}
- text={getMemberDisplayName(member)}
- contextualText={member.userEmail ?? undefined}
+ <ListItemButton
+ startIcon={
+ <Avatar
+ name={getMemberDisplayName(member)}
+ colorSeed={member.id}
+ size="md"
+ shape="circle"
+ />
+ }
+ description={member.userEmail}
onClick={() => onSelect(member)}
- />
+ >
+ {getMemberDisplayName(member)}
+ </ListItemButton>
</div>
))}
{options.length === 0 && (
- <MenuItem
- disabled
- text={getEmptyStateText({ isSearching, searchErrorMessage })}
- />
+ <ListItem disabled>
+ {getEmptyStateText({ isSearching, searchErrorMessage })}
+ </ListItem>
)}
</StyledOptions>
</StyledDropdownPanel>
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SearchDropdownPicker.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SearchDropdownPicker.tsx
index e92c9c95d22..750c98637c5 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SearchDropdownPicker.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SearchDropdownPicker.tsx
@@ -1,7 +1,7 @@
import styled from '@emotion/styled';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme';
import { SlackUserLinkTextInput } from 'src/front-components/components/SlackUserLinkTextInput';
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackPickedEntityButton.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackPickedEntityButton.tsx
index f5cb1639dfa..896a6c2b707 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackPickedEntityButton.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackPickedEntityButton.tsx
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import { isNonEmptyString } from '@sniptt/guards';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme';
const StyledPickedEntity = styled.button`
align-items: center;
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackSettingsTable.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackSettingsTable.tsx
index 37e5c8179a5..76153018fec 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackSettingsTable.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackSettingsTable.tsx
@@ -1,5 +1,5 @@
import styled from '@emotion/styled';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme';
export const SlackTable = styled.div`
display: flex;
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkForm.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkForm.tsx
index 56ff63860ea..a424ae3d9f3 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkForm.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkForm.tsx
@@ -3,10 +3,9 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { isDefined } from 'twenty-sdk/utils';
import { enqueueSnackbar } from 'twenty-sdk/front-component';
-import { Button } from 'twenty-ui/input';
-import { Section } from 'twenty-ui/layout';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/typography';
+import { Button } from 'twenty-ui/primitives/input';
+import { Section } from 'twenty-ui/components/layout';
+import { themeCssVariables } from 'twenty-ui/theme';
import { ResolvedSlackUserField } from 'src/front-components/components/ResolvedSlackUserField';
import { SlackConnectUserIdFields } from 'src/front-components/components/SlackConnectUserIdFields';
@@ -132,8 +131,8 @@ export const SlackUserLinkForm = ({
};
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title="Link a Slack user"
description="Pick a workspace member and the Slack account whose messages should act with that member's permissions. A link whose Slack email matches the member activates immediately; other in-workspace links ask the Slack user to approve first."
/>
@@ -196,11 +195,12 @@ export const SlackUserLinkForm = ({
<StyledDisclosure>
<Button
type="button"
- title="Guest or Slack Connect user? Link by Slack ID instead"
- size="small"
- variant="tertiary"
+ size="sm"
+ variant="ghost"
onClick={() => setIsConnectUser(true)}
- />
+ >
+ Guest or Slack Connect user? Link by Slack ID instead
+ </Button>
</StyledDisclosure>
)}
{isResolving ? (
@@ -236,14 +236,15 @@ export const SlackUserLinkForm = ({
<StyledActions>
<Button
type="button"
- title={isSubmitting ? 'Saving…' : 'Save link'}
- variant="primary"
- accent="blue"
+ variant="solid"
+ color="accent"
disabled={!canSubmit}
onClick={handleSubmit}
- />
+ >
+ {isSubmitting ? 'Saving…' : 'Save link'}
+ </Button>
</StyledActions>
</StyledForm>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormField.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormField.tsx
index ee6b4f828ad..3f0ea395baf 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormField.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormField.tsx
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import { type ReactNode } from 'react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme';
const StyledField = styled.div`
display: flex;
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormHint.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormHint.tsx
index 15f87e0a2ce..b46d7ad114b 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormHint.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkFormHint.tsx
@@ -1,5 +1,5 @@
import styled from '@emotion/styled';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme';
export const SlackUserLinkFormHint = styled.span`
color: ${() => themeCssVariables.font.color.tertiary};
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkTextInput.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkTextInput.tsx
index 214c0ee96bd..c14d5b93a36 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkTextInput.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinkTextInput.tsx
@@ -1,5 +1,5 @@
import styled from '@emotion/styled';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme';
export const SlackUserLinkTextInput = styled.input`
background-color: ${() => themeCssVariables.background.transparent.lighter};
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksList.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksList.tsx
index df54f437328..cf8237f02e4 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksList.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksList.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled';
import { isNonEmptyString } from '@sniptt/guards';
import { useEffect, useState } from 'react';
import { isDefined } from 'twenty-sdk/utils';
-import { Avatar, Tag } from 'twenty-ui/data-display';
-import { Button } from 'twenty-ui/input';
-import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { Avatar, Tag, type TagColor } from 'twenty-ui/primitives/data-display';
+import { Button } from 'twenty-ui/primitives/input';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { themeCssVariables } from 'twenty-ui/theme';
import {
SlackTable,
@@ -58,8 +58,6 @@ const StyledEmptyState = styled.div`
padding: ${() => themeCssVariables.spacing[2]};
`;
-type TagColor = 'blue' | 'green' | 'orange' | 'red' | 'gray';
-
const getSourceLabel = (source: string | null): string =>
source === SLACK_USER_LINK_SOURCE.MANUAL
? 'Set manually'
@@ -183,9 +181,9 @@ export const SlackUserLinksList = ({
<SlackTableCell>
<StyledIdentity>
<Avatar
- placeholder={displayedName}
- placeholderColorSeed={slackUserLink.id}
- type="rounded"
+ name={displayedName}
+ colorSeed={slackUserLink.id}
+ shape="circle"
size="md"
/>
<StyledDetails>
@@ -208,19 +206,17 @@ export const SlackUserLinksList = ({
</SlackTableCell>
<SlackTableCell>
{isDisconnected ? (
- <Tag color="gray" text={DISCONNECTED_WORKSPACE_LABEL} />
+ <Tag color="gray">{DISCONNECTED_WORKSPACE_LABEL}</Tag>
) : (
isDefined(consentState) && (
- <Tag
- color={CONSENT_COLORS[consentState]}
- text={CONSENT_LABELS[consentState]}
- />
+ <Tag color={CONSENT_COLORS[consentState]}>
+ {CONSENT_LABELS[consentState]}
+ </Tag>
)
)}
- <Tag
- color={getSourceColor(slackUserLink.source)}
- text={getSourceLabel(slackUserLink.source)}
- />
+ <Tag color={getSourceColor(slackUserLink.source)}>
+ {getSourceLabel(slackUserLink.source)}
+ </Tag>
</SlackTableCell>
<SlackTableCell align="right">
{canManage && (
@@ -228,43 +224,42 @@ export const SlackUserLinksList = ({
{isPending && removalArmedLinkId !== slackUserLink.id && (
<Button
type="button"
- title={
- resendingLinkId === slackUserLink.id
- ? 'Resending…'
- : 'Resend'
- }
- size="small"
- variant="secondary"
+ size="sm"
+ variant="outline"
disabled={isActionInFlight}
onClick={() => onResend(slackUserLink)}
- />
+ >
+ {resendingLinkId === slackUserLink.id
+ ? 'Resending…'
+ : 'Resend'}
+ </Button>
)}
{removalArmedLinkId === slackUserLink.id ? (
<Button
type="button"
- title={
- removingLinkId === slackUserLink.id
- ? 'Removing…'
- : 'Confirm removal'
- }
- size="small"
- variant="secondary"
- accent="danger"
+ size="sm"
+ variant="outline"
+ color="danger"
disabled={isActionInFlight}
onClick={() => {
setRemovalArmedLinkId(null);
onRemove(slackUserLink);
}}
- />
+ >
+ {removingLinkId === slackUserLink.id
+ ? 'Removing…'
+ : 'Confirm removal'}
+ </Button>
) : (
<Button
type="button"
- title="Remove"
- size="small"
- variant="secondary"
+ size="sm"
+ variant="outline"
disabled={isActionInFlight}
onClick={() => setRemovalArmedLinkId(slackUserLink.id)}
- />
+ >
+ Remove
+ </Button>
)}
</>
)}
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsx
index bb45ead70c3..c1b8fb4fe09 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettings.tsx
@@ -7,11 +7,10 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { enqueueSnackbar, useColorScheme } from 'twenty-sdk/front-component';
import { isDefined } from 'twenty-sdk/utils';
-import { Callout } from 'twenty-ui/feedback';
-import { Button } from 'twenty-ui/input';
-import { Section } from 'twenty-ui/layout';
-import { ThemeProvider, themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/typography';
+import { Callout } from 'twenty-ui/components/feedback';
+import { Button } from 'twenty-ui/primitives/input';
+import { Section } from 'twenty-ui/components/layout';
+import { ThemeProvider, themeCssVariables } from 'twenty-ui/theme';
import { SlackUserLinkForm } from 'src/front-components/components/SlackUserLinkForm';
import { SlackUserLinksList } from 'src/front-components/components/SlackUserLinksList';
@@ -198,21 +197,21 @@ const SlackUserLinksSettingsContent = () => {
<StyledContainer>
{!canManage && (
<Callout
- variant="warning"
+ status="warning"
title="You need the roles permission"
description="Only members with the roles permission can create or change Slack user links. You can review the existing links below."
/>
)}
{shouldWarnAboutRosterMatch && (
<Callout
- variant="warning"
+ status="warning"
title="Email auto-link did not finish"
description="The last automatic email match failed before linking everyone. Press Auto-link by email below to run it again."
/>
)}
{canManage && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title="Unlinked Slack users"
description="Only Slack users linked to a workspace member can use the assistant. Pick a workspace member on a row to link them in place, or auto-link everyone whose Slack email matches a workspace member."
/>
@@ -235,17 +234,18 @@ const SlackUserLinksSettingsContent = () => {
)}
<Button
type="button"
- title={isMatching ? 'Auto-linking…' : 'Auto-link by email'}
- size="small"
- variant="secondary"
+ size="sm"
+ variant="outline"
disabled={isMatching}
onClick={handleMatchByEmail}
- />
+ >
+ {isMatching ? 'Auto-linking…' : 'Auto-link by email'}
+ </Button>
</StyledMatchAction>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title="Slack user links"
description="Each link maps a Slack account to the workspace member whose permissions the assistant borrows."
/>
@@ -265,7 +265,7 @@ const SlackUserLinksSettingsContent = () => {
resendingLinkId={resendingLinkId}
/>
)}
- </Section>
+ </Section.Root>
{canManage &&
(isManualFormOpen ? (
<SlackUserLinkForm
@@ -276,11 +276,12 @@ const SlackUserLinksSettingsContent = () => {
<StyledDisclosure>
<Button
type="button"
- title="Link someone not listed above"
- size="small"
- variant="secondary"
+ size="sm"
+ variant="outline"
onClick={() => setIsManualFormOpen(true)}
- />
+ >
+ Link someone not listed above
+ </Button>
</StyledDisclosure>
))}
</StyledContainer>
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettingsSkeleton.tsx b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettingsSkeleton.tsx
index abd206c4176..84da359cf40 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettingsSkeleton.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/SlackUserLinksSettingsSkeleton.tsx
@@ -1,17 +1,8 @@
-import { keyframes } from '@emotion/react';
import styled from '@emotion/styled';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { Skeleton, SKELETON_HEIGHT_SIZES } from 'twenty-ui/primitives/feedback';
+import { themeCssVariables } from 'twenty-ui/theme';
const SKELETON_ROW_COUNT = 5;
-const TITLE_BAR_WIDTH_PIXELS = 140;
-const TITLE_BAR_HEIGHT_PIXELS = 16;
-const DESCRIPTION_LINE_HEIGHT_PIXELS = 13;
-const LAST_DESCRIPTION_LINE_WIDTH = '60%';
-const ROW_HEIGHT_PIXELS = 32;
-
-const shimmer = keyframes`
- to { transform: translateX(100%); }
-`;
const StyledContainer = styled.div`
display: flex;
@@ -33,63 +24,16 @@ const StyledRows = styled.div`
gap: ${() => themeCssVariables.spacing[2]};
`;
-// TODO(@abdulrahmancodes): use Skeleton from twenty-ui/primitives/feedback once this app is on twenty-ui 2.x
-const StyledBar = styled.span`
- background-color: ${() => themeCssVariables.background.tertiary};
- border-radius: ${() => themeCssVariables.border.radius.sm};
- display: block;
- overflow: hidden;
- position: relative;
- width: 100%;
-
- &::after {
- animation: ${shimmer} 1.5s ease-in-out infinite;
- background-image: linear-gradient(
- 90deg,
- ${() => themeCssVariables.background.tertiary} 0%,
- ${() => themeCssVariables.background.transparent.lighter} 50%,
- ${() => themeCssVariables.background.tertiary} 100%
- );
- content: ' ';
- inset: 0;
- position: absolute;
- transform: translateX(-100%);
- }
-
- @media (prefers-reduced-motion: reduce) {
- &::after {
- display: none;
- }
- }
-`;
-
-const StyledTitleBar = styled(StyledBar)`
- height: ${TITLE_BAR_HEIGHT_PIXELS}px;
- width: ${TITLE_BAR_WIDTH_PIXELS}px;
-`;
-
-const StyledDescriptionLine = styled(StyledBar)`
- height: ${DESCRIPTION_LINE_HEIGHT_PIXELS}px;
-
- &:last-of-type {
- width: ${LAST_DESCRIPTION_LINE_WIDTH};
- }
-`;
-
-const StyledRow = styled(StyledBar)`
- height: ${ROW_HEIGHT_PIXELS}px;
-`;
-
export const SlackUserLinksSettingsSkeleton = () => (
<StyledContainer aria-busy="true" aria-label="Loading Slack user links">
- <StyledTitleBar />
+ <Skeleton layout="block" width={140} height={SKELETON_HEIGHT_SIZES.s} />
<StyledDescription>
- <StyledDescriptionLine />
- <StyledDescriptionLine />
+ <Skeleton layout="block" height={SKELETON_HEIGHT_SIZES.xs} />
+ <Skeleton layout="block" width="60%" height={SKELETON_HEIGHT_SIZES.xs} />
</StyledDescription>
<StyledRows>
{Array.from({ length: SKELETON_ROW_COUNT }, (_, index) => (
- <StyledRow key={index} />
+ <Skeleton key={index} layout="block" height={SKELETON_HEIGHT_SIZES.l} />
))}
</StyledRows>
</StyledContainer>
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUserRow.tsx b/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUserRow.tsx
index ede079c2981..574504920e3 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUserRow.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUserRow.tsx
@@ -3,10 +3,10 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { enqueueSnackbar } from 'twenty-sdk/front-component';
import { isDefined } from 'twenty-sdk/utils';
-import { Avatar } from 'twenty-ui/data-display';
-import { Button } from 'twenty-ui/input';
-import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { Button } from 'twenty-ui/primitives/input';
+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';
+import { themeCssVariables } from 'twenty-ui/theme';
import { InlineWorkspaceMemberPicker } from 'src/front-components/components/InlineWorkspaceMemberPicker';
import {
@@ -98,9 +98,9 @@ export const UnlinkedSlackUserRow = ({
<SlackTableCell>
<StyledIdentity>
<Avatar
- placeholder={displayedName}
- placeholderColorSeed={slackUser.slackUserId}
- type="rounded"
+ name={displayedName}
+ colorSeed={slackUser.slackUserId}
+ shape="circle"
size="md"
/>
<StyledName>
@@ -125,13 +125,14 @@ export const UnlinkedSlackUserRow = ({
<StyledLinkControls>
<Button
type="button"
- title={isSubmitting ? 'Linking…' : 'Link'}
- size="small"
- variant="secondary"
- accent="blue"
+ size="sm"
+ variant="outline"
+ color="accent"
disabled={!isDefined(selectedMember) || isSubmitting}
onClick={handleLink}
- />
+ >
+ {isSubmitting ? 'Linking…' : 'Link'}
+ </Button>
</StyledLinkControls>
</StyledMemberCell>
</SlackTableCell>
diff --git a/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUsersList.tsx b/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUsersList.tsx
index ea13299edff..8a6657658d5 100644
--- a/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUsersList.tsx
+++ b/packages/twenty-apps/public/slack/src/front-components/components/UnlinkedSlackUsersList.tsx
@@ -1,5 +1,5 @@
import styled from '@emotion/styled';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { themeCssVariables } from 'twenty-ui/theme';
import {
SlackTable,
diff --git a/packages/twenty-apps/public/slack/yarn.lock b/packages/twenty-apps/public/slack/yarn.lock
index 3df37ecdb0b..e897484a150 100644
--- a/packages/twenty-apps/public/slack/yarn.lock
+++ b/packages/twenty-apps/public/slack/yarn.lock
@@ -81,13 +81,20 @@ __metadata:
languageName: node
linkType: hard
-"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.29.2":
+"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3":
version: 7.29.7
resolution: "@babel/runtime@npm:7.29.7"
checksum: 10c0/ca11572f7146b21e0bde6a9ed4bb6a89eafbee5f0944c7eb54d0d8a2dac962c33638a1d611e14faa71dfbb92b4b5f9236232208568a6b7d5c6f3f39ddb91771e
languageName: node
linkType: hard
+"@babel/runtime@npm:^7.29.7 || ^8.0.0":
+ version: 8.0.8
+ resolution: "@babel/runtime@npm:8.0.8"
+ checksum: 10c0/059934f37971e24c5cd4505a2e0f63a039051935c0a9fcebd31fb7d0a0c05acd7915ba2f06db5197c97a31755862330232253b9a2cefa5bf37fdc9e521b4d6dc
+ languageName: node
+ linkType: hard
+
"@babel/template@npm:^7.29.7":
version: 7.29.7
resolution: "@babel/template@npm:7.29.7"
@@ -124,15 +131,15 @@ __metadata:
languageName: node
linkType: hard
-"@base-ui/react@npm:^1.5.0":
- version: 1.7.0
- resolution: "@base-ui/react@npm:1.7.0"
+"@base-ui/react@npm:^1.9.0":
+ version: 1.9.0
+ resolution: "@base-ui/react@npm:1.9.0"
dependencies:
- "@babel/runtime": "npm:^7.29.2"
- "@base-ui/utils": "npm:0.3.2"
+ "@babel/runtime": "npm:^7.29.7 || ^8.0.0"
+ "@base-ui/utils": "npm:0.5.0"
"@floating-ui/react-dom": "npm:^2.1.9"
"@floating-ui/utils": "npm:^0.2.12"
- use-sync-external-store: "npm:^1.6.0"
+ use-sync-external-store: "npm:^1.7.0"
peerDependencies:
"@date-fns/tz": ^1.2.0
"@types/react": ^17 || ^18 || ^19
@@ -146,18 +153,18 @@ __metadata:
optional: true
date-fns:
optional: true
- checksum: 10c0/05bc69f68431ff30a5fac98d8e75c77af7c27749d10aeac10ab7f26843a0a8b49ca5cff32654aad1a107cb7f44aeb1705c15138c9c7f7ddc19d6321fbb263e4d
+ checksum: 10c0/0495ec9026ad2f5f04580865a1b40c2899b2475d77472d3dcb8b688b1a2a949e14493cc50adb4dd7d33970caef7845ef4a0b93184a8299ed78bda7ff7c288847
languageName: node
linkType: hard
-"@base-ui/utils@npm:0.3.2":
- version: 0.3.2
- resolution: "@base-ui/utils@npm:0.3.2"
+"@base-ui/utils@npm:0.5.0":
+ version: 0.5.0
+ resolution: "@base-ui/utils@npm:0.5.0"
dependencies:
- "@babel/runtime": "npm:^7.29.2"
+ "@babel/runtime": "npm:^7.29.7 || ^8.0.0"
"@floating-ui/utils": "npm:^0.2.12"
- reselect: "npm:^5.2.0"
- use-sync-external-store: "npm:^1.6.0"
+ reselect: "npm:^5.3.0"
+ use-sync-external-store: "npm:^1.7.0"
peerDependencies:
"@types/react": ^17 || ^18 || ^19
react: ^17 || ^18 || ^19
@@ -165,7 +172,7 @@ __metadata:
peerDependenciesMeta:
"@types/react":
optional: true
- checksum: 10c0/b523339f350679915550605e59754b5db9806a41a3b390d6f6adad29fedc0caf084c8ad1bad6bb62a463360593382defb7d3ea941a94404ed9db0142fdae5800
+ checksum: 10c0/864b572ea60ea557bfdc63ff056026ed585cce4f35e4996c63e86503944befa3d9bc41e8f1da847e1273d8ac0b2f55210eecff936c3cfb1e0ea7ba9bfc5c5b5b
languageName: node
linkType: hard
@@ -1093,28 +1100,6 @@ __metadata:
languageName: node
linkType: hard
-"@monaco-editor/loader@npm:^1.5.0":
- version: 1.7.0
- resolution: "@monaco-editor/loader@npm:1.7.0"
- dependencies:
- state-local: "npm:^1.0.6"
- checksum: 10c0/1fd3579cb09b669493cf553dfc0723a93483140a44353ce9a739827edfa7b2c6541b254024d15c48176ece749ef666b6d16cce6cf0e4396c7fa1c5a48012d08a
- languageName: node
- linkType: hard
-
-"@monaco-editor/react@npm:^4.7.0":
- version: 4.7.0
- resolution: "@monaco-editor/react@npm:4.7.0"
- dependencies:
- "@monaco-editor/loader": "npm:^1.5.0"
- peerDependencies:
- monaco-editor: ">= 0.25.0 < 1"
- react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
- react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
- checksum: 10c0/a4e91c6eda1a71f5fd23871bd801de435490ccbc43934d23cba65cefe2be7e9d02c9a57c4ef80fc9fe99e4d4deea51e5db19cb4e0ecf3f51818dda0eb9cdbf12
- languageName: node
- linkType: hard
-
"@mswjs/interceptors@npm:^0.41.3":
version: 0.41.9
resolution: "@mswjs/interceptors@npm:0.41.9"
@@ -1223,20 +1208,6 @@ __metadata:
languageName: node
linkType: hard
-"@radix-ui/colors@npm:^3.0.0":
- version: 3.0.0
- resolution: "@radix-ui/colors@npm:3.0.0"
- checksum: 10c0/612c6bb4efe987f2d49aaca2f785687d08150da59a248328bc2b4e187ece4ef731c1dc5c6a9430fffcac4af9e65cf2f89ceb9806f8809940c9eb238b79d2cf2f
- languageName: node
- linkType: hard
-
-"@remix-run/router@npm:1.23.4":
- version: 1.23.4
- resolution: "@remix-run/router@npm:1.23.4"
- checksum: 10c0/ef17eb2a606c125f09c55683585099725421af1c11f1c1d1c3841fe4eea3f99eb56b26ecbb17429a173c704ecae336c37e0d74855faa9330667433ef4f419436
- languageName: node
- linkType: hard
-
"@rolldown/binding-android-arm-eabi@npm:1.2.15":
version: 1.2.15
resolution: "@rolldown/binding-android-arm-eabi@npm:1.2.15"
@@ -1433,7 +1404,7 @@ __metadata:
react-dom: "npm:^18.2.0"
twenty-client-sdk: "npm:^2.46.0"
twenty-sdk: "npm:^2.46.0"
- twenty-ui: "npm:^1.0.0-alpha.1"
+ twenty-ui: "npm:^2.50.0"
typescript: "npm:^5.9.3"
vite-tsconfig-paths: "npm:^4.2.1"
vitest: "npm:^4.0.0"
@@ -2023,13 +1994,6 @@ __metadata:
languageName: node
linkType: hard
-"css-mediaquery@npm:^0.1.2":
- version: 0.1.2
- resolution: "css-mediaquery@npm:0.1.2"
- checksum: 10c0/b7825a78f52ce8a8198e004fcad0d7be1d3c9a0463ecd05ba31a0f2c94fb81468ad6f4d7bf715a6ca775696e7a17500c2a339b5216a6d0f789cbf78f9454d048
- languageName: node
- linkType: hard
-
"csstype@npm:^3.0.2, csstype@npm:^3.2.2":
version: 3.2.3
resolution: "csstype@npm:3.2.3"
@@ -2578,13 +2542,6 @@ __metadata:
languageName: node
linkType: hard
-"hyphenate-style-name@npm:^1.0.0":
- version: 1.1.0
- resolution: "hyphenate-style-name@npm:1.1.0"
- checksum: 10c0/bfe88deac2414a41a0d08811e277c8c098f23993d6a1eb17f14a0f11b54c4d42865a63d3cfe1914668eefb9a188e2de58f38b55a179a238fd1fef606893e194f
- languageName: node
- linkType: hard
-
"iconv-lite@npm:^0.7.2":
version: 0.7.2
resolution: "iconv-lite@npm:0.7.2"
@@ -2922,7 +2879,7 @@ __metadata:
languageName: node
linkType: hard
-"loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
+"loose-envify@npm:^1.1.0":
version: 1.4.0
resolution: "loose-envify@npm:1.4.0"
dependencies:
@@ -2942,15 +2899,6 @@ __metadata:
languageName: node
linkType: hard
-"matchmediaquery@npm:^0.3.0":
- version: 0.3.1
- resolution: "matchmediaquery@npm:0.3.1"
- dependencies:
- css-mediaquery: "npm:^0.1.2"
- checksum: 10c0/19a254e0a1eb639fcc6aa7428a6e2d36cb5646a165579897e771580653e470b43d7f4a224c522700dbf1d8f19fb7c63a9719e0a6017727ade967155a2ae89fea
- languageName: node
- linkType: hard
-
"math-intrinsics@npm:^1.1.0":
version: 1.1.0
resolution: "math-intrinsics@npm:1.1.0"
@@ -3098,13 +3046,6 @@ __metadata:
languageName: node
linkType: hard
-"object-assign@npm:^4.1.1":
- version: 4.1.1
- resolution: "object-assign@npm:4.1.1"
- checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
- languageName: node
- linkType: hard
-
"obug@npm:^2.1.1":
version: 2.1.2
resolution: "obug@npm:2.1.2"
@@ -3316,17 +3257,6 @@ __metadata:
languageName: node
linkType: hard
-"prop-types@npm:^15.6.1":
- version: 15.8.1
- resolution: "prop-types@npm:15.8.1"
- dependencies:
- loose-envify: "npm:^1.4.0"
- object-assign: "npm:^4.1.1"
- react-is: "npm:^16.13.1"
- checksum: 10c0/59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077
- languageName: node
- linkType: hard
-
"proxy-from-env@npm:^2.1.0":
version: 2.1.0
resolution: "proxy-from-env@npm:2.1.0"
@@ -3357,7 +3287,7 @@ __metadata:
languageName: node
linkType: hard
-"react-is@npm:^16.13.1, react-is@npm:^16.7.0":
+"react-is@npm:^16.7.0":
version: 16.13.1
resolution: "react-is@npm:16.13.1"
checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
@@ -3375,44 +3305,6 @@ __metadata:
languageName: node
linkType: hard
-"react-responsive@npm:^9.0.2":
- version: 9.0.2
- resolution: "react-responsive@npm:9.0.2"
- dependencies:
- hyphenate-style-name: "npm:^1.0.0"
- matchmediaquery: "npm:^0.3.0"
- prop-types: "npm:^15.6.1"
- shallow-equal: "npm:^1.2.1"
- peerDependencies:
- react: ">=16.8.0"
- checksum: 10c0/c58b30d8b8ff993edbc73f7de59a2d86d8abd6380b06a9b41667c3bdd5401e5e710fa1d0fdac21368759ab9b958e8b479a111329a06e9b0241ee08f500b37a20
- languageName: node
- linkType: hard
-
-"react-router-dom@npm:^6.4.4":
- version: 6.30.6
- resolution: "react-router-dom@npm:6.30.6"
- dependencies:
- "@remix-run/router": "npm:1.23.4"
- react-router: "npm:6.30.6"
- peerDependencies:
- react: ">=16.8"
- react-dom: ">=16.8"
- checksum: 10c0/57dbb2ae4ac787f78c4d10b764c1c5223635378033e33dda4e0a4417144ae847fb43dc98008075951826258287c27c67729ca713c90957cf2ecf9055561bdc2e
- languageName: node
- linkType: hard
-
-"react-router@npm:6.30.6":
- version: 6.30.6
- resolution: "react-router@npm:6.30.6"
- dependencies:
- "@remix-run/router": "npm:1.23.4"
- peerDependencies:
- react: ">=16.8"
- checksum: 10c0/d101388d92a44e159ef30dd2402a7f7b6aace8f837bb42aed1f8a6b3a4eff769d1822bf69382f0acb85a790628dac081c22bedb2bca12707e0e5e91427010fc3
- languageName: node
- linkType: hard
-
"react@npm:^18.2.0":
version: 18.3.1
resolution: "react@npm:18.3.1"
@@ -3443,7 +3335,7 @@ __metadata:
languageName: node
linkType: hard
-"reselect@npm:^5.2.0":
+"reselect@npm:^5.3.0":
version: 5.3.0
resolution: "reselect@npm:5.3.0"
checksum: 10c0/c79728e4f315152bfb2d82456d35075b705392d9e72c485d7d9b1061bd80af628416216d80f02a42f24dbb24d738aec7fec45806930aaa1d17c32e9875fa1bd6
@@ -3631,13 +3523,6 @@ __metadata:
languageName: node
linkType: hard
-"shallow-equal@npm:^1.2.1":
- version: 1.2.1
- resolution: "shallow-equal@npm:1.2.1"
- checksum: 10c0/51e03abadd97c9ebe590547d92db9148446962a3f23a3a0fb1ba2fccab80af881eef0ff1f8ccefd3f066c0bc5a4c8ca53706194813b95c8835fa66448a843a26
- languageName: node
- linkType: hard
-
"sharp@npm:^0.35.3":
version: 0.35.5
resolution: "sharp@npm:0.35.5"
@@ -3789,13 +3674,6 @@ __metadata:
languageName: node
linkType: hard
-"state-local@npm:^1.0.6":
- version: 1.0.7
- resolution: "state-local@npm:1.0.7"
- checksum: 10c0/8dc7daeac71844452fafb514a6d6b6f40d7e2b33df398309ea1c7b3948d6110c57f112b7196500a10c54fdde40291488c52c875575670fb5c819602deca48bd9
- languageName: node
- linkType: hard
-
"statuses@npm:^2.0.2":
version: 2.0.2
resolution: "statuses@npm:2.0.2"
@@ -4076,25 +3954,28 @@ __metadata:
languageName: node
linkType: hard
-"twenty-ui@npm:^1.0.0-alpha.1":
- version: 1.0.0-alpha.1
- resolution: "twenty-ui@npm:1.0.0-alpha.1"
+"twenty-ui@npm:^2.50.0":
+ version: 2.50.0
+ resolution: "twenty-ui@npm:2.50.0"
dependencies:
- "@base-ui/react": "npm:^1.5.0"
- "@monaco-editor/react": "npm:^4.7.0"
- "@radix-ui/colors": "npm:^3.0.0"
+ "@base-ui/react": "npm:^1.9.0"
+ "@base-ui/utils": "npm:0.5.0"
"@sniptt/guards": "npm:^0.2.0"
"@tabler/icons-react": "npm:^3.31.0"
clsx: "npm:^2.1.1"
- react-responsive: "npm:^9.0.2"
- react-router-dom: "npm:^6.4.4"
type-fest: "npm:^4.10.1"
zod: "npm:^4.1.11"
peerDependencies:
+ "@monaco-editor/react": ^4.7.0
monaco-editor: ">= 0.25.0 < 1"
react: ^19.0.0
react-dom: ^19.0.0
- checksum: 10c0/213582e582949d6ffe90a7a8ab89a1d4e9dc724d34ed1b80bd7d50e834a8cb8539723556d41b39dc658f76f176bd8490ae0da8a3d6a713e79e6573b732084179
+ peerDependenciesMeta:
+ "@monaco-editor/react":
+ optional: true
+ monaco-editor:
+ optional: true
+ checksum: 10c0/00d89bc173cab13eeee4666ce2608dd8590d94428453d9fcfb2df5f9c3057adbe306df4a50a2b9fa2f76de3353384503d1679cbf3492a32afac5ddca2a49cc73
languageName: node
linkType: hard
@@ -4178,12 +4059,12 @@ __metadata:
languageName: node
linkType: hard
-"use-sync-external-store@npm:^1.6.0":
- version: 1.6.0
- resolution: "use-sync-external-store@npm:1.6.0"
+"use-sync-external-store@npm:^1.7.0":
+ version: 1.7.0
+ resolution: "use-sync-external-store@npm:1.7.0"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
- checksum: 10c0/35e1179f872a53227bdf8a827f7911da4c37c0f4091c29b76b1e32473d1670ebe7bcd880b808b7549ba9a5605c233350f800ffab963ee4a4ee346ee983b6019b
+ checksum: 10c0/6bae7cb778ce611131ec830c4e469fbc2872acefc25d2e4cf1c28b8628690689770742a9f2f0642c95134f9c77041fee60f0352f81ca43f96643b0ed01774726
languageName: node
linkType: hard