From 1b9cf6df7b2d5f148dc07d011783749ae3fc6a9e Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Tue, 20 Apr 2021 16:15:47 +0200 Subject: [PATCH] src: Remove SmartComponents/PresentationalComponents split Just have a directory per component. --- src/App.js | 2 +- .../CreateImageWizard/CreateImageWizard.js | 0 .../CreateImageWizard/CreateImageWizard.scss | 0 .../CreateImageWizard/ImageWizardFooter.js | 0 .../CreateImageWizard/ImageWizardFooter.scss | 0 .../CreateImageWizard/WizardStepImageOutput.js | 0 .../CreateImageWizard/WizardStepImageOutput.scss | 0 .../CreateImageWizard/WizardStepPackages.js | 0 .../CreateImageWizard/WizardStepRegistration.js | 0 .../CreateImageWizard/WizardStepReview.js | 0 .../CreateImageWizard/WizardStepReview.scss | 0 .../CreateImageWizard/WizardStepUploadAWS.js | 0 .../CreateImageWizard/WizardStepUploadAzure.js | 0 .../CreateImageWizard/WizardStepUploadAzure.scss | 0 .../CreateImageWizard/WizardStepUploadGoogle.js | 0 .../ImagesTable/ImageBuildStatus.js | 0 .../ImagesTable/ImageBuildStatus.scss | 0 .../ImagesTable/ImagesTable.js | 6 +++--- .../ImagesTable/Release.js | 0 .../ImagesTable/Upload.js | 0 .../LandingPage/LandingPage.js | 0 .../LandingPage/LandingPage.scss | 0 .../LandingPage/PermissionDenied.js | 0 src/Routes.js | 4 ++-- .../CreateImageWizard/CreateImageWizard.test.js | 2 +- .../ImagesTable/ImagesTable.test.js | 6 +++--- .../LandingPage/LandingPage.test.js | 2 +- src/test/{SmartComponents => }/redux/actions.test.js | 4 ++-- src/test/{SmartComponents => }/redux/reducers.test.js | 4 ++-- 29 files changed, 15 insertions(+), 15 deletions(-) rename src/{SmartComponents => Components}/CreateImageWizard/CreateImageWizard.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/CreateImageWizard.scss (100%) rename src/{SmartComponents => Components}/CreateImageWizard/ImageWizardFooter.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/ImageWizardFooter.scss (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepImageOutput.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepImageOutput.scss (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepPackages.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepRegistration.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepReview.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepReview.scss (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepUploadAWS.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepUploadAzure.js (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepUploadAzure.scss (100%) rename src/{SmartComponents => Components}/CreateImageWizard/WizardStepUploadGoogle.js (100%) rename src/{PresentationalComponents => Components}/ImagesTable/ImageBuildStatus.js (100%) rename src/{PresentationalComponents => Components}/ImagesTable/ImageBuildStatus.scss (100%) rename src/{SmartComponents => Components}/ImagesTable/ImagesTable.js (96%) rename src/{PresentationalComponents => Components}/ImagesTable/Release.js (100%) rename src/{PresentationalComponents => Components}/ImagesTable/Upload.js (100%) rename src/{SmartComponents => Components}/LandingPage/LandingPage.js (100%) rename src/{SmartComponents => Components}/LandingPage/LandingPage.scss (100%) rename src/{PresentationalComponents => Components}/LandingPage/PermissionDenied.js (100%) rename src/test/{SmartComponents => Components}/CreateImageWizard/CreateImageWizard.test.js (99%) rename src/test/{SmartComponents => Components}/ImagesTable/ImagesTable.test.js (97%) rename src/test/{SmartComponents => Components}/LandingPage/LandingPage.test.js (91%) rename src/test/{SmartComponents => }/redux/actions.test.js (90%) rename src/test/{SmartComponents => }/redux/reducers.test.js (95%) diff --git a/src/App.js b/src/App.js index bcb083dd..625218c6 100644 --- a/src/App.js +++ b/src/App.js @@ -7,7 +7,7 @@ import './App.scss'; import { NotificationsPortal } from '@redhat-cloud-services/frontend-components-notifications'; import api from './api.js'; -import PermissionDenied from './PresentationalComponents/LandingPage/PermissionDenied'; +import PermissionDenied from './Components/LandingPage/PermissionDenied'; class App extends Component { constructor() { diff --git a/src/SmartComponents/CreateImageWizard/CreateImageWizard.js b/src/Components/CreateImageWizard/CreateImageWizard.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/CreateImageWizard.js rename to src/Components/CreateImageWizard/CreateImageWizard.js diff --git a/src/SmartComponents/CreateImageWizard/CreateImageWizard.scss b/src/Components/CreateImageWizard/CreateImageWizard.scss similarity index 100% rename from src/SmartComponents/CreateImageWizard/CreateImageWizard.scss rename to src/Components/CreateImageWizard/CreateImageWizard.scss diff --git a/src/SmartComponents/CreateImageWizard/ImageWizardFooter.js b/src/Components/CreateImageWizard/ImageWizardFooter.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/ImageWizardFooter.js rename to src/Components/CreateImageWizard/ImageWizardFooter.js diff --git a/src/SmartComponents/CreateImageWizard/ImageWizardFooter.scss b/src/Components/CreateImageWizard/ImageWizardFooter.scss similarity index 100% rename from src/SmartComponents/CreateImageWizard/ImageWizardFooter.scss rename to src/Components/CreateImageWizard/ImageWizardFooter.scss diff --git a/src/SmartComponents/CreateImageWizard/WizardStepImageOutput.js b/src/Components/CreateImageWizard/WizardStepImageOutput.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepImageOutput.js rename to src/Components/CreateImageWizard/WizardStepImageOutput.js diff --git a/src/SmartComponents/CreateImageWizard/WizardStepImageOutput.scss b/src/Components/CreateImageWizard/WizardStepImageOutput.scss similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepImageOutput.scss rename to src/Components/CreateImageWizard/WizardStepImageOutput.scss diff --git a/src/SmartComponents/CreateImageWizard/WizardStepPackages.js b/src/Components/CreateImageWizard/WizardStepPackages.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepPackages.js rename to src/Components/CreateImageWizard/WizardStepPackages.js diff --git a/src/SmartComponents/CreateImageWizard/WizardStepRegistration.js b/src/Components/CreateImageWizard/WizardStepRegistration.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepRegistration.js rename to src/Components/CreateImageWizard/WizardStepRegistration.js diff --git a/src/SmartComponents/CreateImageWizard/WizardStepReview.js b/src/Components/CreateImageWizard/WizardStepReview.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepReview.js rename to src/Components/CreateImageWizard/WizardStepReview.js diff --git a/src/SmartComponents/CreateImageWizard/WizardStepReview.scss b/src/Components/CreateImageWizard/WizardStepReview.scss similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepReview.scss rename to src/Components/CreateImageWizard/WizardStepReview.scss diff --git a/src/SmartComponents/CreateImageWizard/WizardStepUploadAWS.js b/src/Components/CreateImageWizard/WizardStepUploadAWS.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepUploadAWS.js rename to src/Components/CreateImageWizard/WizardStepUploadAWS.js diff --git a/src/SmartComponents/CreateImageWizard/WizardStepUploadAzure.js b/src/Components/CreateImageWizard/WizardStepUploadAzure.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepUploadAzure.js rename to src/Components/CreateImageWizard/WizardStepUploadAzure.js diff --git a/src/SmartComponents/CreateImageWizard/WizardStepUploadAzure.scss b/src/Components/CreateImageWizard/WizardStepUploadAzure.scss similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepUploadAzure.scss rename to src/Components/CreateImageWizard/WizardStepUploadAzure.scss diff --git a/src/SmartComponents/CreateImageWizard/WizardStepUploadGoogle.js b/src/Components/CreateImageWizard/WizardStepUploadGoogle.js similarity index 100% rename from src/SmartComponents/CreateImageWizard/WizardStepUploadGoogle.js rename to src/Components/CreateImageWizard/WizardStepUploadGoogle.js diff --git a/src/PresentationalComponents/ImagesTable/ImageBuildStatus.js b/src/Components/ImagesTable/ImageBuildStatus.js similarity index 100% rename from src/PresentationalComponents/ImagesTable/ImageBuildStatus.js rename to src/Components/ImagesTable/ImageBuildStatus.js diff --git a/src/PresentationalComponents/ImagesTable/ImageBuildStatus.scss b/src/Components/ImagesTable/ImageBuildStatus.scss similarity index 100% rename from src/PresentationalComponents/ImagesTable/ImageBuildStatus.scss rename to src/Components/ImagesTable/ImageBuildStatus.scss diff --git a/src/SmartComponents/ImagesTable/ImagesTable.js b/src/Components/ImagesTable/ImagesTable.js similarity index 96% rename from src/SmartComponents/ImagesTable/ImagesTable.js rename to src/Components/ImagesTable/ImagesTable.js index 3d3e4ed2..aff71154 100644 --- a/src/SmartComponents/ImagesTable/ImagesTable.js +++ b/src/Components/ImagesTable/ImagesTable.js @@ -11,9 +11,9 @@ import { Button, Title } from '@patternfly/react-core'; import { ExternalLinkAltIcon, PlusCircleIcon } from '@patternfly/react-icons'; -import ImageBuildStatus from '../../PresentationalComponents/ImagesTable/ImageBuildStatus'; -import Release from '../../PresentationalComponents/ImagesTable/Release'; -import Upload from '../../PresentationalComponents/ImagesTable/Upload'; +import ImageBuildStatus from './ImageBuildStatus'; +import Release from './Release'; +import Upload from './Upload'; import api from '../../api.js'; diff --git a/src/PresentationalComponents/ImagesTable/Release.js b/src/Components/ImagesTable/Release.js similarity index 100% rename from src/PresentationalComponents/ImagesTable/Release.js rename to src/Components/ImagesTable/Release.js diff --git a/src/PresentationalComponents/ImagesTable/Upload.js b/src/Components/ImagesTable/Upload.js similarity index 100% rename from src/PresentationalComponents/ImagesTable/Upload.js rename to src/Components/ImagesTable/Upload.js diff --git a/src/SmartComponents/LandingPage/LandingPage.js b/src/Components/LandingPage/LandingPage.js similarity index 100% rename from src/SmartComponents/LandingPage/LandingPage.js rename to src/Components/LandingPage/LandingPage.js diff --git a/src/SmartComponents/LandingPage/LandingPage.scss b/src/Components/LandingPage/LandingPage.scss similarity index 100% rename from src/SmartComponents/LandingPage/LandingPage.scss rename to src/Components/LandingPage/LandingPage.scss diff --git a/src/PresentationalComponents/LandingPage/PermissionDenied.js b/src/Components/LandingPage/PermissionDenied.js similarity index 100% rename from src/PresentationalComponents/LandingPage/PermissionDenied.js rename to src/Components/LandingPage/PermissionDenied.js diff --git a/src/Routes.js b/src/Routes.js index 2036092d..a4fb9c16 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React from 'react'; import asyncComponent from './Utilities/asyncComponent'; -const LandingPage = asyncComponent(() => import('./SmartComponents/LandingPage/LandingPage')); -const CreateImageWizard = asyncComponent(() => import('./SmartComponents/CreateImageWizard/CreateImageWizard')); +const LandingPage = asyncComponent(() => import('./Components/LandingPage/LandingPage')); +const CreateImageWizard = asyncComponent(() => import('./Components/CreateImageWizard/CreateImageWizard')); const InsightsRoute = ({ component: Component, title, ...rest }) => { title ? document.title = title : null; diff --git a/src/test/SmartComponents/CreateImageWizard/CreateImageWizard.test.js b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js similarity index 99% rename from src/test/SmartComponents/CreateImageWizard/CreateImageWizard.test.js rename to src/test/Components/CreateImageWizard/CreateImageWizard.test.js index 3ab6c17a..caa29464 100644 --- a/src/test/SmartComponents/CreateImageWizard/CreateImageWizard.test.js +++ b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js @@ -4,7 +4,7 @@ import React from 'react'; import { screen, getByText, waitFor, waitForElementToBeRemoved, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { renderWithReduxRouter } from '../../testUtils'; -import CreateImageWizard from '../../../SmartComponents/CreateImageWizard/CreateImageWizard'; +import CreateImageWizard from '../../../Components/CreateImageWizard/CreateImageWizard'; import api from '../../../api.js'; let historySpy = undefined; diff --git a/src/test/SmartComponents/ImagesTable/ImagesTable.test.js b/src/test/Components/ImagesTable/ImagesTable.test.js similarity index 97% rename from src/test/SmartComponents/ImagesTable/ImagesTable.test.js rename to src/test/Components/ImagesTable/ImagesTable.test.js index 1278e8a8..a4d7b011 100644 --- a/src/test/SmartComponents/ImagesTable/ImagesTable.test.js +++ b/src/test/Components/ImagesTable/ImagesTable.test.js @@ -1,9 +1,9 @@ import React from 'react'; import { screen, render } from '@testing-library/react'; import { renderWithReduxRouter } from '../../testUtils'; -import ImagesTable from '../../../SmartComponents/ImagesTable/ImagesTable'; -import ImageBuildStatus from '../../../PresentationalComponents/ImagesTable/ImageBuildStatus'; -import Upload from '../../../PresentationalComponents/ImagesTable/Upload'; +import ImagesTable from '../../../Components/ImagesTable/ImagesTable'; +import ImageBuildStatus from '../../../Components/ImagesTable/ImageBuildStatus'; +import Upload from '../../../Components/ImagesTable/Upload'; import '@testing-library/jest-dom'; const store = { diff --git a/src/test/SmartComponents/LandingPage/LandingPage.test.js b/src/test/Components/LandingPage/LandingPage.test.js similarity index 91% rename from src/test/SmartComponents/LandingPage/LandingPage.test.js rename to src/test/Components/LandingPage/LandingPage.test.js index 780d696b..2f015151 100644 --- a/src/test/SmartComponents/LandingPage/LandingPage.test.js +++ b/src/test/Components/LandingPage/LandingPage.test.js @@ -1,7 +1,7 @@ import React from 'react'; import { screen } from '@testing-library/react'; import { renderWithReduxRouter } from '../../testUtils'; -import LandingPage from '../../../SmartComponents/LandingPage/LandingPage'; +import LandingPage from '../../../Components/LandingPage/LandingPage'; import api from '../../../api.js'; describe('Landing Page', () => { diff --git a/src/test/SmartComponents/redux/actions.test.js b/src/test/redux/actions.test.js similarity index 90% rename from src/test/SmartComponents/redux/actions.test.js rename to src/test/redux/actions.test.js index dbeef9ca..49b21acd 100644 --- a/src/test/SmartComponents/redux/actions.test.js +++ b/src/test/redux/actions.test.js @@ -1,5 +1,5 @@ -import { actions } from '../../../store/actions'; -import types from '../../../store/types'; +import { actions } from '../../store/actions'; +import types from '../../store/types'; const compose = { '77e4c693-0497-4b85-936d-b2a3ad69571b': { diff --git a/src/test/SmartComponents/redux/reducers.test.js b/src/test/redux/reducers.test.js similarity index 95% rename from src/test/SmartComponents/redux/reducers.test.js rename to src/test/redux/reducers.test.js index e685f6e6..00a768a2 100644 --- a/src/test/SmartComponents/redux/reducers.test.js +++ b/src/test/redux/reducers.test.js @@ -1,5 +1,5 @@ -import { composes } from '../../../store/reducers/composes'; -import types from '../../../store/types'; +import { composes } from '../../store/reducers/composes'; +import types from '../../store/types'; const compose = { id: '77e4c693-0497-4b85-936d-b2a3ad69571b',