Rename Components + fix tests

twentyhq · Dec 19, 2024 · a8d97b5 · a8d97b5
1 parent 81a20c8
commit a8d97b5
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 36 deletions.
diff --git a/...rd/record-board/record-board-column/utils/__tests__/computeAggregateValueAndLabel.test.ts b/...rd/record-board/record-board-column/utils/__tests__/computeAggregateValueAndLabel.test.ts
@@ -47,7 +47,7 @@ describe('computeAggregateValueAndLabel', () => {
     });
 
     expect(result).toEqual({
-      value: 2,
+      value: '2',
       label: 'Sum',
       labelWithFieldName: 'Sum of amount',
     });
@@ -159,8 +159,9 @@ describe('computeAggregateValueAndLabel', () => {
     });
 
     expect(result).toEqual({
-      value: undefined,
+      value: '-',
       label: 'Sum',
+      labelWithFieldName: 'Sum of amount',
     });
   });
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
@@ -13,7 +13,7 @@ import { RecordTableNoRecordGroupBody } from '@/object-record/record-table/recor
 import { RecordTableNoRecordGroupBodyEffect } from '@/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBodyEffect';
 import { RecordTableRecordGroupBodyEffects } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects';
 import { RecordTableRecordGroupsBody } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody';
-import { RecordTableFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableFooter';
+import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';
 import { RecordTableHeader } from '@/object-record/record-table/record-table-header/components/RecordTableHeader';
 import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
 import { recordTablePendingRecordIdComponentState } from '@/object-record/record-table/states/recordTablePendingRecordIdComponentState';
@@ -97,7 +97,7 @@ export const RecordTable = () => {
             )}
             <RecordTableStickyEffect />
             {isAggregateQueryEnabled && !hasRecordGroups && (
-              <RecordTableFooter endOfTableSticky />
+              <RecordTableAggregateFooter endOfTableSticky />
             )}
           </StyledTable>
           <DragSelect

diff --git a/...s/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx b/...s/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
@@ -6,7 +6,7 @@ import { RecordTableRecordGroupRows } from '@/object-record/record-table/compone
 import { RecordTableBodyDroppable } from '@/object-record/record-table/record-table-body/components/RecordTableBodyDroppable';
 import { RecordTableBodyLoading } from '@/object-record/record-table/record-table-body/components/RecordTableBodyLoading';
 import { RecordTableBodyRecordGroupDragDropContextProvider } from '@/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider';
