little fixes

twentyhq · Dec 16, 2024 · 9011166 · 9011166
1 parent b7d962d
commit 9011166
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/packages/twenty-front/src/hooks/useScrollRestoration.ts b/packages/twenty-front/src/hooks/useScrollRestoration.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { useLocation, useNavigation } from 'react-router-dom';
+import { useNavigation } from 'react-router-dom';
 
 import { scrollWrapperInstanceComponentState } from '@/ui/utilities/scroll/states/scrollWrapperInstanceComponentState';
 import { scrollWrapperScrollTopComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollTopComponentState';
@@ -14,7 +14,6 @@ import { isDefined } from '~/utils/isDefined';
  * not share the same scroll position.
  */
 export const useScrollRestoration = (viewportHeight?: number) => {
-  const key = `scroll-position-${useLocation().key}`;
   const { state } = useNavigation();
 
   const [scrollTop, setScrollTop] = useRecoilComponentStateV2(
@@ -34,5 +33,5 @@ export const useScrollRestoration = (viewportHeight?: number) => {
     } else if (state === 'idle' && isDefined(scrollWrapper) && !skip) {
       scrollWrapper.scrollTo({ top: scrollTop });
     }
-  }, [key, state, scrollWrapper, skip, scrollTop, setScrollTop]);
+  }, [state, scrollWrapper, skip, scrollTop, setScrollTop]);
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupFilter.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupFilter.ts
@@ -3,12 +3,12 @@ import { useCurrentRecordGroupDefinition } from '@/object-record/record-group/ho
 import { useMemo } from 'react';
 import { isDefined } from 'twenty-ui';
 
-export const useRecordGroupFilter = (fields?: FieldMetadataItem[]) => {
+export const useRecordGroupFilter = (fields: FieldMetadataItem[]) => {
   const currentRecordGroupDefinition = useCurrentRecordGroupDefinition();
 
   const recordGroupFilter = useMemo(() => {
     if (isDefined(currentRecordGroupDefinition)) {
-      const fieldMetadataItem = fields?.find(
+      const fieldMetadataItem = fields.find(
         (fieldMetadataItem) =>
           fieldMetadataItem.id === currentRecordGroupDefinition.fieldMetadataId,
       );

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
@@ -96,10 +96,8 @@ export const RecordTable = () => {
               <RecordTableRecordGroupsBody />
             )}
             <RecordTableStickyEffect />
-            {isAggregateQueryEnabled === true && !hasRecordGroups ? (
+            {isAggregateQueryEnabled && !hasRecordGroups && (
               <RecordTableFooter />
-            ) : (
-              <></>
             )}
           </StyledTable>
           <DragSelect

diff --git a/...ty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx b/...ty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
@@ -62,14 +62,14 @@ export const RecordTableRecordGroupRows = () => {
         );
       })}
       <RecordTablePendingRecordGroupRow />
-      <RecordTableRecordGroupSectionLoadMore />
       <RecordTableRecordGroupSectionAddNew />
-      {isAggregateQueryEnabled === true && (
+      {isAggregateQueryEnabled && (
         <RecordTableFooter
           key={currentRecordGroupId}
           currentRecordGroupId={currentRecordGroupId}
         />
       )}
+      <RecordTableRecordGroupSectionLoadMore />
     </>
   );
 };
diff --git a/...dules/object-record/record-table/record-table-footer/components/RecordTableFooterCell.tsx b/...dules/object-record/record-table/record-table-footer/components/RecordTableFooterCell.tsx
@@ -67,7 +67,7 @@ export const RecordTableFooterCell = ({
   currentRecordGroupId,
 }: {
   column: ColumnDefinition<FieldMetadata>;
-  isFirstCell: boolean;
+  isFirstCell?: boolean;
   currentRecordGroupId?: string;
 }) => {
   const tableColumns = useRecoilComponentValueV2(tableColumnsComponentState);

diff --git a/.../record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx b/.../record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx
@@ -18,9 +18,7 @@ export const useAggregateRecordsForRecordTableColumnFooter = (
     'IS_AGGREGATE_QUERY_ENABLED',
   );
   const { objectMetadataItem } = useRecordTableContextOrThrow();
-  const { recordGroupFilter } = useRecordGroupFilter(
-    objectMetadataItem?.fields,
-  );
+  const { recordGroupFilter } = useRecordGroupFilter(objectMetadataItem.fields);
 
   const { currentViewWithSavedFiltersAndSorts } = useGetCurrentView();
   const recordIndexViewFilterGroups = useRecoilValue(

diff --git a/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx b/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx
@@ -32,7 +32,7 @@ export const SettingsPageContainer = ({
 }) => (
   <ScrollWrapper
     contextProviderName="settingsPageContainer"
-    componentInstanceId={`scroll-wrapper-settings-page-container`}
+    componentInstanceId={'scroll-wrapper-settings-page-container'}
   >
     <StyledSettingsPageContainer>{children}</StyledSettingsPageContainer>
   </ScrollWrapper>

diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/ShowPageContainer.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/ShowPageContainer.tsx
@@ -33,7 +33,7 @@ export const ShowPageContainer = ({ children }: ShowPageContainerProps) => {
     <StyledOuterContainer>
       <StyledScrollWrapper
         contextProviderName="showPageContainer"
-        componentInstanceId={`scroll-wrapper-show-page-container`}
+        componentInstanceId={'scroll-wrapper-show-page-container'}
       >
         <StyledInnerContainer>{children}</StyledInnerContainer>
       </StyledScrollWrapper>