From d6b89359f576416d3485777e12111ba08fb61d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tha=C3=AFs?= Date: Wed, 6 Sep 2023 16:46:02 +0200 Subject: [PATCH] refactor: rename ui/filter-n-sort to ui/view-bar (#1475) Closes #1473 Co-authored-by: Lucas Bordeau --- .../tasks/hooks/useInitializeTasksFilters.ts | 4 ++-- .../modules/activities/tasks/hooks/useTasks.ts | 6 +++--- .../FilterDropdownCompanySearchSelect.tsx | 6 +++--- .../companies/components/HooksCompanyBoard.tsx | 6 +++--- .../table/components/CompanyTable.tsx | 4 ++-- .../FilterDropdownPeopleSearchSelect.tsx | 6 +++--- .../people/hooks/useSetPeopleEntityTable.ts | 2 +- .../people/table/components/PeopleTable.tsx | 4 ++-- .../ui/board/components/BoardHeader.tsx | 12 ++++++------ .../ui/board/components/EntityBoard.tsx | 2 +- .../src/modules/ui/board/types/BoardOptions.ts | 4 ++-- .../ui/table/components/EntityTable.tsx | 2 +- .../components/GenericEntityTableData.tsx | 2 +- .../ui/table/hooks/useSetEntityTableData.ts | 4 ++-- .../components/TableOptionsDropdownContent.tsx | 8 ++++---- .../components/TableUpdateViewButtonGroup.tsx | 14 +++++++------- .../components/TableViewsDropdownButton.tsx | 10 +++++----- .../table-header/components/TableHeader.tsx | 18 +++++++++--------- .../components/DropdownButton.tsx | 0 .../components/DropdownMenuContainer.tsx | 0 .../components/FilterDropdownButton.tsx | 0 .../FilterDropdownDateSearchInput.tsx | 6 +++--- .../FilterDropdownEntitySearchInput.tsx | 6 +++--- .../FilterDropdownEntitySearchSelect.tsx | 12 ++++++------ .../components/FilterDropdownEntitySelect.tsx | 0 .../components/FilterDropdownFilterSelect.tsx | 0 .../FilterDropdownNumberSearchInput.tsx | 0 .../components/FilterDropdownOperandButton.tsx | 0 .../components/FilterDropdownOperandSelect.tsx | 0 .../FilterDropdownTextSearchInput.tsx | 0 .../components/GenericEntityFilterChip.tsx | 0 .../MultipleFiltersDropdownButton.tsx | 10 +++++----- .../SingleEntityFilterDropdownButton.tsx | 6 +++--- .../components/SortDropdownButton.tsx | 0 .../components/SortOrFilterChip.tsx | 0 .../components/ViewBarDetails.tsx} | 4 ++-- .../ui/{filter-n-sort => view-bar}/helpers.ts | 0 .../hooks/useFilterCurrentlyEdited.ts | 0 .../hooks/useRemoveFilter.ts | 0 .../hooks/useUpsertFilter.ts | 0 .../states/availableFiltersScopedState.ts | 0 ...ilterDefinitionUsedInDropdownScopedState.ts | 0 .../filterDropdownSearchInputScopedState.ts | 0 ...ilterDropdownSelectedEntityIdScopedState.ts | 0 .../states/filtersScopedState.ts | 0 ...DropdownOperandSelectUnfoldedScopedState.ts | 0 .../states/isViewBarExpandedScopedState.ts | 0 .../states/savedFiltersScopedState.ts | 0 .../states/savedSortsScopedState.ts | 0 .../selectedOperandInDropdownScopedState.ts | 0 .../canPersistFiltersScopedSelector.ts | 0 .../selectors/canPersistSortsScopedSelector.ts | 0 .../selectors/filtersWhereScopedSelector.ts | 0 .../savedFiltersByKeyScopedSelector.ts | 0 .../selectors/savedSortsByKeyScopedSelector.ts | 0 .../selectors/sortsOrderByScopedSelector.ts | 0 .../states/sortsScopedState.ts | 0 .../types/Filter.ts | 0 .../types/FilterDefinition.ts | 0 .../types/FilterDefinitionByEntity.ts | 0 .../types/FilterOperand.ts | 0 .../types/FilterType.ts | 0 .../types/FiltersHotkeyScope.ts | 0 .../types/interface.ts | 0 .../utils/getOperandLabel.ts | 0 .../utils/getOperandsForFilterType.ts | 0 .../utils/turnFilterIntoWhereClause.ts | 0 .../FilterDropdownUserSearchSelect.tsx | 6 +++--- front/src/modules/views/hooks/useTableViews.ts | 8 ++++---- .../src/modules/views/hooks/useViewFilters.ts | 10 +++++----- front/src/modules/views/hooks/useViewSorts.ts | 11 ++++------- front/src/modules/views/hooks/useViews.ts | 4 ++-- .../src/pages/companies/companies-filters.tsx | 2 +- front/src/pages/companies/companies-sorts.tsx | 2 +- .../src/pages/opportunities/Opportunities.tsx | 4 ++-- .../opportunities/opportunities-filters.tsx | 2 +- .../opportunities/opportunities-sorts.tsx | 2 +- front/src/pages/people/people-filters.tsx | 2 +- front/src/pages/people/people-sorts.tsx | 2 +- front/src/pages/tasks/Tasks.tsx | 4 ++-- front/src/pages/tasks/tasks-filters.tsx | 2 +- 81 files changed, 108 insertions(+), 111 deletions(-) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/DropdownButton.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/DropdownMenuContainer.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownButton.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownDateSearchInput.tsx (83%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownEntitySearchInput.tsx (79%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownEntitySearchSelect.tsx (84%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownEntitySelect.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownFilterSelect.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownNumberSearchInput.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownOperandButton.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownOperandSelect.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/FilterDropdownTextSearchInput.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/GenericEntityFilterChip.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/MultipleFiltersDropdownButton.tsx (91%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/SingleEntityFilterDropdownButton.tsx (91%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/SortDropdownButton.tsx (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/components/SortOrFilterChip.tsx (100%) rename front/src/modules/ui/{filter-n-sort/components/SortAndFilterBar.tsx => view-bar/components/ViewBarDetails.tsx} (98%) rename front/src/modules/ui/{filter-n-sort => view-bar}/helpers.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/hooks/useFilterCurrentlyEdited.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/hooks/useRemoveFilter.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/hooks/useUpsertFilter.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/availableFiltersScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/filterDefinitionUsedInDropdownScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/filterDropdownSearchInputScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/filterDropdownSelectedEntityIdScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/filtersScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/isViewBarExpandedScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/savedFiltersScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/savedSortsScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/selectedOperandInDropdownScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/selectors/canPersistFiltersScopedSelector.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/selectors/canPersistSortsScopedSelector.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/selectors/filtersWhereScopedSelector.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/selectors/savedFiltersByKeyScopedSelector.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/selectors/savedSortsByKeyScopedSelector.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/selectors/sortsOrderByScopedSelector.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/states/sortsScopedState.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/types/Filter.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/types/FilterDefinition.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/types/FilterDefinitionByEntity.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/types/FilterOperand.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/types/FilterType.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/types/FiltersHotkeyScope.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/types/interface.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/utils/getOperandLabel.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/utils/getOperandsForFilterType.ts (100%) rename front/src/modules/ui/{filter-n-sort => view-bar}/utils/turnFilterIntoWhereClause.ts (100%) diff --git a/front/src/modules/activities/tasks/hooks/useInitializeTasksFilters.ts b/front/src/modules/activities/tasks/hooks/useInitializeTasksFilters.ts index b1993797f..323d25cd1 100644 --- a/front/src/modules/activities/tasks/hooks/useInitializeTasksFilters.ts +++ b/front/src/modules/activities/tasks/hooks/useInitializeTasksFilters.ts @@ -1,8 +1,8 @@ import { useEffect } from 'react'; -import { availableFiltersScopedState } from '@/ui/filter-n-sort/states/availableFiltersScopedState'; -import { FilterDefinition } from '@/ui/filter-n-sort/types/FilterDefinition'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; +import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; +import { FilterDefinition } from '@/ui/view-bar/types/FilterDefinition'; import { TasksRecoilScopeContext } from '../../states/recoil-scope-contexts/TasksRecoilScopeContext'; diff --git a/front/src/modules/activities/tasks/hooks/useTasks.ts b/front/src/modules/activities/tasks/hooks/useTasks.ts index a98061279..b3d4f2b12 100644 --- a/front/src/modules/activities/tasks/hooks/useTasks.ts +++ b/front/src/modules/activities/tasks/hooks/useTasks.ts @@ -6,10 +6,10 @@ import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contex import { useInitializeTasksFilters } from '@/activities/tasks/hooks/useInitializeTasksFilters'; import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity'; import { currentUserState } from '@/auth/states/currentUserState'; -import { filtersScopedState } from '@/ui/filter-n-sort/states/filtersScopedState'; -import { FilterOperand } from '@/ui/filter-n-sort/types/FilterOperand'; -import { turnFilterIntoWhereClause } from '@/ui/filter-n-sort/utils/turnFilterIntoWhereClause'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; +import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; +import { FilterOperand } from '@/ui/view-bar/types/FilterOperand'; +import { turnFilterIntoWhereClause } from '@/ui/view-bar/utils/turnFilterIntoWhereClause'; import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql'; import { tasksFilters } from '~/pages/tasks/tasks-filters'; import { parseDate } from '~/utils/date-utils'; diff --git a/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx b/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx index 044d4fa74..f6c92ae9f 100644 --- a/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx +++ b/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx @@ -1,10 +1,10 @@ import { Context } from 'react'; -import { FilterDropdownEntitySearchSelect } from '@/ui/filter-n-sort/components/FilterDropdownEntitySearchSelect'; -import { filterDropdownSearchInputScopedState } from '@/ui/filter-n-sort/states/filterDropdownSearchInputScopedState'; -import { filterDropdownSelectedEntityIdScopedState } from '@/ui/filter-n-sort/states/filterDropdownSelectedEntityIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { FilterDropdownEntitySearchSelect } from '@/ui/view-bar/components/FilterDropdownEntitySearchSelect'; +import { filterDropdownSearchInputScopedState } from '@/ui/view-bar/states/filterDropdownSearchInputScopedState'; +import { filterDropdownSelectedEntityIdScopedState } from '@/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState'; import { useFilteredSearchCompanyQuery } from '../hooks/useFilteredSearchCompanyQuery'; diff --git a/front/src/modules/companies/components/HooksCompanyBoard.tsx b/front/src/modules/companies/components/HooksCompanyBoard.tsx index 127bbd2ca..c0fe83874 100644 --- a/front/src/modules/companies/components/HooksCompanyBoard.tsx +++ b/front/src/modules/companies/components/HooksCompanyBoard.tsx @@ -6,11 +6,11 @@ import { useBoardActionBarEntries } from '@/ui/board/hooks/useBoardActionBarEntr import { useBoardContextMenuEntries } from '@/ui/board/hooks/useBoardContextMenuEntries'; import { isBoardLoadedState } from '@/ui/board/states/isBoardLoadedState'; import { viewFieldsDefinitionsState } from '@/ui/board/states/viewFieldsDefinitionsState'; -import { availableFiltersScopedState } from '@/ui/filter-n-sort/states/availableFiltersScopedState'; -import { filtersScopedState } from '@/ui/filter-n-sort/states/filtersScopedState'; -import { turnFilterIntoWhereClause } from '@/ui/filter-n-sort/utils/turnFilterIntoWhereClause'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; +import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; +import { turnFilterIntoWhereClause } from '@/ui/view-bar/utils/turnFilterIntoWhereClause'; import { Pipeline, PipelineProgressableType, diff --git a/front/src/modules/companies/table/components/CompanyTable.tsx b/front/src/modules/companies/table/components/CompanyTable.tsx index 7260a716b..417885fac 100644 --- a/front/src/modules/companies/table/components/CompanyTable.tsx +++ b/front/src/modules/companies/table/components/CompanyTable.tsx @@ -3,13 +3,13 @@ import { getCompaniesOptimisticEffect } from '@/companies/graphql/optimistic-eff import { useCompanyTableActionBarEntries } from '@/companies/hooks/useCompanyTableActionBarEntries'; import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries'; import { useSpreadsheetCompanyImport } from '@/companies/hooks/useSpreadsheetCompanyImport'; -import { filtersWhereScopedSelector } from '@/ui/filter-n-sort/states/selectors/filtersWhereScopedSelector'; -import { sortsOrderByScopedSelector } from '@/ui/filter-n-sort/states/selectors/sortsOrderByScopedSelector'; import { EntityTable } from '@/ui/table/components/EntityTable'; import { GenericEntityTableData } from '@/ui/table/components/GenericEntityTableData'; import { useUpsertEntityTableItem } from '@/ui/table/hooks/useUpsertEntityTableItem'; import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { filtersWhereScopedSelector } from '@/ui/view-bar/states/selectors/filtersWhereScopedSelector'; +import { sortsOrderByScopedSelector } from '@/ui/view-bar/states/selectors/sortsOrderByScopedSelector'; import { useTableViews } from '@/views/hooks/useTableViews'; import { SortOrder, diff --git a/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx b/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx index 4a8efc966..857a29e34 100644 --- a/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx +++ b/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx @@ -1,11 +1,11 @@ import { Context } from 'react'; import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery'; -import { FilterDropdownEntitySearchSelect } from '@/ui/filter-n-sort/components/FilterDropdownEntitySearchSelect'; -import { filterDropdownSearchInputScopedState } from '@/ui/filter-n-sort/states/filterDropdownSearchInputScopedState'; -import { filterDropdownSelectedEntityIdScopedState } from '@/ui/filter-n-sort/states/filterDropdownSelectedEntityIdScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { FilterDropdownEntitySearchSelect } from '@/ui/view-bar/components/FilterDropdownEntitySearchSelect'; +import { filterDropdownSearchInputScopedState } from '@/ui/view-bar/states/filterDropdownSearchInputScopedState'; +import { filterDropdownSelectedEntityIdScopedState } from '@/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState'; export function FilterDropdownPeopleSearchSelect({ context, diff --git a/front/src/modules/people/hooks/useSetPeopleEntityTable.ts b/front/src/modules/people/hooks/useSetPeopleEntityTable.ts index 22b2754cc..5e245c552 100644 --- a/front/src/modules/people/hooks/useSetPeopleEntityTable.ts +++ b/front/src/modules/people/hooks/useSetPeopleEntityTable.ts @@ -1,7 +1,6 @@ import { useLocation } from 'react-router-dom'; import { useRecoilCallback } from 'recoil'; -import { availableFiltersScopedState } from '@/ui/filter-n-sort/states/availableFiltersScopedState'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; import { isFetchingEntityTableDataState } from '@/ui/table/states/isFetchingEntityTableDataState'; import { numberOfTableRowsState } from '@/ui/table/states/numberOfTableRowsState'; @@ -9,6 +8,7 @@ import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState'; import { currentPageLocationState } from '@/ui/utilities/loading-state/states/currentPageLocationState'; import { useContextScopeId } from '@/ui/utilities/recoil-scope/hooks/useContextScopeId'; +import { availableFiltersScopedState } from '@/ui/view-bar/states/availableFiltersScopedState'; import { GetPeopleQuery } from '~/generated/graphql'; import { peopleFilters } from '~/pages/people/people-filters'; diff --git a/front/src/modules/people/table/components/PeopleTable.tsx b/front/src/modules/people/table/components/PeopleTable.tsx index 0bbfc2001..3a6e91da9 100644 --- a/front/src/modules/people/table/components/PeopleTable.tsx +++ b/front/src/modules/people/table/components/PeopleTable.tsx @@ -3,13 +3,13 @@ import { getPeopleOptimisticEffect } from '@/people/graphql/optimistic-effect-ca import { usePersonTableContextMenuEntries } from '@/people/hooks/usePeopleTableContextMenuEntries'; import { usePersonTableActionBarEntries } from '@/people/hooks/usePersonTableActionBarEntries'; import { useSpreadsheetPersonImport } from '@/people/hooks/useSpreadsheetPersonImport'; -import { filtersWhereScopedSelector } from '@/ui/filter-n-sort/states/selectors/filtersWhereScopedSelector'; -import { sortsOrderByScopedSelector } from '@/ui/filter-n-sort/states/selectors/sortsOrderByScopedSelector'; import { EntityTable } from '@/ui/table/components/EntityTable'; import { GenericEntityTableData } from '@/ui/table/components/GenericEntityTableData'; import { useUpsertEntityTableItem } from '@/ui/table/hooks/useUpsertEntityTableItem'; import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { filtersWhereScopedSelector } from '@/ui/view-bar/states/selectors/filtersWhereScopedSelector'; +import { sortsOrderByScopedSelector } from '@/ui/view-bar/states/selectors/sortsOrderByScopedSelector'; import { useTableViews } from '@/views/hooks/useTableViews'; import { SortOrder, diff --git a/front/src/modules/ui/board/components/BoardHeader.tsx b/front/src/modules/ui/board/components/BoardHeader.tsx index 4aecf2e0d..f2f8293e7 100644 --- a/front/src/modules/ui/board/components/BoardHeader.tsx +++ b/front/src/modules/ui/board/components/BoardHeader.tsx @@ -8,13 +8,13 @@ import { import styled from '@emotion/styled'; import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext'; -import { FilterDropdownButton } from '@/ui/filter-n-sort/components/FilterDropdownButton'; -import SortAndFilterBar from '@/ui/filter-n-sort/components/SortAndFilterBar'; -import { SortDropdownButton } from '@/ui/filter-n-sort/components/SortDropdownButton'; -import { FiltersHotkeyScope } from '@/ui/filter-n-sort/types/FiltersHotkeyScope'; -import { SelectedSortType, SortType } from '@/ui/filter-n-sort/types/interface'; import { TopBar } from '@/ui/top-bar/TopBar'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; +import { FilterDropdownButton } from '@/ui/view-bar/components/FilterDropdownButton'; +import { SortDropdownButton } from '@/ui/view-bar/components/SortDropdownButton'; +import ViewBarDetails from '@/ui/view-bar/components/ViewBarDetails'; +import { FiltersHotkeyScope } from '@/ui/view-bar/types/FiltersHotkeyScope'; +import { SelectedSortType, SortType } from '@/ui/view-bar/types/interface'; import type { BoardColumnDefinition } from '../types/BoardColumnDefinition'; import { BoardOptionsHotkeyScope } from '../types/BoardOptionsHotkeyScope'; @@ -102,7 +102,7 @@ export function BoardHeader({ } bottomComponent={ - ({ } bottomComponent={ - ({ +function ViewBarDetails({ canPersistView, context, sorts, @@ -217,4 +217,4 @@ function SortAndFilterBar({ ); } -export default SortAndFilterBar; +export default ViewBarDetails; diff --git a/front/src/modules/ui/filter-n-sort/helpers.ts b/front/src/modules/ui/view-bar/helpers.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/helpers.ts rename to front/src/modules/ui/view-bar/helpers.ts diff --git a/front/src/modules/ui/filter-n-sort/hooks/useFilterCurrentlyEdited.ts b/front/src/modules/ui/view-bar/hooks/useFilterCurrentlyEdited.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/hooks/useFilterCurrentlyEdited.ts rename to front/src/modules/ui/view-bar/hooks/useFilterCurrentlyEdited.ts diff --git a/front/src/modules/ui/filter-n-sort/hooks/useRemoveFilter.ts b/front/src/modules/ui/view-bar/hooks/useRemoveFilter.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/hooks/useRemoveFilter.ts rename to front/src/modules/ui/view-bar/hooks/useRemoveFilter.ts diff --git a/front/src/modules/ui/filter-n-sort/hooks/useUpsertFilter.ts b/front/src/modules/ui/view-bar/hooks/useUpsertFilter.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/hooks/useUpsertFilter.ts rename to front/src/modules/ui/view-bar/hooks/useUpsertFilter.ts diff --git a/front/src/modules/ui/filter-n-sort/states/availableFiltersScopedState.ts b/front/src/modules/ui/view-bar/states/availableFiltersScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/availableFiltersScopedState.ts rename to front/src/modules/ui/view-bar/states/availableFiltersScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/filterDefinitionUsedInDropdownScopedState.ts b/front/src/modules/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/filterDefinitionUsedInDropdownScopedState.ts rename to front/src/modules/ui/view-bar/states/filterDefinitionUsedInDropdownScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/filterDropdownSearchInputScopedState.ts b/front/src/modules/ui/view-bar/states/filterDropdownSearchInputScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/filterDropdownSearchInputScopedState.ts rename to front/src/modules/ui/view-bar/states/filterDropdownSearchInputScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/filterDropdownSelectedEntityIdScopedState.ts b/front/src/modules/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/filterDropdownSelectedEntityIdScopedState.ts rename to front/src/modules/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/filtersScopedState.ts b/front/src/modules/ui/view-bar/states/filtersScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/filtersScopedState.ts rename to front/src/modules/ui/view-bar/states/filtersScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts b/front/src/modules/ui/view-bar/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts rename to front/src/modules/ui/view-bar/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/isViewBarExpandedScopedState.ts b/front/src/modules/ui/view-bar/states/isViewBarExpandedScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/isViewBarExpandedScopedState.ts rename to front/src/modules/ui/view-bar/states/isViewBarExpandedScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/savedFiltersScopedState.ts b/front/src/modules/ui/view-bar/states/savedFiltersScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/savedFiltersScopedState.ts rename to front/src/modules/ui/view-bar/states/savedFiltersScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/savedSortsScopedState.ts b/front/src/modules/ui/view-bar/states/savedSortsScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/savedSortsScopedState.ts rename to front/src/modules/ui/view-bar/states/savedSortsScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/selectedOperandInDropdownScopedState.ts b/front/src/modules/ui/view-bar/states/selectedOperandInDropdownScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/selectedOperandInDropdownScopedState.ts rename to front/src/modules/ui/view-bar/states/selectedOperandInDropdownScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/states/selectors/canPersistFiltersScopedSelector.ts b/front/src/modules/ui/view-bar/states/selectors/canPersistFiltersScopedSelector.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/selectors/canPersistFiltersScopedSelector.ts rename to front/src/modules/ui/view-bar/states/selectors/canPersistFiltersScopedSelector.ts diff --git a/front/src/modules/ui/filter-n-sort/states/selectors/canPersistSortsScopedSelector.ts b/front/src/modules/ui/view-bar/states/selectors/canPersistSortsScopedSelector.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/selectors/canPersistSortsScopedSelector.ts rename to front/src/modules/ui/view-bar/states/selectors/canPersistSortsScopedSelector.ts diff --git a/front/src/modules/ui/filter-n-sort/states/selectors/filtersWhereScopedSelector.ts b/front/src/modules/ui/view-bar/states/selectors/filtersWhereScopedSelector.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/selectors/filtersWhereScopedSelector.ts rename to front/src/modules/ui/view-bar/states/selectors/filtersWhereScopedSelector.ts diff --git a/front/src/modules/ui/filter-n-sort/states/selectors/savedFiltersByKeyScopedSelector.ts b/front/src/modules/ui/view-bar/states/selectors/savedFiltersByKeyScopedSelector.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/selectors/savedFiltersByKeyScopedSelector.ts rename to front/src/modules/ui/view-bar/states/selectors/savedFiltersByKeyScopedSelector.ts diff --git a/front/src/modules/ui/filter-n-sort/states/selectors/savedSortsByKeyScopedSelector.ts b/front/src/modules/ui/view-bar/states/selectors/savedSortsByKeyScopedSelector.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/selectors/savedSortsByKeyScopedSelector.ts rename to front/src/modules/ui/view-bar/states/selectors/savedSortsByKeyScopedSelector.ts diff --git a/front/src/modules/ui/filter-n-sort/states/selectors/sortsOrderByScopedSelector.ts b/front/src/modules/ui/view-bar/states/selectors/sortsOrderByScopedSelector.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/selectors/sortsOrderByScopedSelector.ts rename to front/src/modules/ui/view-bar/states/selectors/sortsOrderByScopedSelector.ts diff --git a/front/src/modules/ui/filter-n-sort/states/sortsScopedState.ts b/front/src/modules/ui/view-bar/states/sortsScopedState.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/states/sortsScopedState.ts rename to front/src/modules/ui/view-bar/states/sortsScopedState.ts diff --git a/front/src/modules/ui/filter-n-sort/types/Filter.ts b/front/src/modules/ui/view-bar/types/Filter.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/types/Filter.ts rename to front/src/modules/ui/view-bar/types/Filter.ts diff --git a/front/src/modules/ui/filter-n-sort/types/FilterDefinition.ts b/front/src/modules/ui/view-bar/types/FilterDefinition.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/types/FilterDefinition.ts rename to front/src/modules/ui/view-bar/types/FilterDefinition.ts diff --git a/front/src/modules/ui/filter-n-sort/types/FilterDefinitionByEntity.ts b/front/src/modules/ui/view-bar/types/FilterDefinitionByEntity.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/types/FilterDefinitionByEntity.ts rename to front/src/modules/ui/view-bar/types/FilterDefinitionByEntity.ts diff --git a/front/src/modules/ui/filter-n-sort/types/FilterOperand.ts b/front/src/modules/ui/view-bar/types/FilterOperand.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/types/FilterOperand.ts rename to front/src/modules/ui/view-bar/types/FilterOperand.ts diff --git a/front/src/modules/ui/filter-n-sort/types/FilterType.ts b/front/src/modules/ui/view-bar/types/FilterType.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/types/FilterType.ts rename to front/src/modules/ui/view-bar/types/FilterType.ts diff --git a/front/src/modules/ui/filter-n-sort/types/FiltersHotkeyScope.ts b/front/src/modules/ui/view-bar/types/FiltersHotkeyScope.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/types/FiltersHotkeyScope.ts rename to front/src/modules/ui/view-bar/types/FiltersHotkeyScope.ts diff --git a/front/src/modules/ui/filter-n-sort/types/interface.ts b/front/src/modules/ui/view-bar/types/interface.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/types/interface.ts rename to front/src/modules/ui/view-bar/types/interface.ts diff --git a/front/src/modules/ui/filter-n-sort/utils/getOperandLabel.ts b/front/src/modules/ui/view-bar/utils/getOperandLabel.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/utils/getOperandLabel.ts rename to front/src/modules/ui/view-bar/utils/getOperandLabel.ts diff --git a/front/src/modules/ui/filter-n-sort/utils/getOperandsForFilterType.ts b/front/src/modules/ui/view-bar/utils/getOperandsForFilterType.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/utils/getOperandsForFilterType.ts rename to front/src/modules/ui/view-bar/utils/getOperandsForFilterType.ts diff --git a/front/src/modules/ui/filter-n-sort/utils/turnFilterIntoWhereClause.ts b/front/src/modules/ui/view-bar/utils/turnFilterIntoWhereClause.ts similarity index 100% rename from front/src/modules/ui/filter-n-sort/utils/turnFilterIntoWhereClause.ts rename to front/src/modules/ui/view-bar/utils/turnFilterIntoWhereClause.ts diff --git a/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx b/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx index 0067ade86..23115069f 100644 --- a/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx +++ b/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx @@ -1,12 +1,12 @@ import { Context } from 'react'; import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery'; -import { FilterDropdownEntitySearchSelect } from '@/ui/filter-n-sort/components/FilterDropdownEntitySearchSelect'; -import { filterDropdownSearchInputScopedState } from '@/ui/filter-n-sort/states/filterDropdownSearchInputScopedState'; -import { filterDropdownSelectedEntityIdScopedState } from '@/ui/filter-n-sort/states/filterDropdownSelectedEntityIdScopedState'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { FilterDropdownEntitySearchSelect } from '@/ui/view-bar/components/FilterDropdownEntitySearchSelect'; +import { filterDropdownSearchInputScopedState } from '@/ui/view-bar/states/filterDropdownSearchInputScopedState'; +import { filterDropdownSelectedEntityIdScopedState } from '@/ui/view-bar/states/filterDropdownSelectedEntityIdScopedState'; import { useSearchUserQuery } from '~/generated/graphql'; export function FilterDropdownUserSearchSelect({ diff --git a/front/src/modules/views/hooks/useTableViews.ts b/front/src/modules/views/hooks/useTableViews.ts index 5b03f0ed4..49899f6ac 100644 --- a/front/src/modules/views/hooks/useTableViews.ts +++ b/front/src/modules/views/hooks/useTableViews.ts @@ -1,15 +1,15 @@ import { useCallback } from 'react'; import type { ViewFieldMetadata } from '@/ui/editable-field/types/ViewField'; -import { filtersScopedState } from '@/ui/filter-n-sort/states/filtersScopedState'; -import { sortsScopedState } from '@/ui/filter-n-sort/states/sortsScopedState'; -import type { FilterDefinitionByEntity } from '@/ui/filter-n-sort/types/FilterDefinitionByEntity'; -import type { SortType } from '@/ui/filter-n-sort/types/interface'; import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { tableColumnsScopedState } from '@/ui/table/states/tableColumnsScopedState'; import { currentTableViewIdState } from '@/ui/table/states/tableViewsState'; import type { ColumnDefinition } from '@/ui/table/types/ColumnDefinition'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; +import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; +import type { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; +import type { SortType } from '@/ui/view-bar/types/interface'; import { ViewType } from '~/generated/graphql'; import { useTableViewFields } from './useTableViewFields'; diff --git a/front/src/modules/views/hooks/useViewFilters.ts b/front/src/modules/views/hooks/useViewFilters.ts index 9f6cc7ab6..6c7dbd012 100644 --- a/front/src/modules/views/hooks/useViewFilters.ts +++ b/front/src/modules/views/hooks/useViewFilters.ts @@ -1,12 +1,12 @@ import { Context, useCallback } from 'react'; import { useRecoilState, useRecoilValue } from 'recoil'; -import { filtersScopedState } from '@/ui/filter-n-sort/states/filtersScopedState'; -import { savedFiltersScopedState } from '@/ui/filter-n-sort/states/savedFiltersScopedState'; -import { savedFiltersByKeyScopedSelector } from '@/ui/filter-n-sort/states/selectors/savedFiltersByKeyScopedSelector'; -import type { Filter } from '@/ui/filter-n-sort/types/Filter'; -import type { FilterDefinitionByEntity } from '@/ui/filter-n-sort/types/FilterDefinitionByEntity'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; +import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState'; +import { savedFiltersScopedState } from '@/ui/view-bar/states/savedFiltersScopedState'; +import { savedFiltersByKeyScopedSelector } from '@/ui/view-bar/states/selectors/savedFiltersByKeyScopedSelector'; +import type { Filter } from '@/ui/view-bar/types/Filter'; +import type { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; import { useCreateViewFiltersMutation, useDeleteViewFiltersMutation, diff --git a/front/src/modules/views/hooks/useViewSorts.ts b/front/src/modules/views/hooks/useViewSorts.ts index 26b98d494..39bf7482e 100644 --- a/front/src/modules/views/hooks/useViewSorts.ts +++ b/front/src/modules/views/hooks/useViewSorts.ts @@ -1,14 +1,11 @@ import { Context, useCallback } from 'react'; import { useRecoilState, useRecoilValue } from 'recoil'; -import { savedSortsScopedState } from '@/ui/filter-n-sort/states/savedSortsScopedState'; -import { savedSortsByKeyScopedSelector } from '@/ui/filter-n-sort/states/selectors/savedSortsByKeyScopedSelector'; -import { sortsScopedState } from '@/ui/filter-n-sort/states/sortsScopedState'; -import type { - SelectedSortType, - SortType, -} from '@/ui/filter-n-sort/types/interface'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; +import { savedSortsScopedState } from '@/ui/view-bar/states/savedSortsScopedState'; +import { savedSortsByKeyScopedSelector } from '@/ui/view-bar/states/selectors/savedSortsByKeyScopedSelector'; +import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState'; +import type { SelectedSortType, SortType } from '@/ui/view-bar/types/interface'; import { useCreateViewSortsMutation, useDeleteViewSortsMutation, diff --git a/front/src/modules/views/hooks/useViews.ts b/front/src/modules/views/hooks/useViews.ts index 3d20b1b4a..64770fe06 100644 --- a/front/src/modules/views/hooks/useViews.ts +++ b/front/src/modules/views/hooks/useViews.ts @@ -1,7 +1,5 @@ import { useRecoilCallback } from 'recoil'; -import { savedFiltersScopedState } from '@/ui/filter-n-sort/states/savedFiltersScopedState'; -import { savedSortsScopedState } from '@/ui/filter-n-sort/states/savedSortsScopedState'; import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { savedTableColumnsScopedState } from '@/ui/table/states/savedTableColumnsScopedState'; import { @@ -12,6 +10,8 @@ import { } from '@/ui/table/states/tableViewsState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; +import { savedFiltersScopedState } from '@/ui/view-bar/states/savedFiltersScopedState'; +import { savedSortsScopedState } from '@/ui/view-bar/states/savedSortsScopedState'; import { useCreateViewMutation, useDeleteViewMutation, diff --git a/front/src/pages/companies/companies-filters.tsx b/front/src/pages/companies/companies-filters.tsx index de7989277..224a900bd 100644 --- a/front/src/pages/companies/companies-filters.tsx +++ b/front/src/pages/companies/companies-filters.tsx @@ -1,4 +1,3 @@ -import { FilterDefinitionByEntity } from '@/ui/filter-n-sort/types/FilterDefinitionByEntity'; import { IconBuildingSkyscraper, IconCalendarEvent, @@ -8,6 +7,7 @@ import { IconUsers, } from '@/ui/icon/index'; import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; import { FilterDropdownUserSearchSelect } from '@/users/components/FilterDropdownUserSearchSelect'; import { Company } from '~/generated/graphql'; diff --git a/front/src/pages/companies/companies-sorts.tsx b/front/src/pages/companies/companies-sorts.tsx index 9c76d8c56..9a2b0eec1 100644 --- a/front/src/pages/companies/companies-sorts.tsx +++ b/front/src/pages/companies/companies-sorts.tsx @@ -1,4 +1,3 @@ -import { SortType } from '@/ui/filter-n-sort/types/interface'; import { IconBuildingSkyscraper, IconCalendarEvent, @@ -6,6 +5,7 @@ import { IconMap, IconUsers, } from '@/ui/icon/index'; +import { SortType } from '@/ui/view-bar/types/interface'; import { CompanyOrderByWithRelationInput as Companies_Order_By } from '~/generated/graphql'; export const availableSorts: SortType[] = [ diff --git a/front/src/pages/opportunities/Opportunities.tsx b/front/src/pages/opportunities/Opportunities.tsx index 9dc9b4b59..59d7ffdd6 100644 --- a/front/src/pages/opportunities/Opportunities.tsx +++ b/front/src/pages/opportunities/Opportunities.tsx @@ -11,13 +11,13 @@ import { EntityBoardActionBar } from '@/ui/board/components/EntityBoardActionBar import { EntityBoardContextMenu } from '@/ui/board/components/EntityBoardContextMenu'; import { BoardOptionsContext } from '@/ui/board/contexts/BoardOptionsContext'; import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext'; -import { reduceSortsToOrderBy } from '@/ui/filter-n-sort/helpers'; -import { SelectedSortType } from '@/ui/filter-n-sort/types/interface'; import { IconTargetArrow } from '@/ui/icon'; import { PageBody } from '@/ui/layout/components/PageBody'; import { PageContainer } from '@/ui/layout/components/PageContainer'; import { PageHeader } from '@/ui/layout/components/PageHeader'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; +import { reduceSortsToOrderBy } from '@/ui/view-bar/helpers'; +import { SelectedSortType } from '@/ui/view-bar/types/interface'; import { PipelineProgressOrderByWithRelationInput, SortOrder, diff --git a/front/src/pages/opportunities/opportunities-filters.tsx b/front/src/pages/opportunities/opportunities-filters.tsx index 06749589a..acd8b9333 100644 --- a/front/src/pages/opportunities/opportunities-filters.tsx +++ b/front/src/pages/opportunities/opportunities-filters.tsx @@ -1,12 +1,12 @@ import { FilterDropdownCompanySearchSelect } from '@/companies/components/FilterDropdownCompanySearchSelect'; import { CompanyBoardRecoilScopeContext } from '@/companies/states/recoil-scope-contexts/CompanyBoardRecoilScopeContext'; -import { FilterDefinitionByEntity } from '@/ui/filter-n-sort/types/FilterDefinitionByEntity'; import { IconBuildingSkyscraper, IconCalendarEvent, IconCurrencyDollar, IconUser, } from '@/ui/icon/index'; +import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; import { PipelineProgress } from '~/generated/graphql'; import { FilterDropdownPeopleSearchSelect } from '../../modules/people/components/FilterDropdownPeopleSearchSelect'; diff --git a/front/src/pages/opportunities/opportunities-sorts.tsx b/front/src/pages/opportunities/opportunities-sorts.tsx index c2bf76f65..6d826ee19 100644 --- a/front/src/pages/opportunities/opportunities-sorts.tsx +++ b/front/src/pages/opportunities/opportunities-sorts.tsx @@ -1,5 +1,5 @@ -import { SortType } from '@/ui/filter-n-sort/types/interface'; import { IconCalendarEvent, IconCurrencyDollar } from '@/ui/icon/index'; +import { SortType } from '@/ui/view-bar/types/interface'; import { PipelineProgressOrderByWithRelationInput as PipelineProgresses_Order_By } from '~/generated/graphql'; export const opportunitiesSorts = [ diff --git a/front/src/pages/people/people-filters.tsx b/front/src/pages/people/people-filters.tsx index e12e9b58b..30c6ff72c 100644 --- a/front/src/pages/people/people-filters.tsx +++ b/front/src/pages/people/people-filters.tsx @@ -1,5 +1,4 @@ import { FilterDropdownCompanySearchSelect } from '@/companies/components/FilterDropdownCompanySearchSelect'; -import { FilterDefinitionByEntity } from '@/ui/filter-n-sort/types/FilterDefinitionByEntity'; import { IconBuildingSkyscraper, IconCalendarEvent, @@ -9,6 +8,7 @@ import { IconUser, } from '@/ui/icon/index'; import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; +import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; import { Person } from '~/generated/graphql'; export const peopleFilters: FilterDefinitionByEntity[] = [ diff --git a/front/src/pages/people/people-sorts.tsx b/front/src/pages/people/people-sorts.tsx index a195b2085..4df17db50 100644 --- a/front/src/pages/people/people-sorts.tsx +++ b/front/src/pages/people/people-sorts.tsx @@ -1,4 +1,3 @@ -import { SortType } from '@/ui/filter-n-sort/types/interface'; import { IconBuildingSkyscraper, IconCalendarEvent, @@ -7,6 +6,7 @@ import { IconPhone, IconUser, } from '@/ui/icon/index'; +import { SortType } from '@/ui/view-bar/types/interface'; import { PersonOrderByWithRelationInput as People_Order_By, SortOrder as Order_By, diff --git a/front/src/pages/tasks/Tasks.tsx b/front/src/pages/tasks/Tasks.tsx index f193afc5d..fef557203 100644 --- a/front/src/pages/tasks/Tasks.tsx +++ b/front/src/pages/tasks/Tasks.tsx @@ -5,8 +5,6 @@ import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateAct import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; import { TaskGroups } from '@/activities/tasks/components/TaskGroups'; import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext'; -import { FilterDropdownButton } from '@/ui/filter-n-sort/components/FilterDropdownButton'; -import { FiltersHotkeyScope } from '@/ui/filter-n-sort/types/FiltersHotkeyScope'; import { IconArchive, IconCheck, IconCheckbox } from '@/ui/icon/index'; import { PageAddButton } from '@/ui/layout/components/PageAddButton'; import { PageBody } from '@/ui/layout/components/PageBody'; @@ -15,6 +13,8 @@ import { PageHeader } from '@/ui/layout/components/PageHeader'; import { TabList } from '@/ui/tab/components/TabList'; import { TopBar } from '@/ui/top-bar/TopBar'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; +import { FilterDropdownButton } from '@/ui/view-bar/components/FilterDropdownButton'; +import { FiltersHotkeyScope } from '@/ui/view-bar/types/FiltersHotkeyScope'; import { ActivityType } from '~/generated/graphql'; const StyledTasksContainer = styled.div` diff --git a/front/src/pages/tasks/tasks-filters.tsx b/front/src/pages/tasks/tasks-filters.tsx index d7eb36835..e7c4fa697 100644 --- a/front/src/pages/tasks/tasks-filters.tsx +++ b/front/src/pages/tasks/tasks-filters.tsx @@ -1,6 +1,6 @@ import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext'; -import { FilterDefinitionByEntity } from '@/ui/filter-n-sort/types/FilterDefinitionByEntity'; import { IconUser } from '@/ui/icon'; +import { FilterDefinitionByEntity } from '@/ui/view-bar/types/FilterDefinitionByEntity'; import { FilterDropdownUserSearchSelect } from '@/users/components/FilterDropdownUserSearchSelect'; import { Activity } from '~/generated/graphql';