Moving record filter related types, hooks and utils into record-filter module (#9604)

This PR is only moving and renaming types, hooks and utils to record-filter module folder. - Moved and renamed types from object filter modules to record filter…- Moved and renamed types from object filter modules to record filter module - Moved useApplyRecordFilter to record filter module - Renamed util getOperandsForFilterDefinition to getRecordFilterOperandsForRecordFilterDefinition
2025-01-14 15:21:05 +01:00
parent 508feb4e7e
commit 6ab9b79bf3
71 changed files with 395 additions and 379 deletions
--- a/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
@ -1,11 +1,11 @@
 import { useIcons } from 'twenty-ui';

-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { getOperandLabelShort } from '@/object-record/object-filter-dropdown/utils/getOperandLabel';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';

 type EditableFilterChipProps = {
-  viewFilter: Filter;
+  viewFilter: RecordFilter;
  onRemove: () => void;
 };

--- a/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
@ -1,18 +1,17 @@
 import { useCallback, useEffect } from 'react';

-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterOperand } from '@/object-record/object-filter-dropdown/types/FilterOperand';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { EditableFilterChip } from '@/views/components/EditableFilterChip';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';

 import { ObjectFilterOperandSelectAndInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterOperandSelectAndInput';
 import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
 import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
 import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useDeleteCombinedViewFilters } from '@/views/hooks/useDeleteCombinedViewFilters';
 import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
@ -20,7 +19,7 @@ import { isDefined } from '~/utils/isDefined';

 type EditableFilterDropdownButtonProps = {
  viewFilterDropdownId: string;
-  viewFilter: Filter;
+  viewFilter: RecordFilter;
  hotkeyScope: HotkeyScope;
 };

