The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Use one side panel footer style everywhere (#29551)
Félix Malfaitf86ef261d50d
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsxindex 2f82602663b..44aba3f8bbf 100644--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx@@ -1,28 +1,11 @@import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';import { useMergeRecordsActions } from '@/object-record/record-merge/hooks/useMergeRecordsActions';+import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';-import { styled } from '@linaria/react';import { Key } from 'ts-key-enum';import { t } from '@lingui/core/macro';import { IconArrowMerge } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';-import { themeCssVariables } from 'twenty-ui/theme';--const StyledFooterContainer = styled.div`- align-items: flex-end;- background: ${themeCssVariables.background.primary};- border-top: 1px solid ${themeCssVariables.border.color.light};- display: flex;- gap: ${themeCssVariables.spacing[2]};- justify-content: flex-end;- padding: ${themeCssVariables.spacing[3]};-`;--const StyledFooterActions = styled.div`- align-items: flex-end;- display: flex;- gap: ${themeCssVariables.spacing[2]};-`;type MergeRecordsFooterProps = {objectNameSingular: string;@@ -47,9 +30,10 @@ export const MergeRecordsFooter = ({});return (- <StyledFooterContainer>- <StyledFooterActions>+ <SidePanelFooter+ actions={[<Button+ key="merge"size="md"startIcon={<IconArrowMerge />}shortcut={isMerging ? undefined : ['Mod', 'Enter']}@@ -59,8 +43,8 @@ export const MergeRecordsFooter = ({color="accent">{isMerging ? t`Merging...` : t`Merge`}- </Button>- </StyledFooterActions>- </StyledFooterContainer>+ </Button>,+ ]}+ />);};diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsxindex c4b4eb7d681..15f4a17fded 100644--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx@@ -1,31 +1,14 @@import { computeProgressText } from '@/command-menu-item/utils/computeProgressText';import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';import { type ObjectRecordQueryProgress } from '@/object-record/types/ObjectRecordQueryProgress';+import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';-import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import { themeCssVariables } from 'twenty-ui/theme';import { Key } from 'ts-key-enum';import { IconBoxMultiple } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';-const StyledFooterContainer = styled.div`- align-items: flex-end;- background: ${themeCssVariables.background.primary};- border-top: 1px solid ${themeCssVariables.border.color.light};- display: flex;- gap: ${themeCssVariables.spacing[2]};- justify-content: flex-end;- padding: ${themeCssVariables.spacing[2]};-`;--const StyledFooterActions = styled.div`- align-items: flex-end;- display: flex;- gap: ${themeCssVariables.spacing[2]};-`;-type UpdateMultipleRecordsFooterProps = {isUpdating: boolean;progress?: ObjectRecordQueryProgress;@@ -56,14 +39,16 @@ export const UpdateMultipleRecordsFooter = ({});return (- <StyledFooterContainer>- <StyledFooterActions>+ <SidePanelFooter+ actions={[<Button+ key="cancel"size="sm"onClick={onCancel}variant="outline"- >{t`Cancel`}</Button>+ >{t`Cancel`}</Button>,<Button+ key="apply"size="sm"startIcon={<IconBoxMultiple />}loading={isUpdating && !progressText}@@ -74,8 +59,8 @@ export const UpdateMultipleRecordsFooter = ({color="accent">{isUpdating ? t`Apply${progressText}` : t`Apply`}- </Button>- </StyledFooterActions>- </StyledFooterContainer>+ </Button>,+ ]}+ />);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordContent.tsxindex 06314167dc5..a339f6801a2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordContent.tsx@@ -247,7 +247,6 @@ export const SidePanelShareRecordContent = ({)}</StyledListContainer><SidePanelFooter- variant="compact"actions={[<Buttonkey="copy-link"diff --git a/packages/twenty-front/src/modules/side-panel/pages/share-record/components/__stories__/SidePanelShareRecordContent.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/share-record/components/__stories__/SidePanelShareRecordContent.stories.tsxindex b498626aa6e..b19a1ec91a1 100644--- a/packages/twenty-front/src/modules/side-panel/pages/share-record/components/__stories__/SidePanelShareRecordContent.stories.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/share-record/components/__stories__/SidePanelShareRecordContent.stories.tsx@@ -182,10 +182,6 @@ export const Default: Story = {const generalAccess = await page.findByRole('button', {name: 'Restricted',});- const footer = page- .getByRole('button', { name: 'Copy link' })- .closest('[data-variant="compact"]');- await expect(footer?.getBoundingClientRect().height).toBe(40);const addPeople = page.getByPlaceholderText('Add people or everyone');const role = page.getByRole('button', { name: 'Sales Viewer' });const recipient = page.getByRole('button', { name: 'Phil Schiler Editor' });@@ -604,8 +600,6 @@ export const Loading: Story = {).not.toBeInTheDocument();const copyLink = page.getByRole('button', { name: 'Copy link' });await expect(copyLink).toBeVisible();- const footer = copyLink.closest('[data-variant="compact"]');- await expect(footer?.getBoundingClientRect().height).toBe(40);await expect(setShare).not.toHaveBeenCalled();await expect(setPrivate).not.toHaveBeenCalled();},diff --git a/packages/twenty-front/src/modules/ui/layout/side-panel/components/SidePanelFooter.tsx b/packages/twenty-front/src/modules/ui/layout/side-panel/components/SidePanelFooter.tsxindex 00148e825b2..9af8c50bedc 100644--- a/packages/twenty-front/src/modules/ui/layout/side-panel/components/SidePanelFooter.tsx+++ b/packages/twenty-front/src/modules/ui/layout/side-panel/components/SidePanelFooter.tsx@@ -9,19 +9,9 @@ const StyledContainer = styled.div`border-top: 1px solid ${themeCssVariables.border.color.light};bottom: 0;box-sizing: border-box;+ flex-shrink: 0;padding: ${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[3]};width: 100%;-- &[data-variant='compact'] {- align-items: center;- backdrop-filter: blur(${themeCssVariables.spacing[5]});- background: ${themeCssVariables.background.transparent.primary};- border-top-color: ${themeCssVariables.border.color.medium};- display: flex;- flex-shrink: 0;- height: ${themeCssVariables.spacing[10]};- padding: ${themeCssVariables.spacing[2]};- }`;const StyledActionsRow = styled(NodeDimension)`@@ -34,13 +24,9 @@ const StyledActionsRow = styled(NodeDimension)`type SidePanelFooterProps = {actions: React.ReactNode[];- variant?: 'default' | 'compact';};-export const SidePanelFooter = ({- actions,- variant = 'default',-}: SidePanelFooterProps) => {+export const SidePanelFooter = ({ actions }: SidePanelFooterProps) => {const [actionsRowWidth, setActionsRowWidth] = useState(0);const handleActionsRowDimensionChange = useCallback(@@ -51,7 +37,7 @@ export const SidePanelFooter = ({);return (- <StyledContainer data-variant={variant}>+ <StyledContainer><SidePanelFooterWidthContext.Provider value={actionsRowWidth}><StyledActionsRow onDimensionChange={handleActionsRowDimensionChange}>{actions.map((action, index) => (