-import { RecordTableFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableFooter';
+import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';
 import { RecordTableRecordGroupEmptyRow } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupEmptyRow';
 import { RecordTableRecordGroupSection } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection';
 import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
@@ -37,26 +37,24 @@ export const RecordTableRecordGroupsBody = () => {
     <>
       <RecordTableBodyRecordGroupDragDropContextProvider>
         {visibleRecordGroupIds.map((recordGroupId, index) => (
-          <>
-            <RecordTableRecordGroupBodyContextProvider
-              key={recordGroupId}
-              recordGroupId={recordGroupId}
-            >
-              <RecordGroupContext.Provider value={{ recordGroupId }}>
-                <RecordTableBodyDroppable recordGroupId={recordGroupId}>
-                  {index > 0 && <RecordTableRecordGroupEmptyRow />}
-                  <RecordTableRecordGroupSection />
-                  <RecordTableRecordGroupRows />
-                </RecordTableBodyDroppable>
-                {isAggregateQueryEnabled && (
-                  <RecordTableFooter
-                    key={recordGroupId}
-                    currentRecordGroupId={recordGroupId}
-                  />
-                )}
-              </RecordGroupContext.Provider>
-            </RecordTableRecordGroupBodyContextProvider>
-          </>
+          <RecordTableRecordGroupBodyContextProvider
+            key={recordGroupId}
+            recordGroupId={recordGroupId}
+          >
+            <RecordGroupContext.Provider value={{ recordGroupId }}>
+              <RecordTableBodyDroppable recordGroupId={recordGroupId}>
+                {index > 0 && <RecordTableRecordGroupEmptyRow />}
+                <RecordTableRecordGroupSection />
+                <RecordTableRecordGroupRows />
+              </RecordTableBodyDroppable>
+              {isAggregateQueryEnabled && (
+                <RecordTableAggregateFooter
+                  key={recordGroupId}
+                  currentRecordGroupId={recordGroupId}
+                />
+              )}
+            </RecordGroupContext.Provider>
+          </RecordTableRecordGroupBodyContextProvider>
         ))}
       </RecordTableBodyRecordGroupDragDropContextProvider>
     </>

diff --git a/...e-footer/components/RecordTableFooter.tsx → ...components/RecordTableAggregateFooter.tsx b/...e-footer/components/RecordTableFooter.tsx → ...components/RecordTableAggregateFooter.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 import { MOBILE_VIEWPORT } from 'twenty-ui';
 
-import { RecordTableFooterCell } from '@/object-record/record-table/record-table-footer/components/RecordTableFooterCell';
+import { RecordTableAggregateFooterCell } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell';
 import { FIRST_TH_WIDTH } from '@/object-record/record-table/record-table-header/components/RecordTableHeader';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@@ -69,7 +69,7 @@ const StyledTh = styled.th`
   background-color: ${({ theme }) => theme.background.primary};
 `;
 
-export const RecordTableFooter = ({
+export const RecordTableAggregateFooter = ({
   currentRecordGroupId,
   endOfTableSticky,
 }: {
@@ -90,7 +90,7 @@ export const RecordTableFooter = ({
         <StyledTh />
         <StyledTh />
         {visibleTableColumns.map((column, index) => (
-          <RecordTableFooterCell
+          <RecordTableAggregateFooterCell
             key={`${column.fieldMetadataId}${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`}
             column={column}
             currentRecordGroupId={currentRecordGroupId}

diff --git a/...oter/components/RecordTableFooterCell.tsx → ...onents/RecordTableAggregateFooterCell.tsx b/...oter/components/RecordTableFooterCell.tsx → ...onents/RecordTableAggregateFooterCell.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled';
 import { useMemo } from 'react';
 
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { RecordTableColumnFooterWithDropdown } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnFooterWithDropdown';
+import { RecordTableColumnFooterWithDropdown } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterWithDropdown';
 import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@@ -61,7 +61,7 @@ const StyledColumnFootContainer = styled.div`
   width: 100%;
 `;
 
-export const RecordTableFooterCell = ({
+export const RecordTableAggregateFooterCell = ({
   column,
   isFirstCell = false,
   currentRecordGroupId,

diff --git a/...nents/RecordTableColumnFooterDropdown.tsx → ...ordTableColumnAggregateFooterDropdown.tsx b/...nents/RecordTableColumnFooterDropdown.tsx → ...ordTableColumnAggregateFooterDropdown.tsx
@@ -14,7 +14,7 @@ import { useMemo } from 'react';
 import { Key } from 'ts-key-enum';
 import { MenuItem } from 'twenty-ui';
 
-export const RecordTableColumnFooterDropdown = ({
+export const RecordTableColumnAggregateFooterDropdown = ({
   column,
   dropdownId,
 }: {

diff --git a/...RecordTableColumnFooterAggregateValue.tsx → ...RecordTableColumnAggregateFooterValue.tsx b/...RecordTableColumnFooterAggregateValue.tsx → ...RecordTableColumnAggregateFooterValue.tsx
@@ -62,7 +62,7 @@ const StyledIcon = styled(IconChevronDown)`
   padding-right: ${({ theme }) => theme.spacing(2)};
 `;
 
-export const RecordTableColumnFooterAggregateValue = ({
+export const RecordTableColumnAggregateFooterValue = ({
   dropdownId,
   aggregateValue,
   aggregateLabel,

diff --git a/...s/RecordTableColumnFooterWithDropdown.tsx → ...ableColumnAggregateFooterWithDropdown.tsx b/...s/RecordTableColumnFooterWithDropdown.tsx → ...ableColumnAggregateFooterWithDropdown.tsx
@@ -1,6 +1,6 @@
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { RecordTableColumnFooterAggregateValue } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnFooterAggregateValue';
-import { RecordTableColumnFooterDropdown } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnFooterDropdown';
+import { RecordTableColumnAggregateFooterDropdown } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdown';
+import { RecordTableColumnAggregateFooterValue } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue';
 import { useAggregateRecordsForRecordTableColumnFooter } from '@/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -44,15 +44,15 @@ export const RecordTableColumnFooterWithDropdown = ({
       onClose={handleDropdownClose}
       dropdownId={dropdownId}
       clickableComponent={
-        <RecordTableColumnFooterAggregateValue
+        <RecordTableColumnAggregateFooterValue
           aggregateLabel={aggregateLabel}
           aggregateValue={aggregateValue}
           dropdownId={dropdownId}
           isFirstCell={isFirstCell}
         />
       }
       dropdownComponents={
-        <RecordTableColumnFooterDropdown
+        <RecordTableColumnAggregateFooterDropdown
           column={column}
           dropdownId={dropdownId}
         />