admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix hotkey scope on task assignee (#1530)

Browse Source
This commit is contained in:
Charles Bochet
2023-09-10 16:06:15 -07:00
committed by GitHub
parent 494308b379
commit 2e798ef2ee
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx
View File

@ -4,14 +4,13 @@ import { IconComponent } from '@/ui/icon/types/IconComponent';
import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
import { availableFiltersScopedState } from '../states/availableFiltersScopedState'; import { availableFiltersScopedState } from '../states/availableFiltersScopedState';
import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope';
import { MultipleFiltersDropdownButton } from './MultipleFiltersDropdownButton'; import { MultipleFiltersDropdownButton } from './MultipleFiltersDropdownButton';
import { SingleEntityFilterDropdownButton } from './SingleEntityFilterDropdownButton'; import { SingleEntityFilterDropdownButton } from './SingleEntityFilterDropdownButton';
type FilterDropdownButtonProps = { type FilterDropdownButtonProps = {
context: Context<string | null>; context: Context<string | null>;
hotkeyScope: FiltersHotkeyScope; hotkeyScope: string;
isPrimaryButton?: boolean; isPrimaryButton?: boolean;
Icon?: IconComponent; Icon?: IconComponent;
color?: string; color?: string;

3
front/src/modules/ui/view-bar/components/MultipleFiltersDropdownButton.tsx
View File

@ -11,7 +11,6 @@ import { isFilterDropdownOperandSelectUnfoldedScopedState } from '@/ui/view-bar/
import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selectedOperandInDropdownScopedState'; import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selectedOperandInDropdownScopedState';
import { isViewBarExpandedScopedState } from '../states/isViewBarExpandedScopedState'; import { isViewBarExpandedScopedState } from '../states/isViewBarExpandedScopedState';
import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope';
import DropdownButton from './DropdownButton'; import DropdownButton from './DropdownButton';
import { FilterDropdownDateSearchInput } from './FilterDropdownDateSearchInput'; import { FilterDropdownDateSearchInput } from './FilterDropdownDateSearchInput';
@ -25,7 +24,7 @@ import { FilterDropdownTextSearchInput } from './FilterDropdownTextSearchInput';
type MultipleFiltersDropdownButtonProps = { type MultipleFiltersDropdownButtonProps = {
context: Context<string | null>; context: Context<string | null>;
hotkeyScope: FiltersHotkeyScope; hotkeyScope: string;
isPrimaryButton?: boolean; isPrimaryButton?: boolean;
Icon?: IconComponent; Icon?: IconComponent;
color?: string; color?: string;

3
front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx
View File

@ -13,7 +13,6 @@ import { selectedOperandInDropdownScopedState } from '@/ui/view-bar/states/selec
import { StyledHeaderDropdownButton } from '../../dropdown/components/StyledHeaderDropdownButton'; import { StyledHeaderDropdownButton } from '../../dropdown/components/StyledHeaderDropdownButton';
import { availableFiltersScopedState } from '../states/availableFiltersScopedState'; import { availableFiltersScopedState } from '../states/availableFiltersScopedState';
import { filtersScopedState } from '../states/filtersScopedState'; import { filtersScopedState } from '../states/filtersScopedState';
import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope';
import { getOperandsForFilterType } from '../utils/getOperandsForFilterType'; import { getOperandsForFilterType } from '../utils/getOperandsForFilterType';
import { DropdownMenuContainer } from './DropdownMenuContainer'; import { DropdownMenuContainer } from './DropdownMenuContainer';
@ -32,7 +31,7 @@ export function SingleEntityFilterDropdownButton({
hotkeyScope, hotkeyScope,
}: { }: {
context: Context<string | null>; context: Context<string | null>;
hotkeyScope: FiltersHotkeyScope; hotkeyScope: string;
}) { }) {
const theme = useTheme(); const theme = useTheme();

4
front/src/pages/tasks/Tasks.tsx
View File

@ -5,6 +5,7 @@ import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contex
import { TaskGroups } from '@/activities/tasks/components/TaskGroups'; import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext'; import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext';
import { IconArchive, IconCheck, IconCheckbox } from '@/ui/icon/index'; 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 { PageAddButton } from '@/ui/layout/components/PageAddButton';
import { PageBody } from '@/ui/layout/components/PageBody'; import { PageBody } from '@/ui/layout/components/PageBody';
import { PageContainer } from '@/ui/layout/components/PageContainer'; 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 { TopBar } from '@/ui/top-bar/TopBar';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { FilterDropdownButton } from '@/ui/view-bar/components/FilterDropdownButton'; import { FilterDropdownButton } from '@/ui/view-bar/components/FilterDropdownButton';
import { FiltersHotkeyScope } from '@/ui/view-bar/types/FiltersHotkeyScope';
import { ActivityType } from '~/generated/graphql'; import { ActivityType } from '~/generated/graphql';
const StyledTasksContainer = styled.div` const StyledTasksContainer = styled.div`
@ -69,7 +69,7 @@ export function Tasks() {
<FilterDropdownButton <FilterDropdownButton
key="tasks-filter-dropdown-button" key="tasks-filter-dropdown-button"
context={TasksRecoilScopeContext} context={TasksRecoilScopeContext}
hotkeyScope={FiltersHotkeyScope.FilterDropdownButton} hotkeyScope={RelationPickerHotkeyScope.RelationPicker}
/> />
} }
/> />