From eaa3c8ae058a83588f694ce4ee5aafe7e781c185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bonnet?= Date: Mon, 26 Dec 2022 14:56:13 +0100 Subject: [PATCH] fix(console-shared): folder architecture (#427) --- .../step-general-feature.spec.tsx} | 4 +-- .../step-general-feature.tsx} | 8 +++--- .../step-port-feature.spec.tsx} | 6 ++-- .../step-port-feature.tsx} | 4 +-- .../step-resources-feature.spec.tsx} | 4 +-- .../step-resources-feature.tsx} | 8 +++--- .../step-summary-feature.spec.tsx} | 8 +++--- .../step-summary-feature.tsx} | 8 +++--- .../step-general-feature.spec.tsx} | 8 +++--- .../step-general-feature.tsx} | 8 +++--- .../step-resources-feature.spec.tsx} | 9 +++--- .../step-resources-feature.tsx} | 8 +++--- .../step-summary-feature.spec.tsx} | 8 +++--- .../step-summary-feature.tsx} | 8 +++--- libs/pages/services/src/lib/router/router.tsx | 28 +++++++++---------- .../step-general.spec.tsx} | 16 +++++------ .../step-general.tsx} | 6 ++-- .../step-resources.spec.tsx} | 14 ++++------ .../step-resources.tsx} | 6 ++-- .../step-summary.spec.tsx} | 8 +++--- .../step-summary.tsx} | 6 ++-- .../step-general.spec.tsx} | 6 ++-- .../step-general.tsx} | 6 ++-- .../step-resources.spec.tsx} | 6 ++-- .../step-resources.tsx} | 6 ++-- .../step-summary.spec.tsx} | 6 ++-- .../step-summary.tsx} | 6 ++-- libs/shared/console-shared/src/index.ts | 14 +++++----- .../application-buttons-actions.spec.tsx | 0 .../application-buttons-actions.tsx | 2 +- .../cluster-buttons-actions.spec.tsx | 0 .../cluster-buttons-actions.tsx | 0 .../database-buttons-actions.spec.tsx | 0 .../database-buttons-actions.tsx | 0 .../ui/deploy-other-commit-modal.tsx | 7 ++++- .../flow-create-port.spec.tsx | 0 .../flow-create-port.tsx | 0 .../{ => ui}/port-row/port-row.spec.tsx | 0 .../{ => ui}/port-row/port-row.tsx | 0 .../flow-create-variable.spec.tsx | 0 .../flow-create-variable.tsx | 0 .../variable-row/variable-row.spec.tsx | 0 .../{ => ui}/variable-row/variable-row.tsx | 0 ...t-git-repository-settings-feature.spec.tsx | 2 +- .../edit-git-repository-settings-feature.tsx | 4 +-- .../git-repository-settings-feature.spec.tsx | 0 .../git-repository-settings-feature.tsx | 4 +-- .../confirmation-git-modal.spec.tsx | 0 .../confirmation-git-modal.tsx | 4 +-- .../git-repository-settings.spec.tsx | 4 +-- .../git-repository-settings.tsx | 2 +- .../{ => utils}/auth-providers-values.tsx | 0 .../ui/job-general-settings.tsx | 2 +- 53 files changed, 132 insertions(+), 132 deletions(-) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-create-general-feature/page-application-create-general-feature.spec.tsx => step-general-feature/step-general-feature.spec.tsx} (85%) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-create-general-feature/page-application-create-general-feature.tsx => step-general-feature/step-general-feature.tsx} (90%) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-create-port-feature/page-application-create-port-feature.spec.tsx => step-port-feature/step-port-feature.spec.tsx} (89%) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-create-port-feature/page-application-create-port-feature.tsx => step-port-feature/step-port-feature.tsx} (97%) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-create-resources-feature/page-application-create-resources-feature.spec.tsx => step-resources-feature/step-resources-feature.spec.tsx} (87%) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-create-resources-feature/page-application-create-resources-feature.tsx => step-resources-feature/step-resources-feature.tsx} (90%) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-post-feature/page-application-install-post.spec.tsx => step-summary-feature/step-summary-feature.spec.tsx} (96%) rename libs/pages/services/src/lib/feature/page-application-create-feature/{page-application-post-feature/page-application-post-feature.tsx => step-summary-feature/step-summary-feature.tsx} (96%) rename libs/pages/services/src/lib/feature/page-database-create-feature/{page-database-create-general-feature/page-database-create-general-feature.spec.tsx => step-general-feature/step-general-feature.spec.tsx} (91%) rename libs/pages/services/src/lib/feature/page-database-create-feature/{page-database-create-general-feature/page-database-create-general-feature.tsx => step-general-feature/step-general-feature.tsx} (95%) rename libs/pages/services/src/lib/feature/page-database-create-feature/{page-database-create-resources-feature/page-database-create-resources-feature.spec.tsx => step-resources-feature/step-resources-feature.spec.tsx} (87%) rename libs/pages/services/src/lib/feature/page-database-create-feature/{page-database-create-resources-feature/page-database-create-resources-feature.tsx => step-resources-feature/step-resources-feature.tsx} (89%) rename libs/pages/services/src/lib/feature/page-database-create-feature/{page-database-create-post-feature/page-database-create-post-feature.spec.tsx => step-summary-feature/step-summary-feature.spec.tsx} (92%) rename libs/pages/services/src/lib/feature/page-database-create-feature/{page-database-create-post-feature/page-database-create-post-feature.tsx => step-summary-feature/step-summary-feature.tsx} (93%) rename libs/pages/services/src/lib/ui/page-application-create/{page-application-create-general/page-application-create-general.spec.tsx => step-general/step-general.spec.tsx} (80%) rename libs/pages/services/src/lib/ui/page-application-create/{page-application-create-general/page-application-create-general.tsx => step-general/step-general.tsx} (95%) rename libs/pages/services/src/lib/ui/page-application-create/{page-application-create-resources/page-application-create-resources.spec.tsx => step-resources/step-resources.spec.tsx} (67%) rename libs/pages/services/src/lib/ui/page-application-create/{page-application-create-resources/page-application-create-resources.tsx => step-resources/step-resources.tsx} (87%) rename libs/pages/services/src/lib/ui/page-application-create/{page-application-post/page-application-post.spec.tsx => step-summary/step-summary.spec.tsx} (74%) rename libs/pages/services/src/lib/ui/page-application-create/{page-application-post/page-application-post.tsx => step-summary/step-summary.tsx} (98%) rename libs/pages/services/src/lib/ui/page-database-create/{page-database-create-general/page-database-create-general.spec.tsx => step-general/step-general.spec.tsx} (57%) rename libs/pages/services/src/lib/ui/page-database-create/{page-database-create-general/page-database-create-general.tsx => step-general/step-general.tsx} (97%) rename libs/pages/services/src/lib/ui/page-database-create/{page-database-create-resources/page-database-create-resources.spec.tsx => step-resources/step-resources.spec.tsx} (54%) rename libs/pages/services/src/lib/ui/page-database-create/{page-database-create-resources/page-database-create-resources.tsx => step-resources/step-resources.tsx} (87%) rename libs/pages/services/src/lib/ui/page-database-create/{page-database-create-post/page-database-create-post.spec.tsx => step-summary/step-summary.spec.tsx} (76%) rename libs/pages/services/src/lib/ui/page-database-create/{page-database-create-post/page-database-create-post.tsx => step-summary/step-summary.tsx} (96%) rename libs/shared/console-shared/src/lib/{application-buttons-actions/ui => buttons-actions/ui/application-buttons-actions}/application-buttons-actions.spec.tsx (100%) rename libs/shared/console-shared/src/lib/{application-buttons-actions/ui => buttons-actions/ui/application-buttons-actions}/application-buttons-actions.tsx (98%) rename libs/shared/console-shared/src/lib/{cluster-buttons-actions/ui => buttons-actions/ui/cluster-buttons-actions}/cluster-buttons-actions.spec.tsx (100%) rename libs/shared/console-shared/src/lib/{cluster-buttons-actions/ui => buttons-actions/ui/cluster-buttons-actions}/cluster-buttons-actions.tsx (100%) rename libs/shared/console-shared/src/lib/{database-buttons-actions/ui => buttons-actions/ui/database-buttons-actions}/database-buttons-actions.spec.tsx (100%) rename libs/shared/console-shared/src/lib/{database-buttons-actions/ui => buttons-actions/ui/database-buttons-actions}/database-buttons-actions.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-port/ui/{ => flow-create-port}/flow-create-port.spec.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-port/ui/{ => flow-create-port}/flow-create-port.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-port/{ => ui}/port-row/port-row.spec.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-port/{ => ui}/port-row/port-row.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-variable/ui/{ => flow-create-variable}/flow-create-variable.spec.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-variable/ui/{ => flow-create-variable}/flow-create-variable.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-variable/{ => ui}/variable-row/variable-row.spec.tsx (100%) rename libs/shared/console-shared/src/lib/flow-create-variable/{ => ui}/variable-row/variable-row.tsx (100%) rename libs/shared/console-shared/src/lib/git-repository-settings/{ => feature}/edit-git-repository-settings-feature/edit-git-repository-settings-feature.spec.tsx (92%) rename libs/shared/console-shared/src/lib/git-repository-settings/{ => feature}/edit-git-repository-settings-feature/edit-git-repository-settings-feature.tsx (97%) rename libs/shared/console-shared/src/lib/git-repository-settings/feature/{ => git-repository-settings-feature}/git-repository-settings-feature.spec.tsx (100%) rename libs/shared/console-shared/src/lib/git-repository-settings/feature/{ => git-repository-settings-feature}/git-repository-settings-feature.tsx (95%) rename libs/shared/console-shared/src/lib/git-repository-settings/{ => ui}/confirmation-git-modal/confirmation-git-modal.spec.tsx (100%) rename libs/shared/console-shared/src/lib/git-repository-settings/{ => ui}/confirmation-git-modal/confirmation-git-modal.tsx (96%) rename libs/shared/console-shared/src/lib/git-repository-settings/ui/{ => git-repository-settings}/git-repository-settings.spec.tsx (97%) rename libs/shared/console-shared/src/lib/git-repository-settings/ui/{ => git-repository-settings}/git-repository-settings.tsx (98%) rename libs/shared/console-shared/src/lib/git-repository-settings/{ => utils}/auth-providers-values.tsx (100%) diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-general-feature/page-application-create-general-feature.spec.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-general-feature/step-general-feature.spec.tsx similarity index 85% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-general-feature/page-application-create-general-feature.spec.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-general-feature/step-general-feature.spec.tsx index ff21dc038c..8cb71df9f8 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-general-feature/page-application-create-general-feature.spec.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-general-feature/step-general-feature.spec.tsx @@ -1,7 +1,7 @@ import { render } from '__tests__/utils/setup-jest' import { ServiceTypeEnum } from '@qovery/shared/enums' import { ApplicationContainerCreateContext } from '../page-application-create-feature' -import PageApplicationCreateGeneralFeature from './page-application-create-general-feature' +import StepGeneralFeature from './step-general-feature' describe('PageApplicationCreateGeneralFeature', () => { it('should render successfully', () => { @@ -18,7 +18,7 @@ describe('PageApplicationCreateGeneralFeature', () => { setPortData: jest.fn(), }} > - + ) expect(baseElement).toBeTruthy() diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-general-feature/page-application-create-general-feature.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-general-feature/step-general-feature.tsx similarity index 90% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-general-feature/page-application-create-general-feature.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-general-feature/step-general-feature.tsx index 8826dd8aa7..ff7bfaefc5 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-general-feature/page-application-create-general-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-general-feature/step-general-feature.tsx @@ -10,10 +10,10 @@ import { toastError } from '@qovery/shared/toast' import { FunnelFlowBody, FunnelFlowHelpCard } from '@qovery/shared/ui' import { useDocumentTitle } from '@qovery/shared/utils' import { AppDispatch, RootState } from '@qovery/store' -import PageApplicationCreateGeneral from '../../../ui/page-application-create/page-application-create-general/page-application-create-general' +import StepGeneral from '../../../ui/page-application-create/step-general/step-general' import { useApplicationContainerCreateContext } from '../page-application-create-feature' -export function PageApplicationCreateGeneralFeature() { +export function StepGeneralFeature() { useDocumentTitle('General - Create Application') const { setGeneralData, generalData, setCurrentStep } = useApplicationContainerCreateContext() const { organizationId = '', projectId = '', environmentId = '' } = useParams() @@ -81,10 +81,10 @@ export function PageApplicationCreateGeneralFeature() { return ( - + ) } -export default PageApplicationCreateGeneralFeature +export default StepGeneralFeature diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-port-feature/page-application-create-port-feature.spec.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-port-feature/step-port-feature.spec.tsx similarity index 89% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-port-feature/page-application-create-port-feature.spec.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-port-feature/step-port-feature.spec.tsx index d806c8264a..bbf7520f43 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-port-feature/page-application-create-port-feature.spec.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-port-feature/step-port-feature.spec.tsx @@ -2,7 +2,7 @@ import { act, getByTestId } from '@testing-library/react' import { render } from '__tests__/utils/setup-jest' import { ServiceTypeEnum } from '@qovery/shared/enums' import { ApplicationContainerCreateContext } from '../page-application-create-feature' -import PageApplicationCreatePortFeature from './page-application-create-port-feature' +import StepPortFeature from './step-port-feature' describe('PageApplicationCreatePortFeature', () => { let context: any @@ -31,7 +31,7 @@ describe('PageApplicationCreatePortFeature', () => { it('should render successfully', () => { const { baseElement } = render( - + ) expect(baseElement).toBeTruthy() @@ -40,7 +40,7 @@ describe('PageApplicationCreatePortFeature', () => { it('should submit the data to the context', async () => { const { baseElement } = render( - + ) diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-port-feature/page-application-create-port-feature.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-port-feature/step-port-feature.tsx similarity index 97% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-port-feature/page-application-create-port-feature.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-port-feature/step-port-feature.tsx index d96b7ed03a..c9f72b2341 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-port-feature/page-application-create-port-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-port-feature/step-port-feature.tsx @@ -14,7 +14,7 @@ import { FunnelFlowBody, FunnelFlowHelpCard } from '@qovery/shared/ui' import { useDocumentTitle } from '@qovery/shared/utils' import { useApplicationContainerCreateContext } from '../page-application-create-feature' -export function PageApplicationCreatePortFeature() { +export function StepPortFeature() { useDocumentTitle('Ports - Create Application') const { setCurrentStep, portData, setPortData, generalData } = useApplicationContainerCreateContext() const { organizationId = '', projectId = '', environmentId = '' } = useParams() @@ -105,4 +105,4 @@ export function PageApplicationCreatePortFeature() { ) } -export default PageApplicationCreatePortFeature +export default StepPortFeature diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-resources-feature/page-application-create-resources-feature.spec.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-resources-feature/step-resources-feature.spec.tsx similarity index 87% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-resources-feature/page-application-create-resources-feature.spec.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-resources-feature/step-resources-feature.spec.tsx index a7a2019577..cc891baa64 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-resources-feature/page-application-create-resources-feature.spec.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-resources-feature/step-resources-feature.spec.tsx @@ -2,7 +2,7 @@ import ResizeObserver from '__tests__/utils/resize-observer' import { render } from '__tests__/utils/setup-jest' import { ServiceTypeEnum } from '@qovery/shared/enums' import { ApplicationContainerCreateContext } from '../page-application-create-feature' -import PageApplicationCreateResourcesFeature from './page-application-create-resources-feature' +import StepResourcesFeature from './step-resources-feature' describe('PageApplicationCreateResourcesFeature', () => { it('should render successfully', () => { @@ -24,7 +24,7 @@ describe('PageApplicationCreateResourcesFeature', () => { portData: undefined, }} > - + ) expect(baseElement).toBeTruthy() diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-resources-feature/page-application-create-resources-feature.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-resources-feature/step-resources-feature.tsx similarity index 90% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-resources-feature/page-application-create-resources-feature.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-resources-feature/step-resources-feature.tsx index 465fb73beb..fb93ebf9ae 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-resources-feature/page-application-create-resources-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-resources-feature/step-resources-feature.tsx @@ -15,10 +15,10 @@ import { import { FunnelFlowBody, FunnelFlowHelpCard } from '@qovery/shared/ui' import { useDocumentTitle } from '@qovery/shared/utils' import { RootState } from '@qovery/store' -import PageApplicationCreateResources from '../../../ui/page-application-create/page-application-create-resources/page-application-create-resources' +import StepResources from '../../../ui/page-application-create/step-resources/step-resources' import { useApplicationContainerCreateContext } from '../page-application-create-feature' -export function PageApplicationCreateResourcesFeature() { +export function StepResourcesFeature() { useDocumentTitle('Resources - Create Application') const { setCurrentStep, resourcesData, setResourcesData, generalData } = useApplicationContainerCreateContext() const { organizationId = '', projectId = '', environmentId = '' } = useParams() @@ -93,10 +93,10 @@ export function PageApplicationCreateResourcesFeature() { return ( - + ) } -export default PageApplicationCreateResourcesFeature +export default StepResourcesFeature diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-post-feature/page-application-install-post.spec.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-summary-feature/step-summary-feature.spec.tsx similarity index 96% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-post-feature/page-application-install-post.spec.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-summary-feature/step-summary-feature.spec.tsx index 441064f99c..e006851846 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-post-feature/page-application-install-post.spec.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-summary-feature/step-summary-feature.spec.tsx @@ -8,7 +8,7 @@ import { ApplicationContainerCreateContext, ApplicationContainerCreateContextInterface, } from '../page-application-create-feature' -import PageApplicationPostFeature from './page-application-post-feature' +import StepSummaryFeature from './step-summary-feature' import SpyInstance = jest.SpyInstance @@ -70,7 +70,7 @@ describe('PageApplicationPostFeature', () => { it('should render successfully', () => { const { baseElement } = render( - + ) @@ -104,7 +104,7 @@ describe('PageApplicationPostFeature', () => { }, }} > - + ) @@ -159,7 +159,7 @@ describe('PageApplicationPostFeature', () => { }, }} > - + ) diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-post-feature/page-application-post-feature.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/step-summary-feature/step-summary-feature.tsx similarity index 96% rename from libs/pages/services/src/lib/feature/page-application-create-feature/page-application-post-feature/page-application-post-feature.tsx rename to libs/pages/services/src/lib/feature/page-application-create-feature/step-summary-feature/step-summary-feature.tsx index de38afa32a..5e560a0b72 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-post-feature/page-application-post-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/step-summary-feature/step-summary-feature.tsx @@ -22,10 +22,10 @@ import { import { FunnelFlowBody } from '@qovery/shared/ui' import { buildGitRepoUrl, convertCpuToVCpu, useDocumentTitle } from '@qovery/shared/utils' import { AppDispatch, RootState } from '@qovery/store' -import PageApplicationPost from '../../../ui/page-application-create/page-application-post/page-application-post' +import StepSummary from '../../../ui/page-application-create/step-summary/step-summary' import { useApplicationContainerCreateContext } from '../page-application-create-feature' -export function PageApplicationPostFeature() { +export function StepSummaryFeature() { useDocumentTitle('Summary - Create Application') const { generalData, portData, resourcesData, setCurrentStep } = useApplicationContainerCreateContext() const navigate = useNavigate() @@ -178,7 +178,7 @@ export function PageApplicationPostFeature() { return ( {generalData && portData && resourcesData && ( - { ) } -describe('PageDatabaseCreateGeneralFeature', () => { +describe('StepGeneralFeature', () => { it('should render successfully', async () => { const { baseElement } = render( - + ) @@ -62,7 +62,7 @@ describe('PageDatabaseCreateGeneralFeature', () => { it('should submit form and navigate', async () => { const { baseElement } = render( - + ) diff --git a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-general-feature/page-database-create-general-feature.tsx b/libs/pages/services/src/lib/feature/page-database-create-feature/step-general-feature/step-general-feature.tsx similarity index 95% rename from libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-general-feature/page-database-create-general-feature.tsx rename to libs/pages/services/src/lib/feature/page-database-create-feature/step-general-feature/step-general-feature.tsx index ce837a3fe3..385c99839b 100644 --- a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-general-feature/page-database-create-general-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-database-create-feature/step-general-feature/step-general-feature.tsx @@ -14,7 +14,7 @@ import { import { FunnelFlowBody, FunnelFlowHelpCard, Icon } from '@qovery/shared/ui' import { useDocumentTitle } from '@qovery/shared/utils' import { AppDispatch, RootState } from '@qovery/store' -import PageDatabaseCreateGeneral from '../../../ui/page-database-create/page-database-create-general/page-database-create-general' +import StepGeneral from '../../../ui/page-database-create/step-general/step-general' import { GeneralData } from '../database-creation-flow.interface' import { useDatabaseCreateContext } from '../page-database-create-feature' @@ -71,7 +71,7 @@ export const generateDatabasesTypesAndVersionOptions = (databaseConfigs: Databas } } -export function PageDatabaseCreateGeneralFeature() { +export function StepGeneralFeature() { useDocumentTitle('General - Create Database') const { setGeneralData, generalData, setCurrentStep } = useDatabaseCreateContext() const { organizationId = '', projectId = '', environmentId = '' } = useParams() @@ -162,7 +162,7 @@ export function PageDatabaseCreateGeneralFeature() { return ( - ({ ...jest.requireActual('react-redux'), @@ -51,7 +50,7 @@ describe('PageDatabaseCreateResourcesFeature', () => { it('should render successfully', () => { const { baseElement } = render( - + ) expect(baseElement).toBeTruthy() @@ -60,7 +59,7 @@ describe('PageDatabaseCreateResourcesFeature', () => { it('should render successfully', () => { const { baseElement } = render( - + ) expect(baseElement).toBeTruthy() @@ -70,7 +69,7 @@ describe('PageDatabaseCreateResourcesFeature', () => { window.ResizeObserver = ResizeObserver const { baseElement } = render( - + ) diff --git a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-resources-feature/page-database-create-resources-feature.tsx b/libs/pages/services/src/lib/feature/page-database-create-feature/step-resources-feature/step-resources-feature.tsx similarity index 89% rename from libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-resources-feature/page-database-create-resources-feature.tsx rename to libs/pages/services/src/lib/feature/page-database-create-feature/step-resources-feature/step-resources-feature.tsx index 201330a621..c7d74f58dc 100644 --- a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-resources-feature/page-database-create-resources-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-database-create-feature/step-resources-feature/step-resources-feature.tsx @@ -9,11 +9,11 @@ import { } from '@qovery/shared/router' import { FunnelFlowBody, FunnelFlowHelpCard } from '@qovery/shared/ui' import { useDocumentTitle } from '@qovery/shared/utils' -import PageDatabaseCreateResources from '../../../ui/page-database-create/page-database-create-resources/page-database-create-resources' +import StepResources from '../../../ui/page-database-create/step-resources/step-resources' import { ResourcesData } from '../database-creation-flow.interface' import { useDatabaseCreateContext } from '../page-database-create-feature' -export function PageDatabaseCreateResourcesFeature() { +export function StepResourcesFeature() { useDocumentTitle('Resources - Create Database') const { setCurrentStep, resourcesData, setResourcesData, generalData } = useDatabaseCreateContext() const { organizationId = '', projectId = '', environmentId = '' } = useParams() @@ -71,10 +71,10 @@ export function PageDatabaseCreateResourcesFeature() { return ( - + ) } -export default PageDatabaseCreateResourcesFeature +export default StepResourcesFeature diff --git a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-post-feature/page-database-create-post-feature.spec.tsx b/libs/pages/services/src/lib/feature/page-database-create-feature/step-summary-feature/step-summary-feature.spec.tsx similarity index 92% rename from libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-post-feature/page-database-create-post-feature.spec.tsx rename to libs/pages/services/src/lib/feature/page-database-create-feature/step-summary-feature/step-summary-feature.spec.tsx index 12d6f5901e..9246aee004 100644 --- a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-post-feature/page-database-create-post-feature.spec.tsx +++ b/libs/pages/services/src/lib/feature/page-database-create-feature/step-summary-feature/step-summary-feature.spec.tsx @@ -4,7 +4,7 @@ import { DatabaseAccessibilityEnum, DatabaseModeEnum, DatabaseTypeEnum } from 'q import { ReactNode } from 'react' import * as storeDatabase from '@qovery/domains/database' import { DatabaseCreateContext } from '../page-database-create-feature' -import PageDatabaseCreatePostFeature from './page-database-create-post-feature' +import StepSummaryFeature from './step-summary-feature' import SpyInstance = jest.SpyInstance @@ -49,11 +49,11 @@ const ContextWrapper = (props: { children: ReactNode }) => { ) } -describe('PageDatabaseCreatePostFeature', () => { +describe('StepSummaryFeature', () => { it('should render successfully', () => { const { baseElement } = render( - + ) expect(baseElement).toBeTruthy() @@ -74,7 +74,7 @@ describe('PageDatabaseCreatePostFeature', () => { })) const { baseElement } = render( - + ) diff --git a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-post-feature/page-database-create-post-feature.tsx b/libs/pages/services/src/lib/feature/page-database-create-feature/step-summary-feature/step-summary-feature.tsx similarity index 93% rename from libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-post-feature/page-database-create-post-feature.tsx rename to libs/pages/services/src/lib/feature/page-database-create-feature/step-summary-feature/step-summary-feature.tsx index 88ab0f3fe1..b4f3ee729c 100644 --- a/libs/pages/services/src/lib/feature/page-database-create-feature/page-database-create-post-feature/page-database-create-post-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-database-create-feature/step-summary-feature/step-summary-feature.tsx @@ -12,10 +12,10 @@ import { import { FunnelFlowBody } from '@qovery/shared/ui' import { convertCpuToVCpu, useDocumentTitle } from '@qovery/shared/utils' import { AppDispatch } from '@qovery/store' -import PageDatabaseCreatePost from '../../../ui/page-database-create/page-database-create-post/page-database-create-post' +import StepSummary from '../../../ui/page-database-create/step-summary/step-summary' import { useDatabaseCreateContext } from '../page-database-create-feature' -export function PageDatabaseCreatePostFeature() { +export function StepSummaryFeature() { useDocumentTitle('Summary - Create Database') const { generalData, resourcesData, setCurrentStep } = useDatabaseCreateContext() const navigate = useNavigate() @@ -103,7 +103,7 @@ export function PageDatabaseCreatePostFeature() { return ( {generalData && resourcesData && ( - , + component: , }, { path: SERVICES_CREATION_RESOURCES_URL, - component: , + component: , }, { path: SERVICES_CREATION_PORTS_URL, - component: , + component: , }, { path: SERVICES_CREATION_POST_URL, - component: , + component: , }, ] export const ROUTER_SERVICE_DATABASE_CREATION: Route[] = [ { path: SERVICES_DATABASE_CREATION_GENERAL_URL, - component: , + component: , }, { path: SERVICES_DATABASE_CREATION_RESOURCES_URL, - component: , + component: , }, { path: SERVICES_DATABASE_CREATION_POST_URL, - component: , + component: , }, ] diff --git a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-general/page-application-create-general.spec.tsx b/libs/pages/services/src/lib/ui/page-application-create/step-general/step-general.spec.tsx similarity index 80% rename from libs/pages/services/src/lib/ui/page-application-create/page-application-create-general/page-application-create-general.spec.tsx rename to libs/pages/services/src/lib/ui/page-application-create/step-general/step-general.spec.tsx index 58d6a348f3..9ae0704659 100644 --- a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-general/page-application-create-general.spec.tsx +++ b/libs/pages/services/src/lib/ui/page-application-create/step-general/step-general.spec.tsx @@ -4,23 +4,23 @@ import { wrapWithReactHookForm } from '__tests__/utils/wrap-with-react-hook-form import { BuildModeEnum, GitProviderEnum } from 'qovery-typescript-axios' import { organizationFactoryMock } from '@qovery/domains/organization' import { ServiceTypeEnum } from '@qovery/shared/enums' -import PageApplicationCreateGeneral, { PageApplicationCreateGeneralProps } from './page-application-create-general' +import StepGeneral, { StepGeneralProps } from './step-general' const mockOrganization = organizationFactoryMock(1)[0] -const props: PageApplicationCreateGeneralProps = { +const props: StepGeneralProps = { organization: mockOrganization, onSubmit: jest.fn(), } -describe('PageApplicationCreateGeneral', () => { +describe('StepGeneral', () => { it('should render successfully', () => { - const { baseElement } = render(wrapWithReactHookForm()) + const { baseElement } = render(wrapWithReactHookForm()) expect(baseElement).toBeTruthy() }) it('should submit the form on click', async () => { const { getByTestId } = render( - wrapWithReactHookForm(, { + wrapWithReactHookForm(, { defaultValues: { name: 'test', description: 'test', @@ -49,7 +49,7 @@ describe('PageApplicationCreateGeneral', () => { it('should display git application inputs', async () => { const { getByTestId, queryByTestId } = render( - wrapWithReactHookForm(, { + wrapWithReactHookForm(, { defaultValues: { name: 'test', description: 'test', @@ -65,7 +65,7 @@ describe('PageApplicationCreateGeneral', () => { it('should display git application inputs', async () => { const { getByTestId, queryByTestId } = render( - wrapWithReactHookForm(, { + wrapWithReactHookForm(, { defaultValues: { name: 'test', description: 'test', @@ -81,7 +81,7 @@ describe('PageApplicationCreateGeneral', () => { it('should display neighter git application nor container inputs', async () => { const { queryByTestId } = render( - wrapWithReactHookForm(, { + wrapWithReactHookForm(, { defaultValues: { name: 'test', description: 'test', diff --git a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-general/page-application-create-general.tsx b/libs/pages/services/src/lib/ui/page-application-create/step-general/step-general.tsx similarity index 95% rename from libs/pages/services/src/lib/ui/page-application-create/page-application-create-general/page-application-create-general.tsx rename to libs/pages/services/src/lib/ui/page-application-create/step-general/step-general.tsx index 1b0f0b7668..6586c3f9f2 100644 --- a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-general/page-application-create-general.tsx +++ b/libs/pages/services/src/lib/ui/page-application-create/step-general/step-general.tsx @@ -11,12 +11,12 @@ import { ApplicationGeneralData, OrganizationEntity } from '@qovery/shared/inter import { SERVICES_URL } from '@qovery/shared/router' import { Button, ButtonSize, ButtonStyle, Icon, InputSelect, InputText, InputTextArea } from '@qovery/shared/ui' -export interface PageApplicationCreateGeneralProps { +export interface StepGeneralProps { onSubmit: FormEventHandler organization?: OrganizationEntity } -export function PageApplicationCreateGeneral(props: PageApplicationCreateGeneralProps) { +export function StepGeneral(props: StepGeneralProps) { const { control, watch, formState } = useFormContext() const { organizationId = '', environmentId = '', projectId = '' } = useParams() const navigate = useNavigate() @@ -128,4 +128,4 @@ export function PageApplicationCreateGeneral(props: PageApplicationCreateGeneral ) } -export default PageApplicationCreateGeneral +export default StepGeneral diff --git a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-resources/page-application-create-resources.spec.tsx b/libs/pages/services/src/lib/ui/page-application-create/step-resources/step-resources.spec.tsx similarity index 67% rename from libs/pages/services/src/lib/ui/page-application-create/page-application-create-resources/page-application-create-resources.spec.tsx rename to libs/pages/services/src/lib/ui/page-application-create/step-resources/step-resources.spec.tsx index 41dcb4edc6..f8af2ae108 100644 --- a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-resources/page-application-create-resources.spec.tsx +++ b/libs/pages/services/src/lib/ui/page-application-create/step-resources/step-resources.spec.tsx @@ -2,21 +2,17 @@ import { act } from '@testing-library/react' import ResizeObserver from '__tests__/utils/resize-observer' import { render } from '__tests__/utils/setup-jest' import { wrapWithReactHookForm } from '__tests__/utils/wrap-with-react-hook-form' -import { organizationFactoryMock } from '@qovery/domains/organization' -import PageApplicationCreateResources, { - PageApplicationCreateResourcesProps, -} from './page-application-create-resources' +import StepResources, { StepResourcesProps } from './step-resources' -const mockOrganization = organizationFactoryMock(1)[0] -const props: PageApplicationCreateResourcesProps = { +const props: StepResourcesProps = { onBack: jest.fn(), onSubmit: jest.fn(), } -describe('PageApplicationCreateResources', () => { +describe('StepResources', () => { it('should render successfully', () => { const { baseElement } = render( - wrapWithReactHookForm(, { + wrapWithReactHookForm(, { defaultValues: { memory: 1024, cpu: [1], @@ -30,7 +26,7 @@ describe('PageApplicationCreateResources', () => { it('should submit the form on click', async () => { window.ResizeObserver = ResizeObserver const { getByTestId } = render( - wrapWithReactHookForm(, { + wrapWithReactHookForm(, { defaultValues: { memory: 1024, cpu: [1], diff --git a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-resources/page-application-create-resources.tsx b/libs/pages/services/src/lib/ui/page-application-create/step-resources/step-resources.tsx similarity index 87% rename from libs/pages/services/src/lib/ui/page-application-create/page-application-create-resources/page-application-create-resources.tsx rename to libs/pages/services/src/lib/ui/page-application-create/step-resources/step-resources.tsx index 3e38896cb9..409181f9fb 100644 --- a/libs/pages/services/src/lib/ui/page-application-create/page-application-create-resources/page-application-create-resources.tsx +++ b/libs/pages/services/src/lib/ui/page-application-create/step-resources/step-resources.tsx @@ -4,13 +4,13 @@ import { SettingResources } from '@qovery/shared/console-shared' import { ApplicationResourcesData } from '@qovery/shared/interfaces' import { Button, ButtonSize, ButtonStyle } from '@qovery/shared/ui' -export interface PageApplicationCreateResourcesProps { +export interface StepResourcesProps { onBack: () => void onSubmit: FormEventHandler maximumInstances?: number } -export function PageApplicationCreateResources(props: PageApplicationCreateResourcesProps) { +export function StepResources(props: StepResourcesProps) { const { formState } = useFormContext() return ( @@ -47,4 +47,4 @@ export function PageApplicationCreateResources(props: PageApplicationCreateResou ) } -export default PageApplicationCreateResources +export default StepResources diff --git a/libs/pages/services/src/lib/ui/page-application-create/page-application-post/page-application-post.spec.tsx b/libs/pages/services/src/lib/ui/page-application-create/step-summary/step-summary.spec.tsx similarity index 74% rename from libs/pages/services/src/lib/ui/page-application-create/page-application-post/page-application-post.spec.tsx rename to libs/pages/services/src/lib/ui/page-application-create/step-summary/step-summary.spec.tsx index 078f64027c..150951bf5c 100644 --- a/libs/pages/services/src/lib/ui/page-application-create/page-application-post/page-application-post.spec.tsx +++ b/libs/pages/services/src/lib/ui/page-application-create/step-summary/step-summary.spec.tsx @@ -1,8 +1,8 @@ import { render } from '__tests__/utils/setup-jest' import { ServiceTypeEnum } from '@qovery/shared/enums' -import PageApplicationPost, { PageApplicationPostProps } from './page-application-post' +import StepSummary, { StepSummaryProps } from './step-summary' -const props: PageApplicationPostProps = { +const props: StepSummaryProps = { gotoResources: jest.fn(), resourcesData: { cpu: [0.5], @@ -30,9 +30,9 @@ const props: PageApplicationPostProps = { isLoadingCreateAndDeploy: false, } -describe('PageApplicationPost', () => { +describe('StepSummary', () => { it('should render successfully', () => { - const { baseElement } = render() + const { baseElement } = render() expect(baseElement).toBeTruthy() }) }) diff --git a/libs/pages/services/src/lib/ui/page-application-create/page-application-post/page-application-post.tsx b/libs/pages/services/src/lib/ui/page-application-create/step-summary/step-summary.tsx similarity index 98% rename from libs/pages/services/src/lib/ui/page-application-create/page-application-post/page-application-post.tsx rename to libs/pages/services/src/lib/ui/page-application-create/step-summary/step-summary.tsx index f5b2f6b094..fdf71b21e2 100644 --- a/libs/pages/services/src/lib/ui/page-application-create/page-application-post/page-application-post.tsx +++ b/libs/pages/services/src/lib/ui/page-application-create/step-summary/step-summary.tsx @@ -4,7 +4,7 @@ import { ApplicationGeneralData, ApplicationResourcesData, FlowPortData } from ' import { Button, ButtonIcon, ButtonIconStyle, ButtonSize, ButtonStyle, Icon, IconAwesomeEnum } from '@qovery/shared/ui' import { upperCaseFirstLetter } from '@qovery/shared/utils' -export interface PageApplicationPostProps { +export interface StepSummaryProps { onSubmit: (withDeploy: boolean) => void onPrevious: () => void generalData: ApplicationGeneralData @@ -18,7 +18,7 @@ export interface PageApplicationPostProps { selectedRegistryName?: string } -export function PageApplicationPost(props: PageApplicationPostProps) { +export function StepSummary(props: StepSummaryProps) { return (
@@ -188,4 +188,4 @@ export function PageApplicationPost(props: PageApplicationPostProps) { ) } -export default PageApplicationPost +export default StepSummary diff --git a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-general/page-database-create-general.spec.tsx b/libs/pages/services/src/lib/ui/page-database-create/step-general/step-general.spec.tsx similarity index 57% rename from libs/pages/services/src/lib/ui/page-database-create/page-database-create-general/page-database-create-general.spec.tsx rename to libs/pages/services/src/lib/ui/page-database-create/step-general/step-general.spec.tsx index 897f7e4c0e..9d34f44e45 100644 --- a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-general/page-database-create-general.spec.tsx +++ b/libs/pages/services/src/lib/ui/page-database-create/step-general/step-general.spec.tsx @@ -1,8 +1,8 @@ import { render } from '__tests__/utils/setup-jest' import { wrapWithReactHookForm } from '__tests__/utils/wrap-with-react-hook-form' -import PageDatabaseCreateGeneral, { PageDatabaseCreateGeneralProps } from './page-database-create-general' +import StepGeneral, { StepGeneralProps } from './step-general' -const props: PageDatabaseCreateGeneralProps = { +const props: StepGeneralProps = { onSubmit: jest.fn(), databaseVersionOptions: {}, databaseTypeOptions: [], @@ -10,7 +10,7 @@ const props: PageDatabaseCreateGeneralProps = { describe('PageDatabaseCreateGeneral', () => { it('should render successfully', () => { - const { baseElement } = render(wrapWithReactHookForm()) + const { baseElement } = render(wrapWithReactHookForm()) expect(baseElement).toBeTruthy() }) }) diff --git a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-general/page-database-create-general.tsx b/libs/pages/services/src/lib/ui/page-database-create/step-general/step-general.tsx similarity index 97% rename from libs/pages/services/src/lib/ui/page-database-create/page-database-create-general/page-database-create-general.tsx rename to libs/pages/services/src/lib/ui/page-database-create/step-general/step-general.tsx index f5d5d53cdc..8138f2d673 100644 --- a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-general/page-database-create-general.tsx +++ b/libs/pages/services/src/lib/ui/page-database-create/step-general/step-general.tsx @@ -16,14 +16,14 @@ import { } from '@qovery/shared/ui' import { GeneralData } from '../../../feature/page-database-create-feature/database-creation-flow.interface' -export interface PageDatabaseCreateGeneralProps { +export interface StepGeneralProps { onSubmit: FormEventHandler databaseTypeOptions?: Value[] databaseVersionOptions?: { [Key: string]: Value[] } cloudProvider?: string } -export function PageDatabaseCreateGeneral(props: PageDatabaseCreateGeneralProps) { +export function StepGeneral(props: StepGeneralProps) { const { control, formState, watch } = useFormContext() const { organizationId = '', environmentId = '', projectId = '' } = useParams() const navigate = useNavigate() @@ -192,4 +192,4 @@ export function PageDatabaseCreateGeneral(props: PageDatabaseCreateGeneralProps) ) } -export default PageDatabaseCreateGeneral +export default StepGeneral diff --git a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-resources/page-database-create-resources.spec.tsx b/libs/pages/services/src/lib/ui/page-database-create/step-resources/step-resources.spec.tsx similarity index 54% rename from libs/pages/services/src/lib/ui/page-database-create/page-database-create-resources/page-database-create-resources.spec.tsx rename to libs/pages/services/src/lib/ui/page-database-create/step-resources/step-resources.spec.tsx index 9e1b029e68..822f4bb4c9 100644 --- a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-resources/page-database-create-resources.spec.tsx +++ b/libs/pages/services/src/lib/ui/page-database-create/step-resources/step-resources.spec.tsx @@ -1,15 +1,15 @@ import { render } from '__tests__/utils/setup-jest' import { wrapWithReactHookForm } from '__tests__/utils/wrap-with-react-hook-form' -import PageDatabaseCreateResources, { PageDatabaseCreateResourcesProps } from './page-database-create-resources' +import StepResources, { StepResourcesProps } from './step-resources' -const props: PageDatabaseCreateResourcesProps = { +const props: StepResourcesProps = { onSubmit: jest.fn(), onBack: jest.fn(), } describe('PageDatabaseCreateResources', () => { it('should render successfully', () => { - const { baseElement } = render(wrapWithReactHookForm()) + const { baseElement } = render(wrapWithReactHookForm()) expect(baseElement).toBeTruthy() }) }) diff --git a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-resources/page-database-create-resources.tsx b/libs/pages/services/src/lib/ui/page-database-create/step-resources/step-resources.tsx similarity index 87% rename from libs/pages/services/src/lib/ui/page-database-create/page-database-create-resources/page-database-create-resources.tsx rename to libs/pages/services/src/lib/ui/page-database-create/step-resources/step-resources.tsx index 9133b9c01c..e18d49710d 100644 --- a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-resources/page-database-create-resources.tsx +++ b/libs/pages/services/src/lib/ui/page-database-create/step-resources/step-resources.tsx @@ -4,12 +4,12 @@ import { SettingResources } from '@qovery/shared/console-shared' import { Button, ButtonSize, ButtonStyle } from '@qovery/shared/ui' import { ResourcesData } from '../../../feature/page-database-create-feature/database-creation-flow.interface' -export interface PageDatabaseCreateResourcesProps { +export interface StepResourcesProps { onBack: () => void onSubmit: FormEventHandler } -export function PageDatabaseCreateResources(props: PageDatabaseCreateResourcesProps) { +export function StepResources(props: StepResourcesProps) { const { formState } = useFormContext() return ( @@ -46,4 +46,4 @@ export function PageDatabaseCreateResources(props: PageDatabaseCreateResourcesPr ) } -export default PageDatabaseCreateResources +export default StepResources diff --git a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-post/page-database-create-post.spec.tsx b/libs/pages/services/src/lib/ui/page-database-create/step-summary/step-summary.spec.tsx similarity index 76% rename from libs/pages/services/src/lib/ui/page-database-create/page-database-create-post/page-database-create-post.spec.tsx rename to libs/pages/services/src/lib/ui/page-database-create/step-summary/step-summary.spec.tsx index 518c37c2ec..30345c9fd6 100644 --- a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-post/page-database-create-post.spec.tsx +++ b/libs/pages/services/src/lib/ui/page-database-create/step-summary/step-summary.spec.tsx @@ -1,9 +1,9 @@ import { render } from '__tests__/utils/setup-jest' import { wrapWithReactHookForm } from '__tests__/utils/wrap-with-react-hook-form' import { DatabaseAccessibilityEnum, DatabaseModeEnum, DatabaseTypeEnum } from 'qovery-typescript-axios' -import PageDatabaseCreatePost, { PageDatabaseCreatePostProps } from './page-database-create-post' +import StepSummary, { StepSummaryProps } from './step-summary' -const props: PageDatabaseCreatePostProps = { +const props: StepSummaryProps = { generalData: { name: 'test', accessibility: DatabaseAccessibilityEnum.PRIVATE, @@ -26,7 +26,7 @@ const props: PageDatabaseCreatePostProps = { describe('PageDatabaseCreatePost', () => { it('should render successfully', () => { - const { baseElement } = render(wrapWithReactHookForm()) + const { baseElement } = render(wrapWithReactHookForm()) expect(baseElement).toBeTruthy() }) }) diff --git a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-post/page-database-create-post.tsx b/libs/pages/services/src/lib/ui/page-database-create/step-summary/step-summary.tsx similarity index 96% rename from libs/pages/services/src/lib/ui/page-database-create/page-database-create-post/page-database-create-post.tsx rename to libs/pages/services/src/lib/ui/page-database-create/step-summary/step-summary.tsx index f4b8446ec1..a143ad8cc9 100644 --- a/libs/pages/services/src/lib/ui/page-database-create/page-database-create-post/page-database-create-post.tsx +++ b/libs/pages/services/src/lib/ui/page-database-create/step-summary/step-summary.tsx @@ -5,7 +5,7 @@ import { ResourcesData, } from '../../../feature/page-database-create-feature/database-creation-flow.interface' -export interface PageDatabaseCreatePostProps { +export interface StepSummaryProps { onSubmit: (withDeploy: boolean) => void onPrevious: () => void generalData: GeneralData @@ -16,7 +16,7 @@ export interface PageDatabaseCreatePostProps { isLoadingCreateAndDeploy: boolean } -export function PageDatabaseCreatePost(props: PageDatabaseCreatePostProps) { +export function StepSummary(props: StepSummaryProps) { return (
@@ -126,4 +126,4 @@ export function PageDatabaseCreatePost(props: PageDatabaseCreatePostProps) { ) } -export default PageDatabaseCreatePost +export default StepSummary diff --git a/libs/shared/console-shared/src/index.ts b/libs/shared/console-shared/src/index.ts index c771f8dcb3..554564184f 100644 --- a/libs/shared/console-shared/src/index.ts +++ b/libs/shared/console-shared/src/index.ts @@ -3,15 +3,15 @@ export * from './lib/job-general-settings/ui/job-general-settings' export * from './lib/entrypoint-cmd-inputs/ui/entrypoint-cmd-inputs' export * from './lib/environment-buttons-actions/ui/environment-buttons-actions' export * from './lib/setting-resources/ui/setting-resources' -export * from './lib/git-repository-settings/feature/git-repository-settings-feature' +export * from './lib/git-repository-settings/feature/git-repository-settings-feature/git-repository-settings-feature' export * from './lib/general-container-settings/ui/general-container-settings' export * from './lib/deploy-other-commit-modal/feature/deploy-other-commit-modal-feature' -export * from './lib/application-buttons-actions/ui/application-buttons-actions' -export * from './lib/database-buttons-actions/ui/database-buttons-actions' -export * from './lib/cluster-buttons-actions/ui/cluster-buttons-actions' +export * from './lib/buttons-actions/ui/application-buttons-actions/application-buttons-actions' +export * from './lib/buttons-actions/ui/database-buttons-actions/database-buttons-actions' +export * from './lib/buttons-actions/ui/cluster-buttons-actions/cluster-buttons-actions' export * from './lib/create-clone-environment-modal/feature/create-clone-environment-modal-feature' -export * from './lib/flow-create-port/ui/flow-create-port' -export * from './lib/flow-create-variable/ui/flow-create-variable' +export * from './lib/flow-create-port/ui/flow-create-port/flow-create-port' +export * from './lib/flow-create-variable/ui/flow-create-variable/flow-create-variable' export * from './lib/create-general-git-application/ui/create-general-git-application' -export * from './lib/git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature' +export * from './lib/git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature' export * from './lib/create-project-modal/feature/create-project-modal-feature' diff --git a/libs/shared/console-shared/src/lib/application-buttons-actions/ui/application-buttons-actions.spec.tsx b/libs/shared/console-shared/src/lib/buttons-actions/ui/application-buttons-actions/application-buttons-actions.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/application-buttons-actions/ui/application-buttons-actions.spec.tsx rename to libs/shared/console-shared/src/lib/buttons-actions/ui/application-buttons-actions/application-buttons-actions.spec.tsx diff --git a/libs/shared/console-shared/src/lib/application-buttons-actions/ui/application-buttons-actions.tsx b/libs/shared/console-shared/src/lib/buttons-actions/ui/application-buttons-actions/application-buttons-actions.tsx similarity index 98% rename from libs/shared/console-shared/src/lib/application-buttons-actions/ui/application-buttons-actions.tsx rename to libs/shared/console-shared/src/lib/buttons-actions/ui/application-buttons-actions/application-buttons-actions.tsx index bb30f65aaa..8b98333a62 100644 --- a/libs/shared/console-shared/src/lib/application-buttons-actions/ui/application-buttons-actions.tsx +++ b/libs/shared/console-shared/src/lib/buttons-actions/ui/application-buttons-actions/application-buttons-actions.tsx @@ -40,7 +40,7 @@ import { urlCodeEditor, } from '@qovery/shared/utils' import { AppDispatch } from '@qovery/store' -import DeployOtherCommitModalFeature from '../../deploy-other-commit-modal/feature/deploy-other-commit-modal-feature' +import DeployOtherCommitModalFeature from '../../../deploy-other-commit-modal/feature/deploy-other-commit-modal-feature' export interface ApplicationButtonsActionsProps { application: ApplicationEntity diff --git a/libs/shared/console-shared/src/lib/cluster-buttons-actions/ui/cluster-buttons-actions.spec.tsx b/libs/shared/console-shared/src/lib/buttons-actions/ui/cluster-buttons-actions/cluster-buttons-actions.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/cluster-buttons-actions/ui/cluster-buttons-actions.spec.tsx rename to libs/shared/console-shared/src/lib/buttons-actions/ui/cluster-buttons-actions/cluster-buttons-actions.spec.tsx diff --git a/libs/shared/console-shared/src/lib/cluster-buttons-actions/ui/cluster-buttons-actions.tsx b/libs/shared/console-shared/src/lib/buttons-actions/ui/cluster-buttons-actions/cluster-buttons-actions.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/cluster-buttons-actions/ui/cluster-buttons-actions.tsx rename to libs/shared/console-shared/src/lib/buttons-actions/ui/cluster-buttons-actions/cluster-buttons-actions.tsx diff --git a/libs/shared/console-shared/src/lib/database-buttons-actions/ui/database-buttons-actions.spec.tsx b/libs/shared/console-shared/src/lib/buttons-actions/ui/database-buttons-actions/database-buttons-actions.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/database-buttons-actions/ui/database-buttons-actions.spec.tsx rename to libs/shared/console-shared/src/lib/buttons-actions/ui/database-buttons-actions/database-buttons-actions.spec.tsx diff --git a/libs/shared/console-shared/src/lib/database-buttons-actions/ui/database-buttons-actions.tsx b/libs/shared/console-shared/src/lib/buttons-actions/ui/database-buttons-actions/database-buttons-actions.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/database-buttons-actions/ui/database-buttons-actions.tsx rename to libs/shared/console-shared/src/lib/buttons-actions/ui/database-buttons-actions/database-buttons-actions.tsx diff --git a/libs/shared/console-shared/src/lib/deploy-other-commit-modal/ui/deploy-other-commit-modal.tsx b/libs/shared/console-shared/src/lib/deploy-other-commit-modal/ui/deploy-other-commit-modal.tsx index be0e3241aa..0d2927e359 100644 --- a/libs/shared/console-shared/src/lib/deploy-other-commit-modal/ui/deploy-other-commit-modal.tsx +++ b/libs/shared/console-shared/src/lib/deploy-other-commit-modal/ui/deploy-other-commit-modal.tsx @@ -84,7 +84,12 @@ export function DeployOtherCommitModal(props: DeployOtherCommitModalProps) {

- +

diff --git a/libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port.spec.tsx b/libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port/flow-create-port.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port.spec.tsx rename to libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port/flow-create-port.spec.tsx diff --git a/libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port.tsx b/libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port/flow-create-port.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port.tsx rename to libs/shared/console-shared/src/lib/flow-create-port/ui/flow-create-port/flow-create-port.tsx diff --git a/libs/shared/console-shared/src/lib/flow-create-port/port-row/port-row.spec.tsx b/libs/shared/console-shared/src/lib/flow-create-port/ui/port-row/port-row.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-port/port-row/port-row.spec.tsx rename to libs/shared/console-shared/src/lib/flow-create-port/ui/port-row/port-row.spec.tsx diff --git a/libs/shared/console-shared/src/lib/flow-create-port/port-row/port-row.tsx b/libs/shared/console-shared/src/lib/flow-create-port/ui/port-row/port-row.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-port/port-row/port-row.tsx rename to libs/shared/console-shared/src/lib/flow-create-port/ui/port-row/port-row.tsx diff --git a/libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable.spec.tsx b/libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable/flow-create-variable.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable.spec.tsx rename to libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable/flow-create-variable.spec.tsx diff --git a/libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable.tsx b/libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable/flow-create-variable.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable.tsx rename to libs/shared/console-shared/src/lib/flow-create-variable/ui/flow-create-variable/flow-create-variable.tsx diff --git a/libs/shared/console-shared/src/lib/flow-create-variable/variable-row/variable-row.spec.tsx b/libs/shared/console-shared/src/lib/flow-create-variable/ui/variable-row/variable-row.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-variable/variable-row/variable-row.spec.tsx rename to libs/shared/console-shared/src/lib/flow-create-variable/ui/variable-row/variable-row.spec.tsx diff --git a/libs/shared/console-shared/src/lib/flow-create-variable/variable-row/variable-row.tsx b/libs/shared/console-shared/src/lib/flow-create-variable/ui/variable-row/variable-row.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/flow-create-variable/variable-row/variable-row.tsx rename to libs/shared/console-shared/src/lib/flow-create-variable/ui/variable-row/variable-row.tsx diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature.spec.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature.spec.tsx similarity index 92% rename from libs/shared/console-shared/src/lib/git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature.spec.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature.spec.tsx index 02235ccd6d..9295c8dba2 100644 --- a/libs/shared/console-shared/src/lib/git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature.spec.tsx +++ b/libs/shared/console-shared/src/lib/git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature.spec.tsx @@ -2,7 +2,7 @@ import { render } from '__tests__/utils/setup-jest' import { wrapWithReactHookForm } from '__tests__/utils/wrap-with-react-hook-form' import { authProviderFactoryMock } from '@qovery/domains/organization' import { upperCaseFirstLetter } from '@qovery/shared/utils' -import { authProvidersValues } from '../auth-providers-values' +import { authProvidersValues } from '../../utils/auth-providers-values' import EditGitRepositorySettingsFeature from './edit-git-repository-settings-feature' describe('GitRepositorySettingsFeature', () => { diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature.tsx similarity index 97% rename from libs/shared/console-shared/src/lib/git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature.tsx index 9c0ac12444..7e48975da9 100644 --- a/libs/shared/console-shared/src/lib/git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature.tsx +++ b/libs/shared/console-shared/src/lib/git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature.tsx @@ -18,8 +18,8 @@ import { GitApplicationEntity, JobApplicationEntity, LoadingStatus, RepositoryEn import { Icon } from '@qovery/shared/ui' import { upperCaseFirstLetter } from '@qovery/shared/utils' import { AppDispatch, RootState } from '@qovery/store' -import { authProvidersValues } from '../auth-providers-values' -import GitRepositorySettings from '../ui/git-repository-settings' +import GitRepositorySettings from '../../ui/git-repository-settings/git-repository-settings' +import { authProvidersValues } from '../../utils/auth-providers-values' export function EditGitRepositorySettingsFeature() { const { organizationId = '', applicationId = '' } = useParams() diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature.spec.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature/git-repository-settings-feature.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature.spec.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature/git-repository-settings-feature.spec.tsx diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature/git-repository-settings-feature.tsx similarity index 95% rename from libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature/git-repository-settings-feature.tsx index bd56fc632d..603ac80efc 100644 --- a/libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature.tsx +++ b/libs/shared/console-shared/src/lib/git-repository-settings/feature/git-repository-settings-feature/git-repository-settings-feature.tsx @@ -15,8 +15,8 @@ import { import { LoadingStatus, RepositoryEntity } from '@qovery/shared/interfaces' import { upperCaseFirstLetter } from '@qovery/shared/utils' import { AppDispatch, RootState } from '@qovery/store' -import { authProvidersValues } from '../auth-providers-values' -import GitRepositorySettings from '../ui/git-repository-settings' +import GitRepositorySettings from '../../ui/git-repository-settings/git-repository-settings' +import { authProvidersValues } from '../../utils/auth-providers-values' export interface GitRepositorySettingsFeatureProps { withBlockWrapper?: boolean diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/confirmation-git-modal/confirmation-git-modal.spec.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/ui/confirmation-git-modal/confirmation-git-modal.spec.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/git-repository-settings/confirmation-git-modal/confirmation-git-modal.spec.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/ui/confirmation-git-modal/confirmation-git-modal.spec.tsx diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/confirmation-git-modal/confirmation-git-modal.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/ui/confirmation-git-modal/confirmation-git-modal.tsx similarity index 96% rename from libs/shared/console-shared/src/lib/git-repository-settings/confirmation-git-modal/confirmation-git-modal.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/ui/confirmation-git-modal/confirmation-git-modal.tsx index 6314ee1896..98a546efa7 100644 --- a/libs/shared/console-shared/src/lib/git-repository-settings/confirmation-git-modal/confirmation-git-modal.tsx +++ b/libs/shared/console-shared/src/lib/git-repository-settings/ui/confirmation-git-modal/confirmation-git-modal.tsx @@ -3,7 +3,7 @@ import { Button, ButtonSize, ButtonStyle, Icon, IconAwesomeEnum, WarningBox } fr export interface ConfirmationGitModalProps { currentAuthProvider?: string - onSubmit: () => void + onSubmit?: () => void onClose: () => void } @@ -43,7 +43,7 @@ export function ConfirmationGitModal(props: ConfirmationGitModalProps) { dataTestId="submit-button" size={ButtonSize.XLARGE} onClick={() => { - props.onSubmit() + props.onSubmit && props.onSubmit() props.onClose() }} > diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings.spec.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings/git-repository-settings.spec.tsx similarity index 97% rename from libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings.spec.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings/git-repository-settings.spec.tsx index c8dc3e4a1a..2efb931e1e 100644 --- a/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings.spec.tsx +++ b/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings/git-repository-settings.spec.tsx @@ -2,8 +2,8 @@ import { act, render, screen } from '__tests__/utils/setup-jest' import { wrapWithReactHookForm } from '__tests__/utils/wrap-with-react-hook-form' import { GitProviderEnum } from 'qovery-typescript-axios' import { authProviderFactoryMock } from '@qovery/domains/organization' -import { authProvidersValues } from '../auth-providers-values' -import { GitRepositorySettings, GitRepositorySettingsProps } from './git-repository-settings' +import { authProvidersValues } from '../../utils/auth-providers-values' +import GitRepositorySettings, { GitRepositorySettingsProps } from './git-repository-settings' const mockOpenModal = jest.fn() jest.mock('@qovery/shared/ui', () => ({ diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings/git-repository-settings.tsx similarity index 98% rename from libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings/git-repository-settings.tsx index 6ff0415afa..7d4b1ea387 100644 --- a/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings.tsx +++ b/libs/shared/console-shared/src/lib/git-repository-settings/ui/git-repository-settings/git-repository-settings.tsx @@ -164,7 +164,7 @@ export function GitRepositorySettings(props: GitRepositorySettingsProps) { {})} + onSubmit={editGitSettings} /> ), }) diff --git a/libs/shared/console-shared/src/lib/git-repository-settings/auth-providers-values.tsx b/libs/shared/console-shared/src/lib/git-repository-settings/utils/auth-providers-values.tsx similarity index 100% rename from libs/shared/console-shared/src/lib/git-repository-settings/auth-providers-values.tsx rename to libs/shared/console-shared/src/lib/git-repository-settings/utils/auth-providers-values.tsx diff --git a/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx b/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx index 6914427b74..f5445de0d2 100644 --- a/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx +++ b/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx @@ -5,7 +5,7 @@ import { JobGeneralData, OrganizationEntity } from '@qovery/shared/interfaces' import { BlockContent, Icon, InputSelect, InputText } from '@qovery/shared/ui' import CreateGeneralGitApplication from '../../create-general-git-application/ui/create-general-git-application' import GeneralContainerSettings from '../../general-container-settings/ui/general-container-settings' -import EditGitRepositorySettingsFeature from '../../git-repository-settings/edit-git-repository-settings-feature/edit-git-repository-settings-feature' +import EditGitRepositorySettingsFeature from '../../git-repository-settings/feature/edit-git-repository-settings-feature/edit-git-repository-settings-feature' export interface JobGeneralSettingProps { organization?: OrganizationEntity