From 45687f5100de9f0f3f063768718a66108939ede4 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Mon, 14 Aug 2023 15:43:55 -0700 Subject: [PATCH] Fix conficts --- front/src/modules/people/hooks/useActionBarEntries.tsx | 2 +- front/src/modules/people/hooks/useContextMenuEntries.tsx | 2 +- front/src/modules/people/table/components/PeopleTable.tsx | 4 ++-- .../action-bar/components/__stories__/ActionBar.stories.tsx | 4 ++-- .../components/__stories__/ContextMenu.stories.tsx | 4 ++-- .../table/context-menu/components/EntityTableContextMenu.tsx | 2 +- front/src/pages/people/People.tsx | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/front/src/modules/people/hooks/useActionBarEntries.tsx b/front/src/modules/people/hooks/useActionBarEntries.tsx index 6409ad8c4..d3bf44c8f 100644 --- a/front/src/modules/people/hooks/useActionBarEntries.tsx +++ b/front/src/modules/people/hooks/useActionBarEntries.tsx @@ -7,7 +7,7 @@ import { ActionBarEntry } from '@/ui/action-bar/components/ActionBarEntry'; import { actionBarEntriesState } from '@/ui/action-bar/states/ActionBarEntriesState'; import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; -import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector'; +import { selectedRowIdsSelector } from '@/ui/table/states/selectors/selectedRowIdsSelector'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState'; import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql'; diff --git a/front/src/modules/people/hooks/useContextMenuEntries.tsx b/front/src/modules/people/hooks/useContextMenuEntries.tsx index 4171cfc2a..9e26db4cf 100644 --- a/front/src/modules/people/hooks/useContextMenuEntries.tsx +++ b/front/src/modules/people/hooks/useContextMenuEntries.tsx @@ -7,7 +7,7 @@ import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargeta import { ContextMenuEntry } from '@/ui/context-menu/components/ContextMenuEntry'; import { contextMenuEntriesState } from '@/ui/context-menu/states/ContextMenuEntriesState'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; -import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector'; +import { selectedRowIdsSelector } from '@/ui/table/states/selectors/selectedRowIdsSelector'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState'; import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql'; diff --git a/front/src/modules/people/table/components/PeopleTable.tsx b/front/src/modules/people/table/components/PeopleTable.tsx index 96db69c6e..db3bf4bf9 100644 --- a/front/src/modules/people/table/components/PeopleTable.tsx +++ b/front/src/modules/people/table/components/PeopleTable.tsx @@ -1,9 +1,9 @@ import { useMemo } from 'react'; import { useRecoilValue } from 'recoil'; -import { useActionBarEntries } from '@/companies/hooks/useActionBarEntries'; -import { useContextMenuEntries } from '@/companies/hooks/useContextMenuEntries'; import { peopleViewFields } from '@/people/constants/peopleViewFields'; +import { useActionBarEntries } from '@/people/hooks/useActionBarEntries'; +import { useContextMenuEntries } from '@/people/hooks/useContextMenuEntries'; import { filtersScopedState } from '@/ui/filter-n-sort/states/filtersScopedState'; import { sortsOrderByScopedState } from '@/ui/filter-n-sort/states/sortScopedState'; import { turnFilterIntoWhereClause } from '@/ui/filter-n-sort/utils/turnFilterIntoWhereClause'; diff --git a/front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx b/front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx index 83e6e81d4..8ce5f2b1f 100644 --- a/front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx +++ b/front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx @@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil'; import { useActionBarEntries } from '@/companies/hooks/useActionBarEntries'; import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode'; -import { TableContext } from '@/ui/table/states/TableContext'; +import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; @@ -24,7 +24,7 @@ const meta: Meta = { component: FilledActionBar, decorators: [ (Story) => ( - + diff --git a/front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx b/front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx index 0fa1c6b6f..8146b9150 100644 --- a/front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx +++ b/front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx @@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil'; import { useContextMenuEntries } from '@/companies/hooks/useContextMenuEntries'; import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode'; -import { TableContext } from '@/ui/table/states/TableContext'; +import { TableRecoilScopeContext } from '@/ui/table/states/recoil-scope-contexts/TableRecoilScopeContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; @@ -30,7 +30,7 @@ const meta: Meta = { component: FilledContextMenu, decorators: [ (Story) => ( - + diff --git a/front/src/modules/ui/table/context-menu/components/EntityTableContextMenu.tsx b/front/src/modules/ui/table/context-menu/components/EntityTableContextMenu.tsx index 10bbaf088..bd49c6cb8 100644 --- a/front/src/modules/ui/table/context-menu/components/EntityTableContextMenu.tsx +++ b/front/src/modules/ui/table/context-menu/components/EntityTableContextMenu.tsx @@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil'; import { ContextMenu } from '@/ui/context-menu/components/ContextMenu'; -import { selectedRowIdsSelector } from '../../states/selectedRowIdsSelector'; +import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector'; export function EntityTableContextMenu() { const selectedRowIds = useRecoilValue(selectedRowIdsSelector); diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx index f61a5a984..6f2845285 100644 --- a/front/src/pages/people/People.tsx +++ b/front/src/pages/people/People.tsx @@ -65,8 +65,8 @@ export function People() { - - + + );