diff --git a/src/apps/companies/constants.js b/src/apps/companies/constants.js
index 0d555a249ea..ed1f0709a91 100644
--- a/src/apps/companies/constants.js
+++ b/src/apps/companies/constants.js
@@ -81,7 +81,6 @@ const QUERY_FIELDS = Object.values(QUERY_FIELDS_MAP)
const NONE_TEXT = 'None'
const NOT_SET_TEXT = 'Not set'
const NOT_AVAILABLE_TEXT = 'Not available'
-const COMPANY_DISSOLVED_OPTION = 'Company is dissolved'
module.exports = {
GLOBAL_NAV_ITEM,
@@ -92,5 +91,4 @@ module.exports = {
NONE_TEXT,
NOT_SET_TEXT,
NOT_AVAILABLE_TEXT,
- COMPANY_DISSOLVED_OPTION,
}
diff --git a/src/apps/companies/labels.js b/src/apps/companies/labels.js
index 7373ee32027..1ae0e12a5b9 100644
--- a/src/apps/companies/labels.js
+++ b/src/apps/companies/labels.js
@@ -103,25 +103,6 @@ const exportPotentialLabels = {
},
}
-const exportSegmentsLabels = {
- hep: 'High export potential',
- 'non-hep': 'Not high export potential',
-}
-const exportSubSegmentsLabels = {
- sustain_nurture_and_grow: 'Sustain: nurture & grow',
- sustain_develop_export_capability: 'Sustain: develop export capability',
- sustain_communicate_benefits: 'Sustain: communicate benefits',
- sustain_increase_competitiveness: 'Sustain: increase competitiveness',
- reassure_nurture_and_grow: 'Reassure: nurture & grow',
- reassure_develop_export_capability: 'Reassure: develop export capability',
- reassure_leave_be: 'Reassure: leave be',
- reassure_change_the_game: 'Reassure: change the game',
- promote_develop_export_capability: 'Promote: develop export capability',
- promote_communicate_benefits: 'Promote: communicate benefits',
- promote_change_the_game: 'Promote: change the game',
- challenge: 'Challenge',
-}
-
module.exports = {
companyDetailsLabels,
companyTypeOptions,
@@ -132,6 +113,4 @@ module.exports = {
aboutLabels,
businessHierarchyLabels,
exportPotentialLabels,
- exportSegmentsLabels,
- exportSubSegmentsLabels,
}
diff --git a/src/client/modules/Companies/CollectionList/labels.js b/src/client/modules/Companies/CollectionList/labels.js
index b35a359c9bf..fe6baf37bcd 100644
--- a/src/client/modules/Companies/CollectionList/labels.js
+++ b/src/client/modules/Companies/CollectionList/labels.js
@@ -112,25 +112,6 @@ const exportPotentialLabels = {
},
}
-const exportSegmentsLabels = {
- hep: 'High export potential',
- 'non-hep': 'Not high export potential',
-}
-const exportSubSegmentsLabels = {
- sustain_nurture_and_grow: 'Sustain: nurture & grow',
- sustain_develop_export_capability: 'Sustain: develop export capability',
- sustain_communicate_benefits: 'Sustain: communicate benefits',
- sustain_increase_competitiveness: 'Sustain: increase competitiveness',
- reassure_nurture_and_grow: 'Reassure: nurture & grow',
- reassure_develop_export_capability: 'Reassure: develop export capability',
- reassure_leave_be: 'Reassure: leave be',
- reassure_change_the_game: 'Reassure: change the game',
- promote_develop_export_capability: 'Promote: develop export capability',
- promote_communicate_benefits: 'Promote: communicate benefits',
- promote_change_the_game: 'Promote: change the game',
- challenge: 'Challenge',
-}
-
export default {
companyDetailsLabels,
companyTypeOptions,
@@ -142,6 +123,4 @@ export default {
aboutLabels,
businessHierarchyLabels,
exportPotentialLabels,
- exportSegmentsLabels,
- exportSubSegmentsLabels,
}
diff --git a/src/apps/companies/apps/business-details/client/CompanyBusinessDetails.jsx b/src/client/modules/Companies/CompanyBusinessDetails/CompanyBusinessDetails.jsx
similarity index 91%
rename from src/apps/companies/apps/business-details/client/CompanyBusinessDetails.jsx
rename to src/client/modules/Companies/CompanyBusinessDetails/CompanyBusinessDetails.jsx
index 8507b8d6020..d9804e3c9d6 100644
--- a/src/apps/companies/apps/business-details/client/CompanyBusinessDetails.jsx
+++ b/src/client/modules/Companies/CompanyBusinessDetails/CompanyBusinessDetails.jsx
@@ -14,18 +14,19 @@ import SectionHierarchy from './SectionHierarchy'
import SectionRegion from './SectionRegion'
import SectionSector from './SectionSector'
import SectionOneList from './SectionOneList'
-import ArchiveForm from '../../../../../client/components/ArchiveForm'
-import { StatusMessage } from '../../../../../client/components/'
-import { COMPANY_DISSOLVED_OPTION } from '../../../constants'
+import ArchiveForm from '../../../components/ArchiveForm'
+import { StatusMessage } from '../../../components'
import {
CompanyResource,
RelatedCompaniesCountResource,
-} from '../../../../../client/components/Resource'
-import CompanyLayoutNew from '../../../../../client/components/Layout/CompanyLayoutNew'
-import urls from '../../../../../lib/urls'
+} from '../../../components/Resource'
+import CompanyLayoutNew from '../../../components/Layout/CompanyLayoutNew'
+import Task from '../../../components/Task'
+import urls from '../../../../lib/urls'
+import { format } from '../../../utils/date'
import {
- ID as CHECK_PENDING_REQUEST_ID,
+ ID,
TASK_ARCHIVE_COMPANY,
TASK_GET_GLOBAL_ULTIMATE,
state2props,
@@ -33,10 +34,7 @@ import {
import {
COMPANIES__GLOBAL_ULTIMATE_LOADED,
DNB__CHECK_PENDING_REQUEST,
-} from '../../../../../client/actions'
-import Task from '../../../../../client/components/Task'
-
-const { format } = require('../../../../../client/utils/date')
+} from '../../../actions'
const StyledRoot = styled('div')`
& > table {
@@ -59,6 +57,8 @@ const canEditOneList = (permissions) =>
'company.change_one_list_tier_and_global_account_manager'
)
+const COMPANY_DISSOLVED_OPTION = 'Company is dissolved'
+
const CompanyBusinessDetails = ({
globalUltimate,
isDnbPending,
@@ -94,7 +94,7 @@ const CompanyBusinessDetails = ({
)}
-
+
{globalUltimate.name}
diff --git a/src/apps/companies/apps/business-details/client/SectionOneList.jsx b/src/client/modules/Companies/CompanyBusinessDetails/SectionOneList.jsx
similarity index 94%
rename from src/apps/companies/apps/business-details/client/SectionOneList.jsx
rename to src/client/modules/Companies/CompanyBusinessDetails/SectionOneList.jsx
index ed4291e01a0..9a10ad8b1bf 100644
--- a/src/apps/companies/apps/business-details/client/SectionOneList.jsx
+++ b/src/client/modules/Companies/CompanyBusinessDetails/SectionOneList.jsx
@@ -4,8 +4,8 @@ import Link from '@govuk-react/link'
import styled from 'styled-components'
import { SPACING_POINTS } from '@govuk-react/constants'
-import { SummaryTable } from '../../../../../client/components/'
-import urls from '../../../../../lib/urls'
+import { SummaryTable } from '../../../components'
+import urls from '../../../../lib/urls'
const StyledSummaryFooterLink = styled(Link)`
margin-top: -${SPACING_POINTS[7]}px;
diff --git a/src/apps/companies/apps/business-details/client/SectionRegion.jsx b/src/client/modules/Companies/CompanyBusinessDetails/SectionRegion.jsx
similarity index 86%
rename from src/apps/companies/apps/business-details/client/SectionRegion.jsx
rename to src/client/modules/Companies/CompanyBusinessDetails/SectionRegion.jsx
index 8fd9b0f6eab..26303505704 100644
--- a/src/apps/companies/apps/business-details/client/SectionRegion.jsx
+++ b/src/client/modules/Companies/CompanyBusinessDetails/SectionRegion.jsx
@@ -2,8 +2,8 @@ import React from 'react'
import PropTypes from 'prop-types'
import Link from '@govuk-react/link'
-import { SummaryTable } from '../../../../../client/components/'
-import urls from '../../../../../lib/urls'
+import { SummaryTable } from '../../../components'
+import urls from '../../../../lib/urls'
const SectionRegion = ({ company, isArchived }) =>
!!company.ukBased ? (
diff --git a/src/apps/companies/apps/business-details/client/SectionSector.jsx b/src/client/modules/Companies/CompanyBusinessDetails/SectionSector.jsx
similarity index 85%
rename from src/apps/companies/apps/business-details/client/SectionSector.jsx
rename to src/client/modules/Companies/CompanyBusinessDetails/SectionSector.jsx
index bbcd054570e..4f7d3b68745 100644
--- a/src/apps/companies/apps/business-details/client/SectionSector.jsx
+++ b/src/client/modules/Companies/CompanyBusinessDetails/SectionSector.jsx
@@ -2,8 +2,8 @@ import React from 'react'
import PropTypes from 'prop-types'
import Link from '@govuk-react/link'
-import { SummaryTable } from '../../../../../client/components/'
-import urls from '../../../../../lib/urls'
+import { SummaryTable } from '../../../components'
+import urls from '../../../../lib/urls'
const SectionSector = ({ company, isArchived }) => (
subscribers.map(({ name, ditTeam }) => (
diff --git a/src/client/reducers.js b/src/client/reducers.js
index 0e06712df9d..257f68bdc4f 100644
--- a/src/client/reducers.js
+++ b/src/client/reducers.js
@@ -35,8 +35,8 @@ import investmentOpportunitiesListReducer from './modules/Investments/Opportunit
import { ID as INVESTMENT_OPPORTUNITIES_DETAILS_ID } from './modules/Investments/Opportunities/state'
import investmentOpportunitiesDetailsReducer from './modules/Investments/Opportunities/reducer'
-import { ID as DNB_CHECK_ID } from '../apps/companies/apps/business-details/client/state'
-import dnbCheckReducer from '../apps/companies/apps/business-details/client/reducer'
+import { ID as DNB_CHECK_ID } from './modules/Companies/CompanyBusinessDetails/state.js'
+import dnbCheckReducer from './modules/Companies/CompanyBusinessDetails/reducer.js'
import { ID as INVESTMENT_PROFILES_ID } from './modules/Investments/Profiles/state'
import investmentProfileReducer from './modules/Investments/Profiles/reducer'
diff --git a/src/client/routes.js b/src/client/routes.js
index a97b2069a90..70b08887a63 100644
--- a/src/client/routes.js
+++ b/src/client/routes.js
@@ -82,7 +82,7 @@ import CreateOrder from './modules/Omis/CreateOrder/CreateOrder'
import PaymentReceipt from './modules/Omis/PaymentReceipt'
import { TaskFormAdd, TaskFormEdit } from './modules/Tasks/TaskForm'
import CompanyOverview from './modules/Companies/CompanyOverview/CompanyOverview'
-import CompanyBusinessDetails from '../apps/companies/apps/business-details/client/CompanyBusinessDetails'
+import CompanyBusinessDetails from './modules/Companies/CompanyBusinessDetails/CompanyBusinessDetails'
const routes = {
companies: [
diff --git a/src/client/tasks.js b/src/client/tasks.js
index 02773226557..4e86880c91d 100644
--- a/src/client/tasks.js
+++ b/src/client/tasks.js
@@ -26,8 +26,8 @@ import {
DNB__CHECK_PENDING_REQUEST,
TASK_ARCHIVE_COMPANY,
TASK_GET_GLOBAL_ULTIMATE,
-} from '../apps/companies/apps/business-details/client/state'
-import * as businessDetails from '../apps/companies/apps/business-details/client/tasks'
+} from './modules/Companies/CompanyBusinessDetails/state.js'
+import * as businessDetails from './modules/Companies/CompanyBusinessDetails/tasks.js'
import {
TASK_GET_COMPANIES_LIST,