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

Fix conficts

Browse Source
This commit is contained in:
Charles Bochet
2023-08-14 15:43:55 -07:00
parent 43b0945028
commit 45687f5100
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/modules/people/hooks/useActionBarEntries.tsx
View File

@ -7,7 +7,7 @@ import { ActionBarEntry } from '@/ui/action-bar/components/ActionBarEntry';
import { actionBarEntriesState } from '@/ui/action-bar/states/ActionBarEntriesState'; import { actionBarEntriesState } from '@/ui/action-bar/states/ActionBarEntriesState';
import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon'; import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon';
import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; 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 { tableRowIdsState } from '@/ui/table/states/tableRowIdsState';
import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql'; import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql';

2
front/src/modules/people/hooks/useContextMenuEntries.tsx
View File

@ -7,7 +7,7 @@ import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargeta
import { ContextMenuEntry } from '@/ui/context-menu/components/ContextMenuEntry'; import { ContextMenuEntry } from '@/ui/context-menu/components/ContextMenuEntry';
import { contextMenuEntriesState } from '@/ui/context-menu/states/ContextMenuEntriesState'; import { contextMenuEntriesState } from '@/ui/context-menu/states/ContextMenuEntriesState';
import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; 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 { tableRowIdsState } from '@/ui/table/states/tableRowIdsState';
import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql'; import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql';

4
front/src/modules/people/table/components/PeopleTable.tsx
View File

@ -1,9 +1,9 @@
import { useMemo } from 'react'; import { useMemo } from 'react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { useActionBarEntries } from '@/companies/hooks/useActionBarEntries';
import { useContextMenuEntries } from '@/companies/hooks/useContextMenuEntries';
import { peopleViewFields } from '@/people/constants/peopleViewFields'; 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 { filtersScopedState } from '@/ui/filter-n-sort/states/filtersScopedState';
import { sortsOrderByScopedState } from '@/ui/filter-n-sort/states/sortScopedState'; import { sortsOrderByScopedState } from '@/ui/filter-n-sort/states/sortScopedState';
import { turnFilterIntoWhereClause } from '@/ui/filter-n-sort/utils/turnFilterIntoWhereClause'; import { turnFilterIntoWhereClause } from '@/ui/filter-n-sort/utils/turnFilterIntoWhereClause';

4
front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx
View File

@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil';
import { useActionBarEntries } from '@/companies/hooks/useActionBarEntries'; import { useActionBarEntries } from '@/companies/hooks/useActionBarEntries';
import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode'; 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 { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
@ -24,7 +24,7 @@ const meta: Meta<typeof ActionBar> = {
component: FilledActionBar, component: FilledActionBar,
decorators: [ decorators: [
(Story) => ( (Story) => (
<RecoilScope SpecificContext={TableContext}> <RecoilScope SpecificContext={TableRecoilScopeContext}>
<CompanyTableMockMode></CompanyTableMockMode> <CompanyTableMockMode></CompanyTableMockMode>
<MemoryRouter> <MemoryRouter>
<Story /> <Story />

4
front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx
View File

@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil';
import { useContextMenuEntries } from '@/companies/hooks/useContextMenuEntries'; import { useContextMenuEntries } from '@/companies/hooks/useContextMenuEntries';
import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode'; 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 { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
@ -30,7 +30,7 @@ const meta: Meta<typeof ContextMenu> = {
component: FilledContextMenu, component: FilledContextMenu,
decorators: [ decorators: [
(Story) => ( (Story) => (
<RecoilScope SpecificContext={TableContext}> <RecoilScope SpecificContext={TableRecoilScopeContext}>
<CompanyTableMockMode></CompanyTableMockMode> <CompanyTableMockMode></CompanyTableMockMode>
<MemoryRouter> <MemoryRouter>
<Story /> <Story />

2
front/src/modules/ui/table/context-menu/components/EntityTableContextMenu.tsx
View File

@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil';
import { ContextMenu } from '@/ui/context-menu/components/ContextMenu'; import { ContextMenu } from '@/ui/context-menu/components/ContextMenu';
import { selectedRowIdsSelector } from '../../states/selectedRowIdsSelector'; import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector';
export function EntityTableContextMenu() { export function EntityTableContextMenu() {
const selectedRowIds = useRecoilValue(selectedRowIdsSelector); const selectedRowIds = useRecoilValue(selectedRowIdsSelector);

4
front/src/pages/people/People.tsx
View File

@ -65,8 +65,8 @@ export function People() {
<StyledTableContainer> <StyledTableContainer>
<PeopleTable /> <PeopleTable />
</StyledTableContainer> </StyledTableContainer>
<EntityTableActionBar></EntityTableActionBar> <EntityTableActionBar />
<EntityTableContextMenu></EntityTableContextMenu> <EntityTableContextMenu />
</WithTopBarContainer> </WithTopBarContainer>
</RecoilScope> </RecoilScope>
); );