Reorganize context/states/selectors in dedicated folders (#1205)

* Reorganize context/states/selectors in dedicated folders

* linter

front/src/modules/ui/table/action-bar/components/EntityTableActionBar.tsx

@@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil';
 
 import { ActionBar } from '@/ui/action-bar/components/ActionBar';
 
-import { selectedRowIdsSelector } from '../../states/selectedRowIdsSelector';
+import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector';
 
 type OwnProps = {
   children: React.ReactNode | React.ReactNode[];

front/src/modules/ui/table/components/EntityTable.tsx

@@ -9,11 +9,11 @@ import { SelectedSortType, SortType } from '@/ui/filter-n-sort/types/interface';
 import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
 
+import { EntityUpdateMutationContext } from '../contexts/EntityUpdateMutationHookContext';
 import { useLeaveTableFocus } from '../hooks/useLeaveTableFocus';
 import { useMapKeyboardToSoftFocus } from '../hooks/useMapKeyboardToSoftFocus';
 import { useResetTableRowSelection } from '../hooks/useResetTableRowSelection';
 import { useSetRowSelectedState } from '../hooks/useSetRowSelectedState';
-import { EntityUpdateMutationContext } from '../states/EntityUpdateMutationHookContext';
 import { TableHeader } from '../table-header/components/TableHeader';
 
 import { EntityTableBody } from './EntityTableBody';

front/src/modules/ui/table/components/EntityTableBody.tsx

@@ -2,9 +2,9 @@ import { useRecoilValue } from 'recoil';
 
 import { isNavbarSwitchingSizeState } from '@/ui/layout/states/isNavbarSwitchingSizeState';
 
+import { RowIdContext } from '../contexts/RowIdContext';
+import { RowIndexContext } from '../contexts/RowIndexContext';
 import { isFetchingEntityTableDataState } from '../states/isFetchingEntityTableDataState';
-import { RowIdContext } from '../states/RowIdContext';
-import { RowIndexContext } from '../states/RowIndexContext';
 import { tableRowIdsState } from '../states/tableRowIdsState';
 
 import { EntityTableRow } from './EntityTableRow';

front/src/modules/ui/table/components/EntityTableCell.tsx

@@ -3,11 +3,11 @@ import { useSetRecoilState } from 'recoil';
 
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 
+import { ColumnIndexContext } from '../contexts/ColumnIndexContext';
+import { ViewFieldContext } from '../contexts/ViewFieldContext';
 import { GenericEditableCell } from '../editable-cell/components/GenericEditableCell';
 import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected';
-import { ColumnIndexContext } from '../states/ColumnIndexContext';
 import { contextMenuPositionState } from '../states/contextMenuPositionState';
-import { ViewFieldContext } from '../states/ViewFieldContext';
 
 export function EntityTableCell({ cellIndex }: { cellIndex: number }) {
   const setContextMenuPosition = useSetRecoilState(contextMenuPositionState);

front/src/modules/ui/table/components/EntityTableRow.tsx

@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
 
+import { ViewFieldContext } from '../contexts/ViewFieldContext';
 import { visibleTableColumnsState } from '../states/tableColumnsState';
-import { ViewFieldContext } from '../states/ViewFieldContext';
 
 import { CheckboxCell } from './CheckboxCell';
 import { EntityTableCell } from './EntityTableCell';

front/src/modules/ui/table/editable-cell/components/EditableCell.tsx

@@ -6,7 +6,7 @@ import { motion } from 'framer-motion';
 import { IconButton } from '@/ui/button/components/IconButton';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 
-import { CellHotkeyScopeContext } from '../../states/CellHotkeyScopeContext';
+import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext';
 import { TableHotkeyScope } from '../../types/TableHotkeyScope';
 import { useCurrentCellEditMode } from '../hooks/useCurrentCellEditMode';
 import { useEditableCell } from '../hooks/useEditableCell';

front/src/modules/ui/table/editable-cell/hooks/useCurrentCellPosition.ts

@@ -1,7 +1,7 @@
 import { useContext, useMemo } from 'react';
 
-import { ColumnIndexContext } from '../../states/ColumnIndexContext';
-import { RowIndexContext } from '../../states/RowIndexContext';
+import { ColumnIndexContext } from '../../contexts/ColumnIndexContext';
+import { RowIndexContext } from '../../contexts/RowIndexContext';
 import { CellPosition } from '../../types/CellPosition';
 
 export function useCurrentCellPosition() {

front/src/modules/ui/table/editable-cell/hooks/useEditableCell.ts

@@ -4,8 +4,8 @@ import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 
+import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext';
 import { useCloseCurrentCellInEditMode } from '../../hooks/useClearCellInEditMode';
-import { CellHotkeyScopeContext } from '../../states/CellHotkeyScopeContext';
 import { TableHotkeyScope } from '../../types/TableHotkeyScope';
 
 import { useCurrentCellEditMode } from './useCurrentCellEditMode';

front/src/modules/ui/table/editable-cell/type/components/GenericEditableChipCellDisplayMode.tsx

@@ -7,7 +7,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 import { getLogoUrlFromDomainName } from '~/utils';
 
 type OwnProps = {

front/src/modules/ui/table/editable-cell/type/components/GenericEditableChipCellEditMode.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { TextCellEdit } from './TextCellEdit';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableDateCell.tsx

@@ -7,7 +7,7 @@ import {
 import { DateInputDisplay } from '@/ui/input/date/components/DateInputDisplay';
 import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { GenericEditableDateCellEditMode } from './GenericEditableDateCellEditMode';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableDateCellEditMode.tsx

@@ -7,7 +7,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { DateCellEdit } from './DateCellEdit';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableDoubleTextCell.tsx

@@ -7,7 +7,7 @@ import {
 import { TextInputDisplay } from '@/ui/input/text/components/TextInputDisplay';
 import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { GenericEditableDoubleTextCellEditMode } from './GenericEditableDoubleTextCellEditMode';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableDoubleTextCellEditMode.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { DoubleTextCellEdit } from './DoubleTextCellEdit';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableDoubleTextChipCellDisplayMode.tsx

@@ -8,7 +8,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 type OwnProps = {
   viewField: ViewFieldDefinition<ViewFieldDoubleTextChipMetadata>;

front/src/modules/ui/table/editable-cell/type/components/GenericEditableDoubleTextChipCellEditMode.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { DoubleTextCellEdit } from './DoubleTextCellEdit';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableNumberCell.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { GenericEditableNumberCellEditMode } from './GenericEditableNumberCellEditMode';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableNumberCellEditMode.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 import {
   canBeCastAsPositiveIntegerOrNull,
   castAsPositiveIntegerOrNull,

front/src/modules/ui/table/editable-cell/type/components/GenericEditablePhoneCell.tsx

@@ -7,7 +7,7 @@ import {
 import { PhoneInputDisplay } from '@/ui/input/phone/components/PhoneInputDisplay';
 import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { GenericEditablePhoneCellEditMode } from './GenericEditablePhoneCellEditMode';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditablePhoneCellEditMode.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { TextCellEdit } from './TextCellEdit';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableRelationCellDisplayMode.tsx

@@ -7,7 +7,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 import { UserChip } from '@/users/components/UserChip';
 import { getLogoUrlFromDomainName } from '~/utils';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableRelationCellEditMode.tsx

@@ -10,7 +10,7 @@ import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
 import { useEditableCell } from '@/ui/table/editable-cell/hooks/useEditableCell';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 import { UserPicker } from '@/users/components/UserPicker';
 
 type OwnProps = {

front/src/modules/ui/table/editable-cell/type/components/GenericEditableTextCell.tsx

@@ -7,7 +7,7 @@ import {
 import { TextInputDisplay } from '@/ui/input/text/components/TextInputDisplay';
 import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { GenericEditableTextCellEditMode } from './GenericEditableTextCellEditMode';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableTextCellEditMode.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 
 import { TextCellEdit } from './TextCellEdit';
 

front/src/modules/ui/table/editable-cell/type/components/GenericEditableURLCell.tsx

@@ -7,7 +7,7 @@ import {
 import { InplaceInputURLDisplayMode } from '@/ui/input/url/components/URLTextInputDisplay';
 import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 import { sanitizeURL } from '~/utils';
 
 import { GenericEditableURLCellEditMode } from './GenericEditableURLCellEditMode';

front/src/modules/ui/table/editable-cell/type/components/GenericEditableURLCellEditMode.tsx

@@ -6,7 +6,7 @@ import {
 } from '@/ui/editable-field/types/ViewField';
 import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
 import { useUpdateEntityField } from '@/ui/table/hooks/useUpdateEntityField';
-import { tableEntityFieldFamilySelector } from '@/ui/table/states/tableEntityFieldFamilySelector';
+import { tableEntityFieldFamilySelector } from '@/ui/table/states/selectors/tableEntityFieldFamilySelector';
 import { isURL } from '~/utils/is-url';
 
 import { TextCellEdit } from './TextCellEdit';

front/src/modules/ui/table/hooks/useCurrentEntityId.ts

@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 
-import { RowIdContext } from '../states/RowIdContext';
+import { RowIdContext } from '../contexts/RowIdContext';
 
 export function useCurrentRowEntityId() {
   const currentEntityId = useContext(RowIdContext);

front/src/modules/ui/table/hooks/useCurrentRowSelected.ts

@@ -1,8 +1,8 @@
 import { useContext } from 'react';
 import { useRecoilCallback, useRecoilState } from 'recoil';
 
+import { RowIdContext } from '../contexts/RowIdContext';
 import { isRowSelectedFamilyState } from '../states/isRowSelectedFamilyState';
-import { RowIdContext } from '../states/RowIdContext';
 
 export function useCurrentRowSelected() {
   const currentRowId = useContext(RowIdContext);

front/src/modules/ui/table/hooks/useSelectAllRows.ts

@@ -1,7 +1,7 @@
 import { useRecoilCallback, useRecoilValue } from 'recoil';
 
-import { allRowsSelectedStatusSelector } from '../states/allRowsSelectedStatusSelector';
 import { isRowSelectedFamilyState } from '../states/isRowSelectedFamilyState';
+import { allRowsSelectedStatusSelector } from '../states/selectors/allRowsSelectedStatusSelector';
 import { tableRowIdsState } from '../states/tableRowIdsState';
 
 export function useSelectAllRows() {

front/src/modules/ui/table/hooks/useSetEntityTableData.ts

@@ -3,7 +3,7 @@ import { useRecoilCallback } from 'recoil';
 import { availableFiltersScopedState } from '@/ui/filter-n-sort/states/availableFiltersScopedState';
 import { FilterDefinition } from '@/ui/filter-n-sort/types/FilterDefinition';
 import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection';
-import { TableContext } from '@/ui/table/states/TableContext';
+import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { tableEntitiesFamilyState } from '@/ui/table/states/tableEntitiesFamilyState';
 import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState';
 import { useContextScopeId } from '@/ui/utilities/recoil-scope/hooks/useContextScopeId';
@@ -14,7 +14,7 @@ import { numberOfTableRowsState } from '../states/numberOfTableRowsState';
 export function useSetEntityTableData() {
   const resetTableRowSelection = useResetTableRowSelection();
 
-  const tableContextScopeId = useContextScopeId(TableContext);
+  const tableContextScopeId = useContextScopeId(TableRecoilScopeContext);
 
   return useRecoilCallback(
     ({ set, snapshot }) =>

front/src/modules/ui/table/hooks/useUpdateEntityField.ts

@@ -41,7 +41,7 @@ import {
   ViewFieldURLMetadata,
   ViewFieldURLValue,
 } from '../../editable-field/types/ViewField';
-import { EntityUpdateMutationContext } from '../states/EntityUpdateMutationHookContext';
+import { EntityUpdateMutationContext } from '../contexts/EntityUpdateMutationHookContext';
 
 export function useUpdateEntityField() {
   const updateEntity = useContext(EntityUpdateMutationContext);

front/src/modules/ui/table/states/TableContext.ts

@@ -1,3 +0,0 @@
-import { createContext } from 'react';
-
-export const TableContext = createContext<string | null>(null);

front/src/modules/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext.ts

@@ -0,0 +1,3 @@
+import { createContext } from 'react';
+
+export const TableRecoilScopeContext = createContext<string | null>(null);

front/src/modules/ui/table/states/selectors/allRowsSelectedStatusSelector.ts

@@ -1,8 +1,8 @@
 import { selector } from 'recoil';
 
-import { AllRowsSelectedStatus } from '../types/AllRowSelectedStatus';
+import { AllRowsSelectedStatus } from '../../types/AllRowSelectedStatus';
+import { numberOfTableRowsState } from '../numberOfTableRowsState';
 
-import { numberOfTableRowsState } from './numberOfTableRowsState';
 import { selectedRowIdsSelector } from './selectedRowIdsSelector';
 
 export const allRowsSelectedStatusSelector = selector<AllRowsSelectedStatus>({

front/src/modules/ui/table/states/selectors/selectedRowIdsSelector.ts

@@ -1,7 +1,7 @@
 import { selector } from 'recoil';
 
-import { isRowSelectedFamilyState } from './isRowSelectedFamilyState';
-import { tableRowIdsState } from './tableRowIdsState';
+import { isRowSelectedFamilyState } from '../isRowSelectedFamilyState';
+import { tableRowIdsState } from '../tableRowIdsState';
 
 export const selectedRowIdsSelector = selector<string[]>({
   key: 'selectedRowIdsSelector',

front/src/modules/ui/table/states/selectors/tableEntityFieldFamilySelector.ts

@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { tableEntitiesFamilyState } from './tableEntitiesFamilyState';
+import { tableEntitiesFamilyState } from '../tableEntitiesFamilyState';
 
 export const tableEntityFieldFamilySelector = selectorFamily({
   key: 'tableEntityFieldFamilySelector',

front/src/modules/ui/table/table-header/components/TableHeader.tsx

@@ -15,7 +15,7 @@ import { TableOptionsDropdownButton } from '@/ui/table/options/components/TableO
 import { TopBar } from '@/ui/top-bar/TopBar';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 
-import { TableContext } from '../../states/TableContext';
+import { TableRecoilScopeContext } from '../../states/recoil-scope-contexts/TableRecoilScopeContext';
 
 type OwnProps<SortField> = {
   viewName: string;
@@ -44,7 +44,7 @@ export function TableHeader<SortField>({
 }: OwnProps<SortField>) {
   const [sorts, setSorts] = useRecoilScopedState<SelectedSortType<SortField>[]>(
     sortScopedState,
-    TableContext,
+    TableRecoilScopeContext,
   );
   const handleSortsUpdate = onSortsUpdate ?? setSorts;
 
@@ -76,7 +76,7 @@ export function TableHeader<SortField>({
       rightComponent={
         <>
           <FilterDropdownButton
-            context={TableContext}
+            context={TableRecoilScopeContext}
             HotkeyScope={FiltersHotkeyScope.FilterDropdownButton}
           />
           <SortDropdownButton<SortField>
@@ -93,7 +93,7 @@ export function TableHeader<SortField>({
       }
       bottomComponent={
         <SortAndFilterBar
-          context={TableContext}
+          context={TableRecoilScopeContext}
           sorts={sorts}
           onRemoveSort={sortUnselect}
           onCancelClick={() => {