From eda802bcf95eed1df3b64fdfca4cd24ff51521ab Mon Sep 17 00:00:00 2001 From: olav Date: Mon, 14 Feb 2022 15:36:08 +0100 Subject: [PATCH] refactor: remove unused page components (#707) * refactor: remove unused history props * refactor: remove unused page components * refactor: move history page components Co-authored-by: Fredrik Strand Oseberg --- frontend/src/component/admin/api/index.js | 10 ++-------- .../project-roles/ProjectRoles/ProjectRoles.tsx | 2 +- frontend/src/component/admin/users/UsersAdmin.tsx | 2 +- .../__tests__/application-edit-component-test.js | 3 --- .../__tests__/application-edit-component-test.jsx | 3 --- .../history/EventHistoryPage/EventHistoryPage.tsx} | 12 +++++------- .../FeatureEventHistoryPage.tsx | 9 +++++++++ frontend/src/component/menu/routes.js | 10 +++++----- .../strategies/__tests__/list-component-test.jsx | 2 -- .../__tests__/strategy-details-component-test.jsx | 1 - .../tags/TagTypeList/__tests__/TagTypeList.test.js | 2 -- frontend/src/page/client-instances/index.js | 6 ------ frontend/src/page/features/create.js | 13 ------------- frontend/src/page/history/toggle.jsx | 13 ------------- frontend/src/page/metrics/index.js | 6 ------ frontend/src/page/project/create.js | 11 ----------- frontend/src/page/project/edit.js | 14 -------------- frontend/src/page/project/environment.tsx | 6 ------ frontend/src/page/project/index.js | 11 ----------- frontend/src/page/project/view.js | 14 -------------- 20 files changed, 23 insertions(+), 127 deletions(-) rename frontend/src/{page/history/index.js => component/history/EventHistoryPage/EventHistoryPage.tsx} (56%) create mode 100644 frontend/src/component/history/FeatureEventHistoryPage/FeatureEventHistoryPage.tsx delete mode 100644 frontend/src/page/client-instances/index.js delete mode 100644 frontend/src/page/features/create.js delete mode 100644 frontend/src/page/history/toggle.jsx delete mode 100644 frontend/src/page/metrics/index.js delete mode 100644 frontend/src/page/project/create.js delete mode 100644 frontend/src/page/project/edit.js delete mode 100644 frontend/src/page/project/environment.tsx delete mode 100644 frontend/src/page/project/index.js delete mode 100644 frontend/src/page/project/view.js diff --git a/frontend/src/component/admin/api/index.js b/frontend/src/component/admin/api/index.js index 0cc902332c..c3329ca98c 100644 --- a/frontend/src/component/admin/api/index.js +++ b/frontend/src/component/admin/api/index.js @@ -1,27 +1,21 @@ -import PropTypes from 'prop-types'; import ApiTokenList from '../api-token/ApiTokenList/ApiTokenList'; import AdminMenu from '../menu/AdminMenu'; import ConditionallyRender from '../../common/ConditionallyRender'; import AccessContext from '../../../contexts/AccessContext'; import { useContext } from 'react'; -const ApiPage = ({ history }) => { +const ApiPage = () => { const { isAdmin } = useContext(AccessContext); return (
} + show={} />
); }; -ApiPage.propTypes = { - match: PropTypes.object.isRequired, - history: PropTypes.object.isRequired, -}; - export default ApiPage; diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.tsx b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.tsx index 143566ea2c..c7dfdaf2c0 100644 --- a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.tsx +++ b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.tsx @@ -18,7 +18,7 @@ const ProjectRoles = () => { return (
- + { return (
- + { fetchApplication={() => Promise.resolve({})} storeApplicationMetaData={jest.fn()} deleteApplication={jest.fn()} - history={{}} locationSettings={{ locale: 'en-GB' }} /> @@ -42,7 +41,6 @@ test('renders correctly without permission', () => { fetchApplication={() => Promise.resolve({})} storeApplicationMetaData={jest.fn()} deleteApplication={jest.fn()} - history={{}} application={{ appName: 'test-app', instances: [ @@ -104,7 +102,6 @@ test('renders correctly with permissions', () => { Promise.resolve({})} storeApplicationMetaData={jest.fn()} - history={{}} deleteApplication={jest.fn()} application={{ appName: 'test-app', diff --git a/frontend/src/component/application/__tests__/application-edit-component-test.jsx b/frontend/src/component/application/__tests__/application-edit-component-test.jsx index 3cc15544be..df423f2bd5 100644 --- a/frontend/src/component/application/__tests__/application-edit-component-test.jsx +++ b/frontend/src/component/application/__tests__/application-edit-component-test.jsx @@ -18,7 +18,6 @@ test('renders correctly if no application', () => { fetchApplication={() => Promise.resolve({})} storeApplicationMetaData={jest.fn()} deleteApplication={jest.fn()} - history={{}} locationSettings={{ locale: 'en-GB' }} /> @@ -42,7 +41,6 @@ test('renders correctly without permission', () => { fetchApplication={() => Promise.resolve({})} storeApplicationMetaData={jest.fn()} deleteApplication={jest.fn()} - history={{}} application={{ appName: 'test-app', instances: [ @@ -104,7 +102,6 @@ test('renders correctly with permissions', () => { Promise.resolve({})} storeApplicationMetaData={jest.fn()} - history={{}} deleteApplication={jest.fn()} application={{ appName: 'test-app', diff --git a/frontend/src/page/history/index.js b/frontend/src/component/history/EventHistoryPage/EventHistoryPage.tsx similarity index 56% rename from frontend/src/page/history/index.js rename to frontend/src/component/history/EventHistoryPage/EventHistoryPage.tsx index 36c8a2f149..0e6736dbde 100644 --- a/frontend/src/page/history/index.js +++ b/frontend/src/component/history/EventHistoryPage/EventHistoryPage.tsx @@ -1,11 +1,11 @@ import { Alert } from '@material-ui/lab'; import React, { useContext } from 'react'; -import { ADMIN } from '../../component/providers/AccessProvider/permissions'; -import ConditionallyRender from '../../component/common/ConditionallyRender'; -import { EventHistory } from '../../component/history/EventHistory/EventHistory'; -import AccessContext from '../../contexts/AccessContext'; +import { ADMIN } from '../../providers/AccessProvider/permissions'; +import ConditionallyRender from '../../common/ConditionallyRender'; +import AccessContext from '../../../contexts/AccessContext'; +import { EventHistory } from '../EventHistory/EventHistory'; -const HistoryPage = () => { +export const EventHistoryPage = () => { const { hasAccess } = useContext(AccessContext); return ( @@ -20,5 +20,3 @@ const HistoryPage = () => { /> ); }; - -export default HistoryPage; diff --git a/frontend/src/component/history/FeatureEventHistoryPage/FeatureEventHistoryPage.tsx b/frontend/src/component/history/FeatureEventHistoryPage/FeatureEventHistoryPage.tsx new file mode 100644 index 0000000000..2dfa48a23d --- /dev/null +++ b/frontend/src/component/history/FeatureEventHistoryPage/FeatureEventHistoryPage.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import { useParams } from 'react-router-dom'; +import { FeatureEventHistory } from '../FeatureEventHistory/FeatureEventHistory'; + +export const FeatureEventHistoryPage = () => { + const { toggleName } = useParams<{ toggleName: string }>(); + + return ; +}; diff --git a/frontend/src/component/menu/routes.js b/frontend/src/component/menu/routes.js index 618a6dd74f..f19db6938c 100644 --- a/frontend/src/component/menu/routes.js +++ b/frontend/src/component/menu/routes.js @@ -1,9 +1,7 @@ import { FeatureToggleListContainer } from '../feature/FeatureToggleList/FeatureToggleListContainer'; import { StrategyForm } from '../strategies/StrategyForm/StrategyForm'; -import { StrategyView } from '../../component/strategies/StrategyView/StrategyView'; +import { StrategyView } from '../strategies/StrategyView/StrategyView'; import { StrategiesList } from '../strategies/StrategiesList/StrategiesList'; -import HistoryPage from '../../page/history'; -import HistoryTogglePage from '../../page/history/toggle'; import { ArchiveListContainer } from '../archive/ArchiveListContainer'; import { TagTypeList } from '../tags/TagTypeList/TagTypeList'; import { AddonList } from '../addons/AddonList/AddonList'; @@ -45,6 +43,8 @@ import RedirectFeatureView from '../feature/RedirectFeatureView/RedirectFeatureV import { CreateAddon } from '../addons/CreateAddon/CreateAddon'; import { EditAddon } from '../addons/EditAddon/EditAddon'; import { CopyFeatureToggle } from '../feature/CopyFeature/CopyFeature'; +import { EventHistoryPage } from '../history/EventHistoryPage/EventHistoryPage'; +import { FeatureEventHistoryPage } from '../history/FeatureEventHistoryPage/FeatureEventHistoryPage'; export const routes = [ // Project @@ -354,7 +354,7 @@ export const routes = [ path: '/history/:toggleName', title: ':toggleName', parent: '/history', - component: HistoryTogglePage, + component: FeatureEventHistoryPage, type: 'protected', layout: 'main', menu: {}, @@ -362,7 +362,7 @@ export const routes = [ { path: '/history', title: 'Event History', - component: HistoryPage, + component: EventHistoryPage, type: 'protected', layout: 'main', menu: { adminSettings: true }, diff --git a/frontend/src/component/strategies/__tests__/list-component-test.jsx b/frontend/src/component/strategies/__tests__/list-component-test.jsx index 3258a44810..1c5274cc63 100644 --- a/frontend/src/component/strategies/__tests__/list-component-test.jsx +++ b/frontend/src/component/strategies/__tests__/list-component-test.jsx @@ -23,7 +23,6 @@ test('renders correctly with one strategy', () => { removeStrategy={jest.fn()} deprecateStrategy={jest.fn()} reactivateStrategy={jest.fn()} - history={{}} /> @@ -50,7 +49,6 @@ test('renders correctly with one strategy without permissions', () => { removeStrategy={jest.fn()} deprecateStrategy={jest.fn()} reactivateStrategy={jest.fn()} - history={{}} /> diff --git a/frontend/src/component/strategies/__tests__/strategy-details-component-test.jsx b/frontend/src/component/strategies/__tests__/strategy-details-component-test.jsx index d16d440b57..e8e8071ca4 100644 --- a/frontend/src/component/strategies/__tests__/strategy-details-component-test.jsx +++ b/frontend/src/component/strategies/__tests__/strategy-details-component-test.jsx @@ -45,7 +45,6 @@ test('renders correctly with one strategy', () => { fetchStrategies={jest.fn()} fetchApplications={jest.fn()} fetchFeatureToggles={jest.fn()} - history={{}} /> diff --git a/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js b/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js index d74d331b8b..a2b713fbb1 100644 --- a/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js +++ b/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js @@ -22,7 +22,6 @@ test('renders an empty list correctly', () => { tagTypes={[]} fetchTagTypes={jest.fn()} removeTagType={jest.fn()} - history={{}} /> @@ -53,7 +52,6 @@ test('renders a list with elements correctly', () => { ]} fetchTagTypes={jest.fn()} removeTagType={jest.fn()} - history={{}} /> diff --git a/frontend/src/page/client-instances/index.js b/frontend/src/page/client-instances/index.js deleted file mode 100644 index 75b27b52da..0000000000 --- a/frontend/src/page/client-instances/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react'; -import ClientInstance from '../../component/client-instance/client-instance-container'; - -const render = () => ; - -export default render; diff --git a/frontend/src/page/features/create.js b/frontend/src/page/features/create.js deleted file mode 100644 index fddd1d640d..0000000000 --- a/frontend/src/page/features/create.js +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -import CreateFeature from '../../component/feature/create/CreateFeature'; -import PropTypes from 'prop-types'; - -const render = ({ history }) => ( - -); - -render.propTypes = { - history: PropTypes.object.isRequired, -}; - -export default render; diff --git a/frontend/src/page/history/toggle.jsx b/frontend/src/page/history/toggle.jsx deleted file mode 100644 index b89257af1c..0000000000 --- a/frontend/src/page/history/toggle.jsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { FeatureEventHistory } from '../../component/history/FeatureEventHistory/FeatureEventHistory'; - -const render = ({ match: { params } }) => ( - -); - -render.propTypes = { - match: PropTypes.object.isRequired, -}; - -export default render; diff --git a/frontend/src/page/metrics/index.js b/frontend/src/page/metrics/index.js deleted file mode 100644 index c18da93b5c..0000000000 --- a/frontend/src/page/metrics/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react'; -import Metrics from '../../component/metrics/metrics-container'; - -const render = () => ; - -export default render; diff --git a/frontend/src/page/project/create.js b/frontend/src/page/project/create.js deleted file mode 100644 index 7c898561d6..0000000000 --- a/frontend/src/page/project/create.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import CreateProject from '../../component/project/create-project-container'; -import PropTypes from 'prop-types'; - -const render = ({ history }) => ; - -render.propTypes = { - history: PropTypes.object.isRequired, -}; - -export default render; diff --git a/frontend/src/page/project/edit.js b/frontend/src/page/project/edit.js deleted file mode 100644 index d66b6d3fdc..0000000000 --- a/frontend/src/page/project/edit.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import EditProject from '../../component/project/edit-project-container'; -import PropTypes from 'prop-types'; - -const render = ({ match: { params }, history }) => ( - -); - -render.propTypes = { - match: PropTypes.object.isRequired, - history: PropTypes.object.isRequired, -}; - -export default render; diff --git a/frontend/src/page/project/environment.tsx b/frontend/src/page/project/environment.tsx deleted file mode 100644 index b6beca81da..0000000000 --- a/frontend/src/page/project/environment.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react'; -import ProjectEnvironment from '../../component/project/ProjectEnvironment/ProjectEnvironment'; - -const ProjectEnvironmentConfigPage = () => ; - -export default ProjectEnvironmentConfigPage; diff --git a/frontend/src/page/project/index.js b/frontend/src/page/project/index.js deleted file mode 100644 index aea5f5818e..0000000000 --- a/frontend/src/page/project/index.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import ProjectList from '../../component/project/ProjectList/ProjectList'; -import PropTypes from 'prop-types'; - -const render = ({ history }) => ; - -render.propTypes = { - history: PropTypes.object.isRequired, -}; - -export default render; diff --git a/frontend/src/page/project/view.js b/frontend/src/page/project/view.js deleted file mode 100644 index a9565d331d..0000000000 --- a/frontend/src/page/project/view.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import ViewProject from '../../component/project/ProjectView'; -import PropTypes from 'prop-types'; - -const render = ({ match: { params }, history }) => ( - -); - -render.propTypes = { - match: PropTypes.object.isRequired, - history: PropTypes.object.isRequired, -}; - -export default render;