From de6b49f78e79da57ea788902fe18a484582da97c Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Wed, 19 Jul 2023 13:30:52 +0100 Subject: [PATCH] chore: co locate child market selector components --- .../market-selector}/asset-dropdown.spec.tsx | 30 +------------------ .../market-selector}/asset-dropdown.tsx | 0 .../market-selector/market-selector.spec.tsx | 2 +- .../market-selector/market-selector.tsx | 15 ++++------ .../market-selector}/product-selector.tsx | 0 .../market-selector}/sort-dropdown.tsx | 0 .../use-market-selector-list.spec.tsx | 2 +- .../use-market-selector-list.ts | 0 8 files changed, 9 insertions(+), 40 deletions(-) rename apps/trading/{client-pages/market => components/market-selector}/asset-dropdown.spec.tsx (65%) rename apps/trading/{client-pages/market => components/market-selector}/asset-dropdown.tsx (100%) rename apps/trading/{client-pages/market => components/market-selector}/product-selector.tsx (100%) rename apps/trading/{client-pages/market => components/market-selector}/sort-dropdown.tsx (100%) rename apps/trading/{client-pages/market => components/market-selector}/use-market-selector-list.spec.tsx (99%) rename apps/trading/{client-pages/market => components/market-selector}/use-market-selector-list.ts (100%) diff --git a/apps/trading/client-pages/market/asset-dropdown.spec.tsx b/apps/trading/components/market-selector/asset-dropdown.spec.tsx similarity index 65% rename from apps/trading/client-pages/market/asset-dropdown.spec.tsx rename to apps/trading/components/market-selector/asset-dropdown.spec.tsx index a3a8ccefa..28872e64d 100644 --- a/apps/trading/client-pages/market/asset-dropdown.spec.tsx +++ b/apps/trading/components/market-selector/asset-dropdown.spec.tsx @@ -19,7 +19,6 @@ describe('AssetDropdown', () => { checkedAssets={[]} assets={assets} onSelect={mockOnSelect} - onReset={jest.fn()} /> ); await userEvent.click(screen.getByRole('button')); @@ -39,7 +38,6 @@ describe('AssetDropdown', () => { checkedAssets={[assets[0].id]} assets={assets} onSelect={mockOnSelect} - onReset={jest.fn()} /> ); await userEvent.click(screen.getByRole('button')); @@ -48,35 +46,9 @@ describe('AssetDropdown', () => { expect(mockOnSelect).toHaveBeenCalledWith(assets[0].id, false); }); - it('can be reset clearing all assets', async () => { - const mockOnSelect = jest.fn(); - const mockOnReset = jest.fn(); - render( - a.id)} - assets={assets} - onSelect={mockOnSelect} - onReset={mockOnReset} - /> - ); - await userEvent.click(screen.getByRole('button')); - const items = screen.getAllByRole('menuitemcheckbox'); - // all should be checked - items.forEach((item) => { - expect(item).toBeChecked(); - }); - await userEvent.click(screen.getByText('Reset')); - expect(mockOnReset).toHaveBeenCalled(); - }); - it('doesnt render if no assets provided', async () => { const { container } = render( - + ); expect(container).toBeEmptyDOMElement(); }); diff --git a/apps/trading/client-pages/market/asset-dropdown.tsx b/apps/trading/components/market-selector/asset-dropdown.tsx similarity index 100% rename from apps/trading/client-pages/market/asset-dropdown.tsx rename to apps/trading/components/market-selector/asset-dropdown.tsx diff --git a/apps/trading/components/market-selector/market-selector.spec.tsx b/apps/trading/components/market-selector/market-selector.spec.tsx index 86d938dae..7b72bc346 100644 --- a/apps/trading/components/market-selector/market-selector.spec.tsx +++ b/apps/trading/components/market-selector/market-selector.spec.tsx @@ -240,7 +240,7 @@ describe('MarketSelector', () => { await userEvent.click(screen.getByTestId('sort-trigger')); const options = screen.getAllByTestId(/sort-item/); - expect(options.map((o) => o.textContent)).toEqual( + expect(options.map((o) => o.textContent?.trim())).toEqual( Object.entries(Sort) .filter(([key]) => key !== Sort.None) .map(([key]) => SortTypeMapping[key as SortType]) diff --git a/apps/trading/components/market-selector/market-selector.tsx b/apps/trading/components/market-selector/market-selector.tsx index 80804a984..ec891d64e 100644 --- a/apps/trading/components/market-selector/market-selector.tsx +++ b/apps/trading/components/market-selector/market-selector.tsx @@ -10,15 +10,12 @@ import { import type { CSSProperties } from 'react'; import { useCallback, useState, useMemo } from 'react'; import { FixedSizeList } from 'react-window'; -import { useMarketSelectorList } from '../../client-pages/market/use-market-selector-list'; -import type { ProductType } from '../../client-pages/market/product-selector'; -import { - Product, - ProductSelector, -} from '../../client-pages/market/product-selector'; -import { AssetDropdown } from '../../client-pages/market/asset-dropdown'; -import type { SortType } from '../../client-pages/market/sort-dropdown'; -import { Sort, SortDropdown } from '../../client-pages/market/sort-dropdown'; +import { useMarketSelectorList } from './use-market-selector-list'; +import type { ProductType } from './product-selector'; +import { Product, ProductSelector } from './product-selector'; +import { AssetDropdown } from './asset-dropdown'; +import type { SortType } from './sort-dropdown'; +import { Sort, SortDropdown } from './sort-dropdown'; import { MarketSelectorItem } from './market-selector-item'; import classNames from 'classnames'; diff --git a/apps/trading/client-pages/market/product-selector.tsx b/apps/trading/components/market-selector/product-selector.tsx similarity index 100% rename from apps/trading/client-pages/market/product-selector.tsx rename to apps/trading/components/market-selector/product-selector.tsx diff --git a/apps/trading/client-pages/market/sort-dropdown.tsx b/apps/trading/components/market-selector/sort-dropdown.tsx similarity index 100% rename from apps/trading/client-pages/market/sort-dropdown.tsx rename to apps/trading/components/market-selector/sort-dropdown.tsx diff --git a/apps/trading/client-pages/market/use-market-selector-list.spec.tsx b/apps/trading/components/market-selector/use-market-selector-list.spec.tsx similarity index 99% rename from apps/trading/client-pages/market/use-market-selector-list.spec.tsx rename to apps/trading/components/market-selector/use-market-selector-list.spec.tsx index 241a485c7..4065a7471 100644 --- a/apps/trading/client-pages/market/use-market-selector-list.spec.tsx +++ b/apps/trading/components/market-selector/use-market-selector-list.spec.tsx @@ -4,7 +4,7 @@ import { isMarketActive, useMarketSelectorList, } from './use-market-selector-list'; -import { Product } from './product-selector'; +import { Product } from '../../components/market-selector/product-selector'; import { Sort } from './sort-dropdown'; import { createMarketFragment } from '@vegaprotocol/mock'; import { MarketState } from '@vegaprotocol/types'; diff --git a/apps/trading/client-pages/market/use-market-selector-list.ts b/apps/trading/components/market-selector/use-market-selector-list.ts similarity index 100% rename from apps/trading/client-pages/market/use-market-selector-list.ts rename to apps/trading/components/market-selector/use-market-selector-list.ts