@ -85,11 +84,11 @@ export const EditableFilterDropdownButton = ({
    if (
      !value &&
      ![
-        FilterOperand.IsEmpty,
-        FilterOperand.IsNotEmpty,
-        ViewFilterOperand.IsInPast,
-        ViewFilterOperand.IsInFuture,
-        ViewFilterOperand.IsToday,
+        RecordFilterOperand.IsEmpty,
+        RecordFilterOperand.IsNotEmpty,
+        RecordFilterOperand.IsInPast,
+        RecordFilterOperand.IsInFuture,
+        RecordFilterOperand.IsToday,
      ].includes(operand)
    ) {
      deleteCombinedViewFilter(fieldId);
--- a/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
@ -1,14 +1,14 @@
 import { useIcons } from 'twenty-ui';

 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
 import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
 import { useDeleteCombinedViewFilters } from '@/views/hooks/useDeleteCombinedViewFilters';
 import { useParams } from 'react-router-dom';

 type VariantFilterChipProps = {
-  viewFilter: Filter;
+  viewFilter: RecordFilter;
  viewBarId: string;
 };

--- a/packages/twenty-front/src/modules/views/components/ViewBar.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBar.tsx
@ -2,8 +2,8 @@ import { ReactNode } from 'react';
 import { useParams } from 'react-router-dom';

 import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
-import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
 import { ObjectSortDropdownButton } from '@/object-record/object-sort-dropdown/components/ObjectSortDropdownButton';
+
 import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading';
 import { TopBar } from '@/ui/layout/top-bar/components/TopBar';
 import { QueryParamsFiltersEffect } from '@/views/components/QueryParamsFiltersEffect';
@ -18,6 +18,7 @@ import { ViewPickerDropdown } from '@/views/view-picker/components/ViewPickerDro

 import { ViewsHotkeyScope } from '../types/ViewsHotkeyScope';

+import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
 import { VIEW_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ViewSortDropdownId';
 import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
 import { ViewEventContext } from '@/views/events/contexts/ViewEventContext';
--- a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
@ -4,7 +4,7 @@ import { ReactNode, useMemo } from 'react';
 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
 import { AddObjectFilterFromDetailsButton } from '@/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
 import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
 import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
@ -199,7 +199,7 @@ export const ViewBarDetails = ({
              // Why key defition is already present in the Filter type and added on the fly here with mapViewFiltersToFilters ?
              // Also as filter is spread into viewFilter, definition is present
              // FixMe: Ugly hack to make it work
-              viewFilter={viewFilter as unknown as Filter}
+              viewFilter={viewFilter as unknown as RecordFilter}
              viewBarId={viewBarId}
            />
          ))}
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
@ -1,7 +1,7 @@
 import { isNonEmptyString } from '@sniptt/guards';
 import { useEffect } from 'react';

-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';

@ -62,7 +62,7 @@ export const ViewBarFilterEffect = ({
    if (isDefined(availableFilterDefinitions)) {
      setAvailableFilterDefinitions(availableFilterDefinitions);
    }
-    setOnFilterSelect(() => (filter: Filter | null) => {
+    setOnFilterSelect(() => (filter: RecordFilter | null) => {
      if (isDefined(filter)) {
        upsertCombinedViewFilter(filter);
      }
--- a/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts
+++ b/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts
@ -1,6 +1,6 @@
 import { useRecoilCallback } from 'recoil';

-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
 import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
 import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
@ -33,7 +33,7 @@ export const useUpsertCombinedViewFilters = (viewBarComponentId?: string) => {

  const upsertCombinedViewFilter = useRecoilCallback(
    ({ snapshot, set }) =>
-      async (upsertedFilter: Filter) => {
+      async (upsertedFilter: RecordFilter) => {
        const currentViewId = getSnapshotValue(
          snapshot,
          currentViewIdCallbackState,
--- a/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts
+++ b/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts
@ -1,9 +1,9 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';

 export const availableFilterDefinitionsComponentState = createComponentStateV2<
-  FilterDefinition[]
+  RecordFilterDefinition[]
 >({
  key: 'availableFilterDefinitionsComponentState',
  defaultValue: [],
--- a/packages/twenty-front/src/modules/views/types/ViewFilter.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewFilter.ts
@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { ViewFilterOperand } from './ViewFilterOperand';

 export type ViewFilter = {
@ -14,5 +14,5 @@ export type ViewFilter = {
  viewId?: string;
  viewFilterGroupId?: string;
  positionInViewFilterGroup?: number | null;
-  definition?: FilterDefinition;
+  definition?: RecordFilterDefinition;
 };
--- a/packages/twenty-front/src/modules/views/utils/tests/viewMapFunctions.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/tests/viewMapFunctions.test.ts
@ -1,6 +1,6 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { ViewField } from '@/views/types/ViewField';
 import { ViewFilter } from '@/views/types/ViewFilter';
@ -54,7 +54,7 @@ describe('mapViewFiltersToFilters', () => {
        operand: ViewFilterOperand.Is,
      },
    ];
-    const expectedFilters: Filter[] = [
+    const expectedFilters: RecordFilter[] = [
      {
        id: 'id',
        fieldMetadataId: '05731f68-6e7a-4903-8374-c0b6a9063482',
--- a/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts
+++ b/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts
@ -3,7 +3,8 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { formatFieldMetadataItemsAsFilterDefinitions } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions';
 import { formatFieldMetadataItemsAsSortDefinitions } from '@/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions';
 import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
-import { FilterValueDependencies } from '@/object-record/record-filter/types/FilterValueDependencies';
+import { RecordFilterValueDependencies } from '@/object-record/record-filter/types/RecordFilterValueDependencies';
+
 import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
 import { View } from '@/views/types/View';
 import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
@ -21,7 +22,7 @@ export const getQueryVariablesFromView = ({
  fieldMetadataItems: FieldMetadataItem[];
  objectMetadataItem: ObjectMetadataItem;
  isJsonFilterEnabled: boolean;
-  filterValueDependencies: FilterValueDependencies;
+  filterValueDependencies: RecordFilterValueDependencies;
 }) => {
  if (!isDefined(view)) {
    return {
--- a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
@ -1,13 +1,13 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { isDefined } from '~/utils/isDefined';

+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { ViewFilter } from '../types/ViewFilter';

 export const mapViewFiltersToFilters = (
  viewFilters: ViewFilter[],
-  availableFilterDefinitions: FilterDefinition[],
-): Filter[] => {
+  availableFilterDefinitions: RecordFilterDefinition[],
+): RecordFilter[] => {
  return viewFilters
    .map((viewFilter) => {
      const availableFilterDefinition = availableFilterDefinitions.find(
--- a/packages/twenty-front/src/modules/views/utils/shouldReplaceFilter.ts
+++ b/packages/twenty-front/src/modules/views/utils/shouldReplaceFilter.ts
@ -1,9 +1,9 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { isDefined } from 'twenty-ui';

 export const shouldReplaceFilter = (
-  oldFilter: Pick<Filter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
-  newFilter: Pick<Filter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
+  oldFilter: Pick<RecordFilter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
+  newFilter: Pick<RecordFilter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
 ) => {
  const isNewFilterAdvancedFilter = isDefined(newFilter.viewFilterGroupId);