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

Fix tests

Browse Source
This commit is contained in:
Charles Bochet
2023-09-10 20:16:04 -07:00
parent e69d4bde52
commit 08727aafe5
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
front/src/modules/companies/__stories__/Board.stories.tsx
View File

@ -1,18 +1,17 @@
import { MemoryRouter } from 'react-router-dom'; import { MemoryRouter } from 'react-router-dom';
import { Meta, StoryObj } from '@storybook/react'; import { Meta, StoryObj } from '@storybook/react';
import { EntityBoard } from '@/ui/board/components/EntityBoard';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { opportunitiesBoardOptions } from '~/pages/opportunities/opportunitiesBoardOptions';
import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks'; import { graphqlMocks } from '~/testing/graphqlMocks';
import { CompanyBoard } from '../board/components/CompanyBoard';
import { HooksCompanyBoard } from '../components/HooksCompanyBoard'; import { HooksCompanyBoard } from '../components/HooksCompanyBoard';
import { CompanyBoardRecoilScopeContext } from '../states/recoil-scope-contexts/CompanyBoardRecoilScopeContext'; import { CompanyBoardRecoilScopeContext } from '../states/recoil-scope-contexts/CompanyBoardRecoilScopeContext';
const meta: Meta<typeof EntityBoard> = { const meta: Meta<typeof CompanyBoard> = {
title: 'Modules/Companies/Board', title: 'Modules/Companies/Board',
component: EntityBoard, component: CompanyBoard,
decorators: [ decorators: [
(Story) => ( (Story) => (
<RecoilScope SpecificContext={CompanyBoardRecoilScopeContext}> <RecoilScope SpecificContext={CompanyBoardRecoilScopeContext}>
@ -30,10 +29,6 @@ const meta: Meta<typeof EntityBoard> = {
}; };
export default meta; export default meta;
type Story = StoryObj<typeof EntityBoard>; type Story = StoryObj<typeof CompanyBoard>;
export const OneColumnBoard: Story = { export const OneColumnBoard: Story = {};
render: (args) => (
<EntityBoard {...args} boardOptions={opportunitiesBoardOptions} />
),
};

15
front/src/modules/companies/board/components/CompanyBoard.tsx
View File

@ -5,19 +5,20 @@ import {
import { EntityBoardActionBar } from '@/ui/board/components/EntityBoardActionBar'; import { EntityBoardActionBar } from '@/ui/board/components/EntityBoardActionBar';
import { EntityBoardContextMenu } from '@/ui/board/components/EntityBoardContextMenu'; import { EntityBoardContextMenu } from '@/ui/board/components/EntityBoardContextMenu';
import { useBoardViews } from '@/views/hooks/useBoardViews'; import { useBoardViews } from '@/views/hooks/useBoardViews';
import { opportunitiesBoardOptions } from '~/pages/opportunities/opportunitiesBoardOptions';
import { HooksCompanyBoard } from '../../components/HooksCompanyBoard'; import { HooksCompanyBoard } from '../../components/HooksCompanyBoard';
import { CompanyBoardRecoilScopeContext } from '../../states/recoil-scope-contexts/CompanyBoardRecoilScopeContext'; import { CompanyBoardRecoilScopeContext } from '../../states/recoil-scope-contexts/CompanyBoardRecoilScopeContext';
type OwnProps = Pick< type CompanyBoardProps = Pick<
EntityBoardProps, EntityBoardProps,
'boardOptions' | 'onColumnAdd' | 'onColumnDelete' | 'onEditColumnTitle' 'onColumnAdd' | 'onColumnDelete' | 'onEditColumnTitle'
>; >;
export const CompanyBoard = ({ boardOptions, ...props }: OwnProps) => { export const CompanyBoard = ({ ...props }: CompanyBoardProps) => {
const { handleViewsChange, handleViewSubmit } = useBoardViews({ const { handleViewsChange, handleViewSubmit } = useBoardViews({
availableFilters: boardOptions.filters, availableFilters: opportunitiesBoardOptions.filters,
availableSorts: boardOptions.sorts, availableSorts: opportunitiesBoardOptions.sorts,
objectId: 'company', objectId: 'company',
scopeContext: CompanyBoardRecoilScopeContext, scopeContext: CompanyBoardRecoilScopeContext,
}); });
@ -26,12 +27,12 @@ export const CompanyBoard = ({ boardOptions, ...props }: OwnProps) => {
<> <>
<HooksCompanyBoard /> <HooksCompanyBoard />
<EntityBoard <EntityBoard
boardOptions={boardOptions} boardOptions={opportunitiesBoardOptions}
defaultViewName="All opportunities" defaultViewName="All opportunities"
onViewsChange={handleViewsChange} onViewsChange={handleViewsChange}
onViewSubmit={handleViewSubmit} onViewSubmit={handleViewSubmit}
scopeContext={CompanyBoardRecoilScopeContext} scopeContext={CompanyBoardRecoilScopeContext}
{...props} onEditColumnTitle={props.onEditColumnTitle}
/> />
<EntityBoardActionBar /> <EntityBoardActionBar />
<EntityBoardContextMenu /> <EntityBoardContextMenu />

1
front/src/pages/opportunities/Opportunities.tsx
View File

@ -62,7 +62,6 @@ export function Opportunities() {
SpecificContext={CompanyBoardRecoilScopeContext} SpecificContext={CompanyBoardRecoilScopeContext}
> >
<CompanyBoard <CompanyBoard
boardOptions={opportunitiesBoardOptions}
onColumnAdd={handlePipelineStageAdd} onColumnAdd={handlePipelineStageAdd}
onColumnDelete={handlePipelineStageDelete} onColumnDelete={handlePipelineStageDelete}
onEditColumnTitle={handleEditColumnTitle} onEditColumnTitle={handleEditColumnTitle}