Merge pull request #6439 from uktrade/feature/refactor-company-collec…

…tion-lists

Refactor company collection lists

src/apps/companies/__test__/router.test.js

@@ -10,8 +10,6 @@ describe('Company router', () => {
       '/:companyId',
       '/:companyId/details',
       '/:companyId/hierarchies/subsidiaries/:subsidiaryCompanyId/add',
-      '/:companyId/contacts',
-      '/:companyId/orders',
       '/:companyId/manage-company-list',
       '/:companyId/subsidiaries',
     ])

src/apps/companies/apps/activity-feed/__test__/router.test.js

@@ -3,9 +3,6 @@ const router = require('../router')
 describe('Activity feed routes', () => {
   it('should define all routes', () => {
     const paths = router.stack.filter((r) => r.route).map((r) => r.route.path)
-    expect(paths).to.deep.equal([
-      '/:companyId/activity',
-      '/:companyId/activity/data',
-    ])
+    expect(paths).to.deep.equal(['/:companyId/activity/data'])
   })
 })

src/apps/companies/apps/activity-feed/controllers.js

@@ -33,40 +33,6 @@ const {
 } = require('./transformers')
 const dataHubCompanyActivityQuery = require('./es-queries/data-hub-company-activity-query')
 
-async function renderActivityFeed(req, res, next) {
-  const { company, dnbHierarchyCount, dnbRelatedCompaniesCount } = res.locals
-
-  res.locals.title = `Activities - ${company.name} - Companies`
-
-  try {
-    const contentProps = company.archived
-      ? {
-          companyId: company.id,
-          flashMessages: res.locals.getMessages(),
-          localNavItems: res.locals.localNavItems,
-          company,
-        }
-      : {
-          companyId: company.id,
-          flashMessages: res.locals.getMessages(),
-          isOverview: false,
-          localNavItems: res.locals.localNavItems,
-          dnbHierarchyCount,
-          dnbRelatedCompaniesCount,
-          company,
-        }
-
-    const props = {
-      ...contentProps,
-      apiEndpoint: urls.companies.activity.data(company.id),
-    }
-
-    res.render('companies/apps/activity-feed/views/client-container', { props })
-  } catch (error) {
-    next(error)
-  }
-}
-
 function getContactFromEmailAddress(emailAddress, contacts) {
   const contact = contacts.find((contact) => contact.email === emailAddress)
   return contact
@@ -674,7 +640,6 @@ async function fetchAllActivityFeedEvents(req, res, next) {
 }
 
 module.exports = {
-  renderActivityFeed,
   fetchActivityFeedHandler,
   fetchActivitiesForContact,
   fetchAventriEvent,

src/apps/companies/apps/activity-feed/router.js

@@ -2,12 +2,8 @@ const router = require('express').Router()
 
 const urls = require('../../../../lib/urls')
 const { convertQueryTypes } = require('./translators')
-const {
-  renderActivityFeed,
-  fetchActivityFeedHandler,
-} = require('./controllers')
+const { fetchActivityFeedHandler } = require('./controllers')
 
-router.get(urls.companies.activity.index.route, renderActivityFeed)
 router.get(
   urls.companies.activity.data.route,
   convertQueryTypes,

src/apps/companies/router.js

@@ -12,9 +12,7 @@ const {
 
 const { renderDetails } = require('./controllers/details')
 
-const { renderOrders } = require('./controllers/orders')
 const { archiveCompany, unarchiveCompany } = require('./controllers/archive')
-const { renderContacts } = require('./controllers/contacts')
 const { renderSubsidiaries } = require('./controllers/subsidiaries')
 
 const {
@@ -83,9 +81,6 @@ router.get(urls.companies.details.route, renderDetails)
 
 router.get(urls.companies.hierarchies.subsidiaries.add.route, addSubsidiary)
 
-router.get(urls.companies.contacts.route, setReturnUrl, renderContacts)
-
-router.get(urls.companies.orders.route, setReturnUrl, renderOrders)
 router.use(
   urls.companies.investments.companyInvestment.route,
   setReturnUrl,

src/apps/routers.js

@@ -113,6 +113,9 @@ const reactRoutes = [
   '/companies/:companyId/business-details',
   '/companies/:companyId/hierarchies/ghq/:globalHqId/add',
   '/companies/:companyId/hierarchies/ghq/remove',
+  '/companies/:companyId/activity',
+  '/companies/:companyId/contacts',
+  '/companies/:companyId/orders',
 ]
 
 reactRoutes.forEach((path) => {