The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Move information banners above page headers (#25261)
Thomas des Francs7344dcd42abf
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsxindex b49c4f11365..50e5fe9be6b 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsx@@ -128,16 +128,7 @@ export const PageCardLayout = ({const shouldShowInformationBanner =showInformationBanner && workspaceSurface.type === 'main';- const body = (- <StyledBodyContent>- {shouldShowInformationBanner && (- <StyledPrintHidden>- <InformationBannerWrapper />- </StyledPrintHidden>- )}- {children}- </StyledBodyContent>- );+ const body = <StyledBodyContent>{children}</StyledBodyContent>;if (workspaceSurface.type === 'side-panel') {return (@@ -153,6 +144,11 @@ export const PageCardLayout = ({<StyledRoot data-page-surface="main"><StyledMainCardWrapper><StyledCard>+ {shouldShowInformationBanner && (+ <StyledPrintHidden>+ <InformationBannerWrapper />+ </StyledPrintHidden>+ )}<StyledPrintHidden>{header}</StyledPrintHidden><StyledPrintHidden>{secondaryBar}</StyledPrintHidden>{body}diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/__tests__/PageCardLayout.test.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/__tests__/PageCardLayout.test.tsxnew file mode 100644index 00000000000..cda291fa2da--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/page/components/__tests__/PageCardLayout.test.tsx@@ -0,0 +1,36 @@+import { render, screen } from '@testing-library/react';++import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';++jest.mock('@/information-banner/components/InformationBannerWrapper', () => ({+ InformationBannerWrapper: () => <div>Information banner</div>,+}));++describe('PageCardLayout', () => {+ it('renders the information banner before the page bars and body', () => {+ render(+ <PageCardLayout+ header={<div>Page header</div>}+ secondaryBar={<div>Secondary bar</div>}+ >+ <div>Page body</div>+ </PageCardLayout>,+ );++ const informationBanner = screen.getByText('Information banner');++ expect(+ informationBanner.compareDocumentPosition(+ screen.getByText('Page header'),+ ),+ ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);+ expect(+ informationBanner.compareDocumentPosition(+ screen.getByText('Secondary bar'),+ ),+ ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);+ expect(+ informationBanner.compareDocumentPosition(screen.getByText('Page body')),+ ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);+ });+});