From 8fca252ded4478d142ef1d1730605917c1aa09c7 Mon Sep 17 00:00:00 2001 From: Adhitya Mamallan Date: Tue, 3 Sep 2024 11:52:31 +0200 Subject: [PATCH] Move Domain Workflows code to separate view (#641) * Domain workflows view * Push fixed tests * Move DomainWorkflows to root of view --- .../config/domain-page-tabs-content.config.ts | 5 ++- .../config/domain-page-tabs-error.config.ts | 3 +- .../domain-page-workflows-filters.config.ts | 40 ------------------- .../domain-page-workflows-filters.tsx | 23 ----------- .../domain-page-workflows.tsx | 21 ---------- .../domain-workflows-query-params.ts} | 6 +-- .../config/domain-workflows-filters.config.ts | 40 +++++++++++++++++++ .../domain-workflows-query-params.config.ts} | 4 +- .../config/domain-workflows-table.config.ts} | 7 ++-- .../domain-workflows-filters-dates.test.tsx} | 22 +++++----- ...main-workflows-filters-dates.constants.ts} | 0 .../domain-workflows-filters-dates.styles.ts} | 0 .../domain-workflows-filters-dates.tsx} | 10 ++--- .../domain-workflows-filters-dates.types.ts} | 2 +- .../domain-workflows-filters-status.test.tsx} | 14 +++---- .../domain-workflows-filters-status-types.ts} | 2 +- ...ain-workflows-filters-status.constants.ts} | 0 ...domain-workflows-filters-status.styles.ts} | 0 .../domain-workflows-filters-status.tsx} | 10 ++--- .../domain-workflows-filters.styles.ts} | 0 .../domain-workflows-filters.tsx | 23 +++++++++++ ...main-workflows-table-end-message.test.tsx} | 10 ++--- ...ain-workflows-table-end-message.styles.ts} | 0 .../domain-workflows-table-end-message.tsx} | 6 +-- ...main-workflows-table-end-message.types.ts} | 0 .../domain-workflows-table.test.tsx} | 14 +++---- .../domain-workflows-table.constants.ts} | 0 .../domain-workflows-table.tsx} | 18 ++++----- .../domain-workflows-table.types.ts} | 0 .../domain-workflows/domain-workflows.tsx | 18 +++++++++ .../get-domain-workflows-error-config.ts | 2 +- .../__tests__/get-next-sort-order.test.ts | 0 .../__tests__/parse-date-query-param.test.ts | 0 .../get-domain-workflows-error-config.ts | 5 ++- .../helpers/get-next-sort-order.ts | 0 .../helpers/parse-date-query-param.ts | 0 36 files changed, 151 insertions(+), 154 deletions(-) delete mode 100644 src/views/domain-page/config/domain-page-workflows-filters.config.ts delete mode 100644 src/views/domain-page/domain-page-workflows-filters/domain-page-workflows-filters.tsx delete mode 100644 src/views/domain-page/domain-page-workflows/domain-page-workflows.tsx rename src/views/{domain-page/__fixtures__/domain-page-query-params.ts => domain-workflows/__fixtures__/domain-workflows-query-params.ts} (66%) create mode 100644 src/views/domain-workflows/config/domain-workflows-filters.config.ts rename src/views/{domain-page/config/domain-page-query-params.config.ts => domain-workflows/config/domain-workflows-query-params.config.ts} (93%) rename src/views/{domain-page/config/domain-page-workflows-table.config.ts => domain-workflows/config/domain-workflows-table.config.ts} (88%) rename src/views/{domain-page/domain-page-workflows-filters-dates/__tests__/domain-page-workflows-filters-dates.test.tsx => domain-workflows/domain-workflows-filters-dates/__tests__/domain-workflows-filters-dates.test.tsx} (82%) rename src/views/{domain-page/domain-page-workflows-filters-dates/domain-page-workflows-filters-dates.constants.ts => domain-workflows/domain-workflows-filters-dates/domain-workflows-filters-dates.constants.ts} (100%) rename src/views/{domain-page/domain-page-workflows-filters-dates/domain-page-workflows-filters-dates.styles.ts => domain-workflows/domain-workflows-filters-dates/domain-workflows-filters-dates.styles.ts} (100%) rename src/views/{domain-page/domain-page-workflows-filters-dates/domain-page-workflows-filters-dates.tsx => domain-workflows/domain-workflows-filters-dates/domain-workflows-filters-dates.tsx} (82%) rename src/views/{domain-page/domain-page-workflows-filters-dates/domain-page-workflow-filters-dates.types.ts => domain-workflows/domain-workflows-filters-dates/domain-workflows-filters-dates.types.ts} (58%) rename src/views/{domain-page/domain-page-workflows-filters-status/__tests__/domain-page-workflows-filters-status.test.tsx => domain-workflows/domain-workflows-filters-status/__tests__/domain-workflows-filters-status.test.tsx} (78%) rename src/views/{domain-page/domain-page-workflows-filters-status/domain-page-workflow-filters-status-types.ts => domain-workflows/domain-workflows-filters-status/domain-workflows-filters-status-types.ts} (72%) rename src/views/{domain-page/domain-page-workflows-filters-status/domain-page-workflows-filters-status.constants.ts => domain-workflows/domain-workflows-filters-status/domain-workflows-filters-status.constants.ts} (100%) rename src/views/{domain-page/domain-page-workflows-filters-status/domain-page-workflows-filters-status.styles.ts => domain-workflows/domain-workflows-filters-status/domain-workflows-filters-status.styles.ts} (100%) rename src/views/{domain-page/domain-page-workflows-filters-status/domain-page-workflows-filters-status.tsx => domain-workflows/domain-workflows-filters-status/domain-workflows-filters-status.tsx} (71%) rename src/views/{domain-page/domain-page-workflows-filters/domain-page-workflows-filters.styles.ts => domain-workflows/domain-workflows-filters/domain-workflows-filters.styles.ts} (100%) create mode 100644 src/views/domain-workflows/domain-workflows-filters/domain-workflows-filters.tsx rename src/views/{domain-page/domain-page-workflows-table-end-message/__tests__/domain-page-workflows-table-end-message.test.tsx => domain-workflows/domain-workflows-table-end-message/__tests__/domain-workflows-table-end-message.test.tsx} (85%) rename src/views/{domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.styles.ts => domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.styles.ts} (100%) rename src/views/{domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.tsx => domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.tsx} (82%) rename src/views/{domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.types.ts => domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.types.ts} (100%) rename src/views/{domain-page/domain-page-workflows-table/__tests__/domain-page-workflows-table.test.tsx => domain-workflows/domain-workflows-table/__tests__/domain-workflows-table.test.tsx} (88%) rename src/views/{domain-page/domain-page-workflows-table/domain-page-workflows-table.constants.ts => domain-workflows/domain-workflows-table/domain-workflows-table.constants.ts} (100%) rename src/views/{domain-page/domain-page-workflows-table/domain-page-workflows-table.tsx => domain-workflows/domain-workflows-table/domain-workflows-table.tsx} (82%) rename src/views/{domain-page/domain-page-workflows-table/domain-page-workflows-table.types.ts => domain-workflows/domain-workflows-table/domain-workflows-table.types.ts} (100%) create mode 100644 src/views/domain-workflows/domain-workflows.tsx rename src/views/{domain-page => domain-workflows}/helpers/__tests__/get-domain-workflows-error-config.ts (87%) rename src/views/{domain-page => domain-workflows}/helpers/__tests__/get-next-sort-order.test.ts (100%) rename src/views/{domain-page => domain-workflows}/helpers/__tests__/parse-date-query-param.test.ts (100%) rename src/views/{domain-page => domain-workflows}/helpers/get-domain-workflows-error-config.ts (71%) rename src/views/{domain-page => domain-workflows}/helpers/get-next-sort-order.ts (100%) rename src/views/{domain-page => domain-workflows}/helpers/parse-date-query-param.ts (100%) diff --git a/src/views/domain-page/config/domain-page-tabs-content.config.ts b/src/views/domain-page/config/domain-page-tabs-content.config.ts index e42a5ca89..1faebd2f3 100644 --- a/src/views/domain-page/config/domain-page-tabs-content.config.ts +++ b/src/views/domain-page/config/domain-page-tabs-content.config.ts @@ -1,10 +1,11 @@ +import DomainWorkflows from '@/views/domain-workflows/domain-workflows'; + import type { DomainPageTabsContentConfig } from '../domain-page-content/domain-page-content.types'; import DomainPageMetadata from '../domain-page-metadata/domain-page-metadata'; import DomainPageSettings from '../domain-page-settings/domain-page-settings'; -import DomainPageWorkflows from '../domain-page-workflows/domain-page-workflows'; const domainPageTabsContentConfig = { - workflows: DomainPageWorkflows, + workflows: DomainWorkflows, metadata: DomainPageMetadata, settings: DomainPageSettings, } as const satisfies DomainPageTabsContentConfig; diff --git a/src/views/domain-page/config/domain-page-tabs-error.config.ts b/src/views/domain-page/config/domain-page-tabs-error.config.ts index 68770cbe2..f0dd9734f 100644 --- a/src/views/domain-page/config/domain-page-tabs-error.config.ts +++ b/src/views/domain-page/config/domain-page-tabs-error.config.ts @@ -1,5 +1,6 @@ +import getDomainWorkflowsErrorConfig from '@/views/domain-workflows/helpers/get-domain-workflows-error-config'; + import { type DomainPageTabsErrorConfig } from '../domain-page-tabs-error/domain-page-tabs-error.types'; -import getDomainWorkflowsErrorConfig from '../helpers/get-domain-workflows-error-config'; const domainPageTabsErrorConfig: DomainPageTabsErrorConfig = { workflows: getDomainWorkflowsErrorConfig, diff --git a/src/views/domain-page/config/domain-page-workflows-filters.config.ts b/src/views/domain-page/config/domain-page-workflows-filters.config.ts deleted file mode 100644 index 6471f27a4..000000000 --- a/src/views/domain-page/config/domain-page-workflows-filters.config.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { type PageFilterConfig } from '@/components/page-filters/page-filters.types'; - -import { type DomainPageWorkflowFiltersDatesValue } from '../domain-page-workflows-filters-dates/domain-page-workflow-filters-dates.types'; -import DomainPageWorkflowsFiltersDates from '../domain-page-workflows-filters-dates/domain-page-workflows-filters-dates'; -import { type DomainPageWorkflowFiltersStatusValue } from '../domain-page-workflows-filters-status/domain-page-workflow-filters-status-types'; -import DomainPageWorkflowsFiltersStatus from '../domain-page-workflows-filters-status/domain-page-workflows-filters-status'; - -import type domainPageQueryParamsConfig from './domain-page-query-params.config'; - -const domainPageWorkflowsFiltersConfig: [ - PageFilterConfig< - typeof domainPageQueryParamsConfig, - DomainPageWorkflowFiltersStatusValue - >, - PageFilterConfig< - typeof domainPageQueryParamsConfig, - DomainPageWorkflowFiltersDatesValue - >, -] = [ - { - id: 'status', - getValue: (v) => ({ status: v.status }), - formatValue: (v) => v, - component: DomainPageWorkflowsFiltersStatus, - }, - { - id: 'dates', - getValue: (v) => ({ - timeRangeStart: v.timeRangeStart, - timeRangeEnd: v.timeRangeEnd, - }), - formatValue: (v) => ({ - timeRangeStart: v.timeRangeStart?.toISOString(), - timeRangeEnd: v.timeRangeEnd?.toISOString(), - }), - component: DomainPageWorkflowsFiltersDates, - }, -] as const; - -export default domainPageWorkflowsFiltersConfig; diff --git a/src/views/domain-page/domain-page-workflows-filters/domain-page-workflows-filters.tsx b/src/views/domain-page/domain-page-workflows-filters/domain-page-workflows-filters.tsx deleted file mode 100644 index 60de5c5b0..000000000 --- a/src/views/domain-page/domain-page-workflows-filters/domain-page-workflows-filters.tsx +++ /dev/null @@ -1,23 +0,0 @@ -'use client'; -import PageFilters from '@/components/page-filters/page-filters'; -import PageSection from '@/components/page-section/page-section'; - -import domainPageQueryParamsConfig from '../config/domain-page-query-params.config'; -import domainPageWorkflowsFiltersConfig from '../config/domain-page-workflows-filters.config'; - -import { styled } from './domain-page-workflows-filters.styles'; - -export default function DomainPageWorkflowsFilters() { - return ( - - - - - - ); -} diff --git a/src/views/domain-page/domain-page-workflows/domain-page-workflows.tsx b/src/views/domain-page/domain-page-workflows/domain-page-workflows.tsx deleted file mode 100644 index 1fa3d415b..000000000 --- a/src/views/domain-page/domain-page-workflows/domain-page-workflows.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React, { Suspense } from 'react'; - -import SectionLoadingIndicator from '@/components/section-loading-indicator/section-loading-indicator'; - -import { type DomainPageTabContentProps } from '../domain-page-content/domain-page-content.types'; -import DomainPageWorkflowsFilters from '../domain-page-workflows-filters/domain-page-workflows-filters'; -import DomainPageWorkflowsTable from '../domain-page-workflows-table/domain-page-workflows-table'; - -export default function DomainPageWorkflows(props: DomainPageTabContentProps) { - return ( - <> - - }> - - - - ); -} diff --git a/src/views/domain-page/__fixtures__/domain-page-query-params.ts b/src/views/domain-workflows/__fixtures__/domain-workflows-query-params.ts similarity index 66% rename from src/views/domain-page/__fixtures__/domain-page-query-params.ts rename to src/views/domain-workflows/__fixtures__/domain-workflows-query-params.ts index 88cbdc55f..7544cb4a8 100644 --- a/src/views/domain-page/__fixtures__/domain-page-query-params.ts +++ b/src/views/domain-workflows/__fixtures__/domain-workflows-query-params.ts @@ -1,9 +1,9 @@ import { type PageQueryParamValues } from '@/hooks/use-page-query-params/use-page-query-params.types'; -import type domainPageQueryParamsConfig from '../config/domain-page-query-params.config'; +import type domainWorkflowsQueryParamsConfig from '../config/domain-workflows-query-params.config'; -export const mockDomainPageQueryParamsValues: PageQueryParamValues< - typeof domainPageQueryParamsConfig +export const mockDomainWorkflowsQueryParamsValues: PageQueryParamValues< + typeof domainWorkflowsQueryParamsConfig > = { search: '', status: undefined, diff --git a/src/views/domain-workflows/config/domain-workflows-filters.config.ts b/src/views/domain-workflows/config/domain-workflows-filters.config.ts new file mode 100644 index 000000000..7ddfb9686 --- /dev/null +++ b/src/views/domain-workflows/config/domain-workflows-filters.config.ts @@ -0,0 +1,40 @@ +import { type PageFilterConfig } from '@/components/page-filters/page-filters.types'; + +import DomainWorkflowsFiltersDates from '../domain-workflows-filters-dates/domain-workflows-filters-dates'; +import { type DomainWorkflowsFiltersDatesValue } from '../domain-workflows-filters-dates/domain-workflows-filters-dates.types'; +import DomainWorkflowsFiltersStatus from '../domain-workflows-filters-status/domain-workflows-filters-status'; +import { type DomainWorkflowsFiltersStatusValue } from '../domain-workflows-filters-status/domain-workflows-filters-status-types'; + +import type domainWorkflowsQueryParamsConfig from './domain-workflows-query-params.config'; + +const domainWorkflowsFiltersConfig: [ + PageFilterConfig< + typeof domainWorkflowsQueryParamsConfig, + DomainWorkflowsFiltersStatusValue + >, + PageFilterConfig< + typeof domainWorkflowsQueryParamsConfig, + DomainWorkflowsFiltersDatesValue + >, +] = [ + { + id: 'status', + getValue: (v) => ({ status: v.status }), + formatValue: (v) => v, + component: DomainWorkflowsFiltersStatus, + }, + { + id: 'dates', + getValue: (v) => ({ + timeRangeStart: v.timeRangeStart, + timeRangeEnd: v.timeRangeEnd, + }), + formatValue: (v) => ({ + timeRangeStart: v.timeRangeStart?.toISOString(), + timeRangeEnd: v.timeRangeEnd?.toISOString(), + }), + component: DomainWorkflowsFiltersDates, + }, +] as const; + +export default domainWorkflowsFiltersConfig; diff --git a/src/views/domain-page/config/domain-page-query-params.config.ts b/src/views/domain-workflows/config/domain-workflows-query-params.config.ts similarity index 93% rename from src/views/domain-page/config/domain-page-query-params.config.ts rename to src/views/domain-workflows/config/domain-workflows-query-params.config.ts index 5138a6f99..a4fd340ac 100644 --- a/src/views/domain-page/config/domain-page-query-params.config.ts +++ b/src/views/domain-workflows/config/domain-workflows-query-params.config.ts @@ -5,7 +5,7 @@ import { type WorkflowStatus } from '@/views/shared/workflow-status-tag/workflow import parseDateQueryParam from '../helpers/parse-date-query-param'; -const domainPageQueryParamsConfig: [ +const domainWorkflowsQueryParamsConfig: [ PageQueryParam<'search', string>, PageQueryParam<'status', WorkflowStatus | undefined>, PageQueryParam<'timeRangeStart', Date | undefined>, @@ -45,4 +45,4 @@ const domainPageQueryParamsConfig: [ }, ] as const; -export default domainPageQueryParamsConfig; +export default domainWorkflowsQueryParamsConfig; diff --git a/src/views/domain-page/config/domain-page-workflows-table.config.ts b/src/views/domain-workflows/config/domain-workflows-table.config.ts similarity index 88% rename from src/views/domain-page/config/domain-page-workflows-table.config.ts rename to src/views/domain-workflows/config/domain-workflows-table.config.ts index 528d68d0b..21ad31db3 100644 --- a/src/views/domain-page/config/domain-page-workflows-table.config.ts +++ b/src/views/domain-workflows/config/domain-workflows-table.config.ts @@ -3,11 +3,10 @@ import { createElement } from 'react'; import FormattedDate from '@/components/formatted-date/formatted-date'; import Link from '@/components/link/link'; import { type TableColumn } from '@/components/table/table.types'; +import { type DomainWorkflow } from '@/views/domain-page/domain-page.types'; import WorkflowStatusTag from '@/views/shared/workflow-status-tag/workflow-status-tag'; -import { type DomainWorkflow } from '../domain-page.types'; - -const domainPageWorkflowsTableConfig: Array> = [ +const domainWorkflowsTableConfig: Array> = [ { name: 'Workflow ID', id: 'WorkflowID', @@ -58,4 +57,4 @@ const domainPageWorkflowsTableConfig: Array> = [ }, ]; -export default domainPageWorkflowsTableConfig; +export default domainWorkflowsTableConfig; diff --git a/src/views/domain-page/domain-page-workflows-filters-dates/__tests__/domain-page-workflows-filters-dates.test.tsx b/src/views/domain-workflows/domain-workflows-filters-dates/__tests__/domain-workflows-filters-dates.test.tsx similarity index 82% rename from src/views/domain-page/domain-page-workflows-filters-dates/__tests__/domain-page-workflows-filters-dates.test.tsx rename to src/views/domain-workflows/domain-workflows-filters-dates/__tests__/domain-workflows-filters-dates.test.tsx index 62c30cb12..2c91fa92b 100644 --- a/src/views/domain-page/domain-page-workflows-filters-dates/__tests__/domain-page-workflows-filters-dates.test.tsx +++ b/src/views/domain-workflows/domain-workflows-filters-dates/__tests__/domain-workflows-filters-dates.test.tsx @@ -3,20 +3,20 @@ import React from 'react'; import { render, screen, act, fireEvent } from '@/test-utils/rtl'; import { - mockDomainPageQueryParamsValues, + mockDomainWorkflowsQueryParamsValues, mockDateOverrides, -} from '../../__fixtures__/domain-page-query-params'; -import { type DomainPageWorkflowFiltersDatesValue } from '../domain-page-workflow-filters-dates.types'; -import DomainPageWorkflowsFiltersDates from '../domain-page-workflows-filters-dates'; +} from '../../__fixtures__/domain-workflows-query-params'; +import DomainWorkflowsFiltersDates from '../domain-workflows-filters-dates'; +import { type DomainWorkflowsFiltersDatesValue } from '../domain-workflows-filters-dates.types'; jest.useFakeTimers().setSystemTime(new Date('2023-05-25')); -jest.mock('../domain-page-workflows-filters-dates.constants', () => ({ - ...jest.requireActual('../domain-page-workflows-filters-dates.constants'), +jest.mock('../domain-workflows-filters-dates.constants', () => ({ + ...jest.requireActual('../domain-workflows-filters-dates.constants'), DATE_FORMAT: 'dd MMM yyyy, HH:mm x', })); -describe('DomainPageWorkflowsFiltersDates', () => { +describe('DomainWorkflowsFiltersDates', () => { it('displays the date picker component', () => { setup({}); expect( @@ -130,14 +130,14 @@ describe('DomainPageWorkflowsFiltersDates', () => { function setup({ overrides, }: { - overrides?: DomainPageWorkflowFiltersDatesValue; + overrides?: DomainWorkflowsFiltersDatesValue; }) { const mockSetValue = jest.fn(); render( - ) { +}: PageFilterComponentProps) { const [dates, setDates] = React.useState>([]); React.useEffect(() => { diff --git a/src/views/domain-page/domain-page-workflows-filters-dates/domain-page-workflow-filters-dates.types.ts b/src/views/domain-workflows/domain-workflows-filters-dates/domain-workflows-filters-dates.types.ts similarity index 58% rename from src/views/domain-page/domain-page-workflows-filters-dates/domain-page-workflow-filters-dates.types.ts rename to src/views/domain-workflows/domain-workflows-filters-dates/domain-workflows-filters-dates.types.ts index c30f62659..2abd44bd4 100644 --- a/src/views/domain-page/domain-page-workflows-filters-dates/domain-page-workflow-filters-dates.types.ts +++ b/src/views/domain-workflows/domain-workflows-filters-dates/domain-workflows-filters-dates.types.ts @@ -1,4 +1,4 @@ -export type DomainPageWorkflowFiltersDatesValue = { +export type DomainWorkflowsFiltersDatesValue = { timeRangeStart: Date | undefined; timeRangeEnd: Date | undefined; }; diff --git a/src/views/domain-page/domain-page-workflows-filters-status/__tests__/domain-page-workflows-filters-status.test.tsx b/src/views/domain-workflows/domain-workflows-filters-status/__tests__/domain-workflows-filters-status.test.tsx similarity index 78% rename from src/views/domain-page/domain-page-workflows-filters-status/__tests__/domain-page-workflows-filters-status.test.tsx rename to src/views/domain-workflows/domain-workflows-filters-status/__tests__/domain-workflows-filters-status.test.tsx index b8de86527..7d6832cc5 100644 --- a/src/views/domain-page/domain-page-workflows-filters-status/__tests__/domain-page-workflows-filters-status.test.tsx +++ b/src/views/domain-workflows/domain-workflows-filters-status/__tests__/domain-workflows-filters-status.test.tsx @@ -4,11 +4,11 @@ import { render, screen, fireEvent, act } from '@/test-utils/rtl'; import { WORKFLOW_STATUS_NAMES } from '@/views/shared/workflow-status-tag/workflow-status-tag.constants'; -import { mockDomainPageQueryParamsValues } from '../../__fixtures__/domain-page-query-params'; -import { type DomainPageWorkflowFiltersStatusValue } from '../domain-page-workflow-filters-status-types'; -import DomainPageWorkflowsFiltersStatus from '../domain-page-workflows-filters-status'; +import { mockDomainWorkflowsQueryParamsValues } from '../../__fixtures__/domain-workflows-query-params'; +import DomainWorkflowsFiltersStatus from '../domain-workflows-filters-status'; +import { type DomainWorkflowsFiltersStatusValue } from '../domain-workflows-filters-status-types'; -describe('DomainPageWorkflowsFiltersStatus', () => { +describe('DomainWorkflowsFiltersStatus', () => { it('renders without errors', () => { setup({}); expect(screen.getByRole('combobox')).toBeInTheDocument(); @@ -57,13 +57,13 @@ describe('DomainPageWorkflowsFiltersStatus', () => { function setup({ overrides, }: { - overrides?: DomainPageWorkflowFiltersStatusValue; + overrides?: DomainWorkflowsFiltersStatusValue; }) { const mockSetValue = jest.fn(); render( - ) { +}: PageFilterComponentProps) { const statusOptionValue = WORKFLOW_STATUS_OPTIONS.filter( (option) => option.id === value.status ); diff --git a/src/views/domain-page/domain-page-workflows-filters/domain-page-workflows-filters.styles.ts b/src/views/domain-workflows/domain-workflows-filters/domain-workflows-filters.styles.ts similarity index 100% rename from src/views/domain-page/domain-page-workflows-filters/domain-page-workflows-filters.styles.ts rename to src/views/domain-workflows/domain-workflows-filters/domain-workflows-filters.styles.ts diff --git a/src/views/domain-workflows/domain-workflows-filters/domain-workflows-filters.tsx b/src/views/domain-workflows/domain-workflows-filters/domain-workflows-filters.tsx new file mode 100644 index 000000000..5892b78cd --- /dev/null +++ b/src/views/domain-workflows/domain-workflows-filters/domain-workflows-filters.tsx @@ -0,0 +1,23 @@ +'use client'; +import PageFilters from '@/components/page-filters/page-filters'; +import PageSection from '@/components/page-section/page-section'; + +import domainWorkflowsFiltersConfig from '../config/domain-workflows-filters.config'; +import domainWorkflowsQueryParamsConfig from '../config/domain-workflows-query-params.config'; + +import { styled } from './domain-workflows-filters.styles'; + +export default function DomainWorkflowsFilters() { + return ( + + + + + + ); +} diff --git a/src/views/domain-page/domain-page-workflows-table-end-message/__tests__/domain-page-workflows-table-end-message.test.tsx b/src/views/domain-workflows/domain-workflows-table-end-message/__tests__/domain-workflows-table-end-message.test.tsx similarity index 85% rename from src/views/domain-page/domain-page-workflows-table-end-message/__tests__/domain-page-workflows-table-end-message.test.tsx rename to src/views/domain-workflows/domain-workflows-table-end-message/__tests__/domain-workflows-table-end-message.test.tsx index 636a7509f..872602732 100644 --- a/src/views/domain-page/domain-page-workflows-table-end-message/__tests__/domain-page-workflows-table-end-message.test.tsx +++ b/src/views/domain-workflows/domain-workflows-table-end-message/__tests__/domain-workflows-table-end-message.test.tsx @@ -5,10 +5,10 @@ import { import { render, screen, act, fireEvent } from '@/test-utils/rtl'; -import DomainPageWorkflowsTableEndMessage from '../domain-page-workflows-table-end-message'; -import { type Props } from '../domain-page-workflows-table-end-message.types'; +import DomainWorkflowsTableEndMessage from '../domain-workflows-table-end-message'; +import { type Props } from '../domain-workflows-table-end-message.types'; -describe(DomainPageWorkflowsTableEndMessage.name, () => { +describe(DomainWorkflowsTableEndMessage.name, () => { it('renders loading state while fetching next page', () => { setup({ isFetchingNextPage: true }); @@ -69,9 +69,7 @@ function setup(overrides: Partial) { isFetchingNextPage: false, }; - render( - - ); + render(); return { mockFetchNextPage }; } diff --git a/src/views/domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.styles.ts b/src/views/domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.styles.ts similarity index 100% rename from src/views/domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.styles.ts rename to src/views/domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.styles.ts diff --git a/src/views/domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.tsx b/src/views/domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.tsx similarity index 82% rename from src/views/domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.tsx rename to src/views/domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.tsx index cd92ca0ef..f893e017f 100644 --- a/src/views/domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.tsx +++ b/src/views/domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.tsx @@ -3,10 +3,10 @@ import React from 'react'; import { Spinner } from 'baseui/spinner'; import { InView } from 'react-intersection-observer'; -import { styled } from './domain-page-workflows-table-end-message.styles'; -import { type Props } from './domain-page-workflows-table-end-message.types'; +import { styled } from './domain-workflows-table-end-message.styles'; +import { type Props } from './domain-workflows-table-end-message.types'; -export default function DomainPageWorkflowsTableEndMessage(props: Props) { +export default function DomainWorkflowsTableEndMessage(props: Props) { if (props.isFetchingNextPage) { return ; } diff --git a/src/views/domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.types.ts b/src/views/domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.types.ts similarity index 100% rename from src/views/domain-page/domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.types.ts rename to src/views/domain-workflows/domain-workflows-table-end-message/domain-workflows-table-end-message.types.ts diff --git a/src/views/domain-page/domain-page-workflows-table/__tests__/domain-page-workflows-table.test.tsx b/src/views/domain-workflows/domain-workflows-table/__tests__/domain-workflows-table.test.tsx similarity index 88% rename from src/views/domain-page/domain-page-workflows-table/__tests__/domain-page-workflows-table.test.tsx rename to src/views/domain-workflows/domain-workflows-table/__tests__/domain-workflows-table.test.tsx index 817efd2a3..d4fb134a4 100644 --- a/src/views/domain-page/domain-page-workflows-table/__tests__/domain-page-workflows-table.test.tsx +++ b/src/views/domain-workflows/domain-workflows-table/__tests__/domain-workflows-table.test.tsx @@ -5,12 +5,12 @@ import { render, screen, act, fireEvent } from '@/test-utils/rtl'; import { type ListWorkflowsResponse } from '@/route-handlers/list-workflows/list-workflows.types'; import * as requestModule from '@/utils/request'; -import { mockDomainPageQueryParamsValues } from '../../__fixtures__/domain-page-query-params'; -import { type Props as EndMessageProps } from '../../domain-page-workflows-table-end-message/domain-page-workflows-table-end-message.types'; -import DomainPageWorkflowsTable from '../domain-page-workflows-table'; +import { mockDomainWorkflowsQueryParamsValues } from '../../__fixtures__/domain-workflows-query-params'; +import { type Props as EndMessageProps } from '../../domain-workflows-table-end-message/domain-workflows-table-end-message.types'; +import DomainWorkflowsTable from '../domain-workflows-table'; jest.mock( - '../../domain-page-workflows-table-end-message/domain-page-workflows-table-end-message', + '../../domain-workflows-table-end-message/domain-workflows-table-end-message', () => jest.fn((props: EndMessageProps) => (