The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Hide the group header when the fields widget has a single group (#24997)
Félix Malfait3067dd87fcda
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.tsxindex a189159cc10..57ae373d9fb 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@@ -97,6 +97,9 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {const hasFieldsToDisplay = groups.length > 0;+ const shouldDisplayGroupHeaders =+ displayMode === 'grouped' && groups.length > 1;+if (!hasFieldsToDisplay) {return (<SidePanelProvider value={{ isInSidePanel }}>@@ -125,16 +128,7 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {instanceId,}}>- {displayMode === 'inline' ? (- <StyledInlineFieldsPropertyBox- hasMoreGroup={shouldShowHiddenFields}- >- <FieldsWidgetFieldList- fields={groups.flatMap((group) => group.fields)}- instanceId={instanceId}- />- </StyledInlineFieldsPropertyBox>- ) : (+ {shouldDisplayGroupHeaders ? (groups.map((group) => (<FieldsWidgetGroupContainer key={group.id} title={group.name}><StyledPropertyBox>@@ -145,6 +139,15 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {</StyledPropertyBox></FieldsWidgetGroupContainer>))+ ) : (+ <StyledInlineFieldsPropertyBox+ hasMoreGroup={shouldShowHiddenFields}+ >+ <FieldsWidgetFieldList+ fields={visibleFields}+ instanceId={instanceId}+ />+ </StyledInlineFieldsPropertyBox>)}{shouldShowHiddenFields && (diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsxindex e18968dfd8a..c76f40031f1 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsx@@ -247,6 +247,71 @@ const createViewFieldGroup = (viewFields,});+const FieldsWidgetStoryRenderer = ({ view }: { view: ViewWithRelations }) => {+ const widget = createFieldsWidget(FIELDS_VIEW_ID);++ const pageLayoutData = createPageLayoutWithWidget(+ widget,+ companyObjectMetadataItem.id,+ );++ setTestObjectMetadataItemsInMetadataStore(+ jotaiStore,+ getTestEnrichedObjectMetadataItemsMock(),+ );+ jotaiStore.set(isMinimalMetadataReadyState.atom, true);+ setTestViewsInMetadataStore(jotaiStore, [view]);+ jotaiStore.set(+ pageLayoutPersistedComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ }),+ pageLayoutData,+ );+ jotaiStore.set(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ }),+ pageLayoutData,+ );+ setRecordInStore(TEST_RECORD_ID, mockCompanyRecord);++ return (+ <div style={{ width: '400px', padding: '20px' }}>+ <JestMetadataAndApolloMocksWrapper>+ <CoreClientProviderWrapper>+ <PageLayoutTestWrapper store={jotaiStore}>+ <LayoutRenderingProvider+ value={{+ isInSidePanel: false,+ layoutType: PageLayoutType.RECORD_PAGE,+ targetRecordIdentifier: {+ id: TEST_RECORD_ID,+ targetObjectNameSingular:+ companyObjectMetadataItem.nameSingular,+ },+ }}+ >+ <PageLayoutContentProvider+ value={{+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,+ presentation: 'stack',+ tabId: TAB_ID_OVERVIEW,+ }}+ >+ <WidgetComponentInstanceContext.Provider+ value={{ instanceId: widget.id }}+ >+ <FieldsWidget widget={widget} />+ </WidgetComponentInstanceContext.Provider>+ </PageLayoutContentProvider>+ </LayoutRenderingProvider>+ </PageLayoutTestWrapper>+ </CoreClientProviderWrapper>+ </JestMetadataAndApolloMocksWrapper>+ </div>+ );+};+const meta: Meta<typeof FieldsWidget> = {title: 'Modules/PageLayout/Widgets/FieldsWidget',component: FieldsWidget,@@ -305,68 +370,7 @@ export const WithViewFieldGroups: Story = {],});- const widget = createFieldsWidget(FIELDS_VIEW_ID);-- const pageLayoutData = createPageLayoutWithWidget(- widget,- companyObjectMetadataItem.id,- );-- setTestObjectMetadataItemsInMetadataStore(- jotaiStore,- getTestEnrichedObjectMetadataItemsMock(),- );- jotaiStore.set(isMinimalMetadataReadyState.atom, true);- setTestViewsInMetadataStore(jotaiStore, [view]);- jotaiStore.set(- pageLayoutPersistedComponentState.atomFamily({- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,- }),- pageLayoutData,- );- jotaiStore.set(- pageLayoutDraftComponentState.atomFamily({- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,- }),- pageLayoutData,- );- setRecordInStore(TEST_RECORD_ID, mockCompanyRecord);-- return (- <div style={{ width: '400px', padding: '20px' }}>- <JestMetadataAndApolloMocksWrapper>- <CoreClientProviderWrapper>- <PageLayoutTestWrapper store={jotaiStore}>- <LayoutRenderingProvider- value={{- isInSidePanel: false,- layoutType: PageLayoutType.RECORD_PAGE,- targetRecordIdentifier: {- id: TEST_RECORD_ID,- targetObjectNameSingular:- companyObjectMetadataItem.nameSingular,- },- }}- >- <PageLayoutContentProvider- value={{- layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,- presentation: 'stack',- tabId: TAB_ID_OVERVIEW,- }}- >- <WidgetComponentInstanceContext.Provider- value={{ instanceId: widget.id }}- >- <FieldsWidget widget={widget} />- </WidgetComponentInstanceContext.Provider>- </PageLayoutContentProvider>- </LayoutRenderingProvider>- </PageLayoutTestWrapper>- </CoreClientProviderWrapper>- </JestMetadataAndApolloMocksWrapper>- </div>- );+ return <FieldsWidgetStoryRenderer view={view} />;},play: async ({ canvasElement }) => {const canvas = within(canvasElement);@@ -382,82 +386,52 @@ export const WithViewFieldGroups: Story = {},};+export const WithSingleViewFieldGroup: Story = {+ render: () => {+ const contactInfoFields = [+ createViewField('vf-name', nameField.id, 0, 'group-contact-info'),+ createViewField('vf-address', addressField.id, 1, 'group-contact-info'),+ createViewField('vf-linkedin', linkedinField.id, 2, 'group-contact-info'),+ ];++ const view = createView({+ viewFields: contactInfoFields,+ viewFieldGroups: [+ createViewFieldGroup(+ 'group-contact-info',+ 'Contact Info',+ 0,+ contactInfoFields,+ ),+ ],+ });++ return <FieldsWidgetStoryRenderer view={view} />;+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ const companyName = await canvas.findByText('Acme Corporation');+ expect(companyName).toBeVisible();++ expect(canvas.queryByText('Contact Info')).not.toBeInTheDocument();+ },+};+export const WithDefaultGroups: Story = {render: () => {const view = createView();- const widget = createFieldsWidget(FIELDS_VIEW_ID);-- const pageLayoutData = createPageLayoutWithWidget(- widget,- companyObjectMetadataItem.id,- );-- setTestObjectMetadataItemsInMetadataStore(- jotaiStore,- getTestEnrichedObjectMetadataItemsMock(),- );- jotaiStore.set(isMinimalMetadataReadyState.atom, true);- setTestViewsInMetadataStore(jotaiStore, [view]);- jotaiStore.set(- pageLayoutPersistedComponentState.atomFamily({- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,- }),- pageLayoutData,- );- jotaiStore.set(- pageLayoutDraftComponentState.atomFamily({- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,- }),- pageLayoutData,- );- setRecordInStore(TEST_RECORD_ID, mockCompanyRecord);-- return (- <div style={{ width: '400px', padding: '20px' }}>- <JestMetadataAndApolloMocksWrapper>- <CoreClientProviderWrapper>- <PageLayoutTestWrapper store={jotaiStore}>- <LayoutRenderingProvider- value={{- isInSidePanel: false,- layoutType: PageLayoutType.RECORD_PAGE,- targetRecordIdentifier: {- id: TEST_RECORD_ID,- targetObjectNameSingular:- companyObjectMetadataItem.nameSingular,- },- }}- >- <PageLayoutContentProvider- value={{- layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,- presentation: 'stack',- tabId: TAB_ID_OVERVIEW,- }}- >- <WidgetComponentInstanceContext.Provider- value={{ instanceId: widget.id }}- >- <FieldsWidget widget={widget} />- </WidgetComponentInstanceContext.Provider>- </PageLayoutContentProvider>- </LayoutRenderingProvider>- </PageLayoutTestWrapper>- </CoreClientProviderWrapper>- </JestMetadataAndApolloMocksWrapper>- </div>- );+ return <FieldsWidgetStoryRenderer view={view} />;},play: async ({ canvasElement }) => {const canvas = within(canvasElement);- const generalHeader = await canvas.findByText('General');- expect(generalHeader).toBeVisible();-const creationDateElements = await canvas.findAllByText('Creation date');expect(creationDateElements.length).toBeGreaterThan(0);expect(creationDateElements[0]).toBeVisible();++ expect(canvas.queryByText('General')).not.toBeInTheDocument();},};@@ -469,68 +443,7 @@ export const Empty: Story = {],});- const widget = createFieldsWidget(FIELDS_VIEW_ID);-- const pageLayoutData = createPageLayoutWithWidget(- widget,- companyObjectMetadataItem.id,- );-- setTestObjectMetadataItemsInMetadataStore(- jotaiStore,- getTestEnrichedObjectMetadataItemsMock(),- );- jotaiStore.set(isMinimalMetadataReadyState.atom, true);- setTestViewsInMetadataStore(jotaiStore, [view]);- jotaiStore.set(- pageLayoutPersistedComponentState.atomFamily({- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,- }),- pageLayoutData,- );- jotaiStore.set(- pageLayoutDraftComponentState.atomFamily({- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,- }),- pageLayoutData,- );- setRecordInStore(TEST_RECORD_ID, mockCompanyRecord);-- return (- <div style={{ width: '400px', padding: '20px' }}>- <JestMetadataAndApolloMocksWrapper>- <CoreClientProviderWrapper>- <PageLayoutTestWrapper store={jotaiStore}>- <LayoutRenderingProvider- value={{- isInSidePanel: false,- layoutType: PageLayoutType.RECORD_PAGE,- targetRecordIdentifier: {- id: TEST_RECORD_ID,- targetObjectNameSingular:- companyObjectMetadataItem.nameSingular,- },- }}- >- <PageLayoutContentProvider- value={{- layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,- presentation: 'stack',- tabId: TAB_ID_OVERVIEW,- }}- >- <WidgetComponentInstanceContext.Provider- value={{ instanceId: widget.id }}- >- <FieldsWidget widget={widget} />- </WidgetComponentInstanceContext.Provider>- </PageLayoutContentProvider>- </LayoutRenderingProvider>- </PageLayoutTestWrapper>- </CoreClientProviderWrapper>- </JestMetadataAndApolloMocksWrapper>- </div>- );+ return <FieldsWidgetStoryRenderer view={view} />;},play: async ({ canvasElement }) => {const canvas = within(canvasElement);