Removed sort definitions (#10368)

This PR focuses on complete removal of sort definitions.

packages/twenty-front/src/modules/views/components/EditableSortChip.tsx

@@ -1,5 +1,6 @@
 import { IconArrowDown, IconArrowUp } from 'twenty-ui';
 
+import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';
 import { useRemoveRecordSort } from '@/object-record/record-sort/hooks/useRemoveRecordSort';
 import { useUpsertRecordSort } from '@/object-record/record-sort/hooks/useUpsertRecordSort';
 import { RecordSort } from '@/object-record/record-sort/types/RecordSort';
@@ -25,6 +26,10 @@ export const EditableSortChip = ({ recordSort }: EditableSortChipProps) => {
     removeRecordSort(recordSort.fieldMetadataId);
   };
 
+  const { fieldMetadataItem } = useFieldMetadataItemById(
+    recordSort.fieldMetadataId,
+  );
+
   const handleClick = () => {
     const newSort: RecordSort = {
       ...recordSort,
@@ -39,7 +44,7 @@ export const EditableSortChip = ({ recordSort }: EditableSortChipProps) => {
     <SortOrFilterChip
       key={recordSort.fieldMetadataId}
       testId={recordSort.fieldMetadataId}
-      labelValue={recordSort.definition.label}
+      labelValue={fieldMetadataItem.label}
       Icon={recordSort.direction === 'desc' ? IconArrowDown : IconArrowUp}
       onRemove={handleRemoveClick}
       onClick={handleClick}

packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx

@@ -15,6 +15,7 @@ import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryP
 
 import { useCheckIsSoftDeleteFilter } from '@/object-record/record-filter/hooks/useCheckIsSoftDeleteFilter';
 import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
 import { SoftDeleteFilterChip } from '@/views/components/SoftDeleteFilterChip';
 import { useApplyCurrentViewFiltersToCurrentRecordFilters } from '@/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters';
 import { useApplyCurrentViewSortsToCurrentRecordSorts } from '@/views/hooks/useApplyCurrentViewSortsToCurrentRecordSorts';
@@ -22,9 +23,8 @@ import { useAreViewFiltersDifferentFromRecordFilters } from '@/views/hooks/useAr
 import { useAreViewSortsDifferentFromRecordSorts } from '@/views/hooks/useAreViewSortsDifferentFromRecordSorts';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { useResetUnsavedViewStates } from '@/views/hooks/useResetUnsavedViewStates';
-import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
+
 import { isViewBarExpandedComponentState } from '@/views/states/isViewBarExpandedComponentState';
-import { mapViewSortsToSorts } from '@/views/utils/mapViewSortsToSorts';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { isDefined } from 'twenty-shared';
 
@@ -123,8 +123,8 @@ export const ViewBarDetails = ({
     currentRecordFiltersComponentState,
   );
 
-  const availableSortDefinitions = useRecoilComponentValueV2(
-    availableSortDefinitionsComponentState,
+  const currentRecordSorts = useRecoilComponentValueV2(
+    currentRecordSortsComponentState,
   );
 
   const { objectNameSingular } = useObjectNameSingularFromPlural({
@@ -206,19 +206,14 @@ export const ViewBarDetails = ({
               <StyledSeperator />
             </StyledSeperatorContainer>
           )}
-          {mapViewSortsToSorts(
-            currentViewWithCombinedFiltersAndSorts?.viewSorts ?? [],
-            availableSortDefinitions,
-          ).map((recordSort) => (
+          {currentRecordSorts.map((recordSort) => (
             <EditableSortChip
               key={recordSort.fieldMetadataId}
               recordSort={recordSort}
             />
           ))}
           {isNonEmptyArray(recordFilters) &&
-            isNonEmptyArray(
-              currentViewWithCombinedFiltersAndSorts?.viewSorts,
-            ) && (
+            isNonEmptyArray(currentRecordSorts) && (
               <StyledSeperatorContainer>
                 <StyledSeperator />
               </StyledSeperatorContainer>

packages/twenty-front/src/modules/views/components/ViewBarRecordSortEffect.tsx

@@ -1,7 +1,6 @@
 import { contextStoreCurrentObjectMetadataItemComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemComponentState';
 import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
 import { availableFieldMetadataItemsForSortFamilySelector } from '@/object-metadata/states/availableFieldMetadataItemsForSortFamilySelector';
-import { formatFieldMetadataItemsAsSortDefinitions } from '@/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions';
 import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
 import { prefetchViewFromViewIdFamilySelector } from '@/prefetch/states/selector/prefetchViewFromViewIdFamilySelector';
 import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2';
@@ -59,14 +58,8 @@ export const ViewBarRecordSortEffect = () => {
         return;
       }
 
-      const sortDefinitions = formatFieldMetadataItemsAsSortDefinitions({
-        fields: sortableFieldMetadataItems,
-      });
-
       if (isDefined(currentView)) {
-        setCurrentRecordSorts(
-          mapViewSortsToSorts(currentView.viewSorts, sortDefinitions),
-        );
+        setCurrentRecordSorts(mapViewSortsToSorts(currentView.viewSorts));
         setHasInitializedCurrentRecordSorts(true);
       }
     }

packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx

@@ -3,47 +3,27 @@ import { useEffect } from 'react';
 import { onSortSelectComponentState } from '@/object-record/object-sort-dropdown/states/onSortSelectScopedState';
 import { useUpsertRecordSort } from '@/object-record/record-sort/hooks/useUpsertRecordSort';
 import { RecordSort } from '@/object-record/record-sort/types/RecordSort';
-import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useUpsertCombinedViewSorts } from '@/views/hooks/useUpsertCombinedViewSorts';
-import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
 import { isDefined } from 'twenty-shared';
 
 export const ViewBarSortEffect = () => {
   const { upsertCombinedViewSort } = useUpsertCombinedViewSorts();
 
-  // TDOO: verify this instance id works
-  const availableSortDefinitions = useRecoilComponentValueV2(
-    availableSortDefinitionsComponentState,
-  );
-
   const { upsertRecordSort } = useUpsertRecordSort();
 
   const setOnSortSelect = useSetRecoilComponentStateV2(
     onSortSelectComponentState,
   );
 
-  // TDOO: verify this instance id works
-  const setAvailableSortDefinitionsInSortDropdown =
-    useSetRecoilComponentStateV2(availableSortDefinitionsComponentState);
-
   useEffect(() => {
-    if (isDefined(availableSortDefinitions)) {
-      setAvailableSortDefinitionsInSortDropdown(availableSortDefinitions);
-    }
     setOnSortSelect(() => (sort: RecordSort | null) => {
       if (isDefined(sort)) {
         upsertCombinedViewSort(sort);
         upsertRecordSort(sort);
       }
     });
-  }, [
-    availableSortDefinitions,
-    setAvailableSortDefinitionsInSortDropdown,
-    setOnSortSelect,
-    upsertCombinedViewSort,
-    upsertRecordSort,
-  ]);
+  }, [setOnSortSelect, upsertCombinedViewSort, upsertRecordSort]);
 
   return <></>;
 };