From 2e798ef2eebbf5baacb65ff5b1abca69291bff1a Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Sun, 10 Sep 2023 16:06:15 -0700 Subject: [PATCH] Fix hotkey scope on task assignee (#1530) --- .../modules/ui/view-bar/components/FilterDropdownButton.tsx | 3 +-- .../ui/view-bar/components/MultipleFiltersDropdownButton.tsx | 3 +-- .../view-bar/components/SingleEntityFilterDropdownButton.tsx | 3 +-- front/src/pages/tasks/Tasks.tsx | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx b/front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx index b187d74f6..f1c8d415a 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx +++ b/front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx @@ -4,14 +4,13 @@ import { IconComponent } from '@/ui/icon/types/IconComponent'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { availableFiltersScopedState } from '../states/availableFiltersScopedState'; -import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope'; import { MultipleFiltersDropdownButton } from './MultipleFiltersDropdownButton'; import { SingleEntityFilterDropdownButton } from './SingleEntityFilterDropdownButton'; type FilterDropdownButtonProps = { context: Context; - hotkeyScope: FiltersHotkeyScope; + hotkeyScope: string; isPrimaryButton?: boolean; Icon?: IconComponent; color?: string; diff --git a/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownButton.tsx b/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownButton.tsx index cb3434250..f66b1bafc 100644 --- a/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownButton.tsx +++ b/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownButton.tsx @@ -11,7 +11,6 @@ import { isFilterDropdownOperandSelectUnfoldedScopedState } from '@/ui/view-bar/ import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selectedOperandInDropdownScopedState'; import { isViewBarExpandedScopedState } from '../states/isViewBarExpandedScopedState'; -import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope'; import DropdownButton from './DropdownButton'; import { FilterDropdownDateSearchInput } from './FilterDropdownDateSearchInput'; @@ -25,7 +24,7 @@ import { FilterDropdownTextSearchInput } from './FilterDropdownTextSearchInput'; type MultipleFiltersDropdownButtonProps = { context: Context; - hotkeyScope: FiltersHotkeyScope; + hotkeyScope: string; isPrimaryButton?: boolean; Icon?: IconComponent; color?: string; diff --git a/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx b/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx index cd77454b2..7461ae72c 100644 --- a/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx +++ b/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx @@ -13,7 +13,6 @@ import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selec import { StyledHeaderDropdownButton } from '../../dropdown/components/StyledHeaderDropdownButton'; import { availableFiltersScopedState } from '../states/availableFiltersScopedState'; import { filtersScopedState } from '../states/filtersScopedState'; -import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope'; import { getOperandsForFilterType } from '../utils/getOperandsForFilterType'; import { DropdownMenuContainer } from './DropdownMenuContainer'; @@ -32,7 +31,7 @@ export function SingleEntityFilterDropdownButton({ hotkeyScope, }: { context: Context; - hotkeyScope: FiltersHotkeyScope; + hotkeyScope: string; }) { const theme = useTheme(); diff --git a/front/src/pages/tasks/Tasks.tsx b/front/src/pages/tasks/Tasks.tsx index 1115f03d7..6d534bc12 100644 --- a/front/src/pages/tasks/Tasks.tsx +++ b/front/src/pages/tasks/Tasks.tsx @@ -5,6 +5,7 @@ import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contex import { TaskGroups } from '@/activities/tasks/components/TaskGroups'; import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext'; import { IconArchive, IconCheck, IconCheckbox } from '@/ui/icon/index'; +import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { PageAddButton } from '@/ui/layout/components/PageAddButton'; import { PageBody } from '@/ui/layout/components/PageBody'; import { PageContainer } from '@/ui/layout/components/PageContainer'; @@ -13,7 +14,6 @@ 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` @@ -69,7 +69,7 @@ export function Tasks() { } />