diff --git a/src/apps/companies/__test__/router.test.js b/src/apps/companies/__test__/router.test.js
index ea963b02f79..c619863910a 100644
--- a/src/apps/companies/__test__/router.test.js
+++ b/src/apps/companies/__test__/router.test.js
@@ -10,7 +10,6 @@ describe('Company router', () => {
'/:companyId',
'/:companyId/details',
'/:companyId/hierarchies/subsidiaries/:subsidiaryCompanyId/add',
- '/:companyId/orders',
'/:companyId/manage-company-list',
'/:companyId/subsidiaries',
])
diff --git a/src/apps/companies/controllers/orders.js b/src/apps/companies/controllers/orders.js
deleted file mode 100644
index 81ba08885ae..00000000000
--- a/src/apps/companies/controllers/orders.js
+++ /dev/null
@@ -1,18 +0,0 @@
-function renderOrders(req, res) {
- const { company, returnUrl, dnbRelatedCompaniesCount } = res.locals
-
- res.locals.title = `Orders - ${company.name} - Companies`
-
- res.render('companies/views/orders', {
- props: {
- companyId: company.id,
- returnUrl,
- dnbRelatedCompaniesCount,
- localNavItems: res.locals.localNavItems,
- },
- })
-}
-
-module.exports = {
- renderOrders,
-}
diff --git a/src/apps/companies/router.js b/src/apps/companies/router.js
index 50c9ed5e7c4..1f66efc0ca2 100644
--- a/src/apps/companies/router.js
+++ b/src/apps/companies/router.js
@@ -12,7 +12,6 @@ const {
const { renderDetails } = require('./controllers/details')
-const { renderOrders } = require('./controllers/orders')
const { archiveCompany, unarchiveCompany } = require('./controllers/archive')
const { renderSubsidiaries } = require('./controllers/subsidiaries')
@@ -82,7 +81,6 @@ router.get(urls.companies.details.route, renderDetails)
router.get(urls.companies.hierarchies.subsidiaries.add.route, addSubsidiary)
-router.get(urls.companies.orders.route, setReturnUrl, renderOrders)
router.use(
urls.companies.investments.companyInvestment.route,
setReturnUrl,
diff --git a/src/apps/companies/views/orders.njk b/src/apps/companies/views/orders.njk
deleted file mode 100644
index 0a87f7e97af..00000000000
--- a/src/apps/companies/views/orders.njk
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "_layouts/template-no-local-header.njk" %}
-
-{% block body %}
- {% component 'react-slot', {
- id: 'company-orders-collection',
- props: props
- } %}
-
-{% endblock %}
diff --git a/src/apps/routers.js b/src/apps/routers.js
index 6f744c15d4e..dac3c105423 100644
--- a/src/apps/routers.js
+++ b/src/apps/routers.js
@@ -115,6 +115,7 @@ const reactRoutes = [
'/companies/:companyId/hierarchies/ghq/remove',
'/companies/:companyId/activity',
'/companies/:companyId/contacts',
+ '/companies/:companyId/orders',
]
reactRoutes.forEach((path) => {
diff --git a/src/client/index.jsx b/src/client/index.jsx
index af94958f9f7..cc79b3c8f52 100644
--- a/src/client/index.jsx
+++ b/src/client/index.jsx
@@ -28,7 +28,6 @@ import InteractionReferralDetails from './modules/Interactions/InteractionDetail
import InvestmentProjectAdmin from '../apps/investments/views/admin/client/InvestmentProjectAdmin.jsx'
import FlashMessages from './components/LocalHeader/FlashMessages.jsx'
import PersonalisedDashboard from './components/PersonalisedDashboard'
-import CompanyOrdersCollection from '../client/modules/Omis/CollectionList/CompanyOrdersCollection'
import InvestmentProjectForm from '../apps/investments/client/projects/create/InvestmentProjectForm'
import ContactActivity from './modules/Contacts/ContactActivity/ContactActivity'
import ContactLocalHeader from './components/ContactLocalHeader'
@@ -232,9 +231,6 @@ function App() {
/>
)}
-
- {(props) => }
-
{(props) => }
diff --git a/src/client/modules/Omis/CollectionList/CompanyOrdersCollection.jsx b/src/client/modules/Omis/CollectionList/CompanyOrdersCollection.jsx
index c090649e002..c85e4b67d9a 100644
--- a/src/client/modules/Omis/CollectionList/CompanyOrdersCollection.jsx
+++ b/src/client/modules/Omis/CollectionList/CompanyOrdersCollection.jsx
@@ -5,13 +5,15 @@ import { Link, Details } from 'govuk-react'
import { H3 } from '@govuk-react/heading'
import { HEADING_SIZES } from '@govuk-react/constants'
import VisuallyHidden from '@govuk-react/visually-hidden'
+import { useParams } from 'react-router-dom'
import { ORDERS__LOADED } from '../../../actions'
import { FilteredCollectionList } from '../../../components'
import { listSkeletonPlaceholder } from '../../../components/SkeletonPlaceholder'
import { CompanyResource } from '../../../components/Resource'
-import CompanyLayout from '../../../components/Layout/CompanyLayout'
+import CompanyLayoutNew from '../../../components/Layout/CompanyLayoutNew'
+import DefaultLayoutBase from '../../../components/Layout/DefaultLayoutBase'
import {
companyOrdersState2props,
@@ -34,13 +36,14 @@ const StyledLinkHeader = styled(StyledHeader)`
`
const CompanyOrdersCollection = ({
- companyId,
payload,
optionMetadata,
selectedFilters,
returnUrl,
...props
}) => {
+ const { companyId } = useParams()
+
const collectionListTask = {
name: TASK_GET_ORDERS_LIST,
id: COMPANY_ORDERS_LIST_ID,
@@ -64,44 +67,47 @@ const CompanyOrdersCollection = ({
)
return (
-
- {(company) => (
-
- {company.archived && (
-
- Orders cannot be added to an archived company.{' '}
-
- Click here to unarchive
-
-
- )}
-
-
- )}
-
+
+
+ {(company) => (
+
+ {company.archived && (
+
+ Orders cannot be added to an archived company.{' '}
+
+ Click here to unarchive
+
+
+ )}
+
+
+ )}
+
+
)
}
diff --git a/src/client/routes.js b/src/client/routes.js
index 932b958c88a..305645b4dda 100644
--- a/src/client/routes.js
+++ b/src/client/routes.js
@@ -87,6 +87,7 @@ import SetGlobalHQ from './modules/Companies/CompanyBusinessDetails/LinkGlobalHQ
import RemoveGlobalHQ from './modules/Companies/CompanyBusinessDetails/LinkGlobalHQ/RemoveGlobalHQ'
import CompanyActivityCollection from './components/ActivityFeed/CollectionList/index'
import CompanyContactsCollection from './modules/Contacts/CollectionList/CompanyContactsCollection'
+import CompanyOrdersCollection from './modules/Omis/CollectionList/CompanyOrdersCollection'
const routes = {
companies: [
@@ -200,6 +201,11 @@ const routes = {
module: 'datahub:companies',
component: CompanyContactsCollection,
},
+ {
+ path: '/companies/:companyId/orders',
+ module: 'datahub:companies',
+ component: CompanyOrdersCollection,
+ },
],
contacts: [
{