Register Other Org - Sprint 31.4 (#1094)

* PBA validation * Display Error summary page * form Error * EUI-8801 Register other org - Contact details functionality * EUI-8801 Register other org - Contact details functionality * Add validation * EUI-8801 Register other org - Contact details functionality * fix lint * EUI-8811 Register other org - Individual regulator yes no functionality * EUI-8801 Register other org - Contact details functionality * EUI-8811 Register other org - Individual regulator yes no functionality * Update contact-details.component.spec.ts * Fix test * EUI-8811 Register other org - Individual regulator yes no functionality * Add validation * Add non-postcode validation and persistence * EUI-8797 Register other org - CYA display amendments * Fix merge conflicts * Update registered-address.component.spec.ts * PBA number persist functionality * fix unit tests * Make changes based on PR comments * EUI-8797 Register other org - CYA display amendments * Update contact-details.component.spec.ts * Add service down check * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * register other org workflow pages a11y tests added (#1103) * register other org workflow pages a11y tests added * a11y test name update * Add test fixes * Temporary fix for back link * postcode validator * EUI-8821 Register Other Org - Service not listed * Update organisation types value * fix typos * EUI-8821 Register Other Org - Service not listed * Update document-exchange-reference.component.ts * Update yarn-audit-known-issues * Update yarn-audit-known-issues * Merge from base branch * EUI-8821 Register Other Org - Service not listed * EUI-8797 Register other org - CYA display amendments * EUI-8838 Register Other Other - Back link not working * Create renovate.json * Create renovate.json * Create renovate.json * EUI-8838 Register Other Other - Back link not working * Update organisation-services-access.component.spec.ts * EUI-8838 Register Other Other - Back link not working * EUI-8838 Register Other Other - Back link not working * Update organisation-services-access.component.ts * EUI-8838 Register Other Other - Back link not working * fix the 7 digit PBA * Call Lov API for org type * initialise PBA * pba fix * EUI-8838 Register Other Other - Back link not working * Update organisation-services-access.component.ts * Update regulator-details.component.spec.ts * Update organisation-services-access.component.spec.ts * pba * Add value to preview yaml * register org automation test page object steps updates * EUI-8838 Register Other Other - Back link not working * Fix the unit tests * EUI-8838 Register Other Other - Back link not working * Feature/e UI 8771 postcode lookup validation (#1112) * Commit address component changes before merge * Finalise changes * Change version * Make changes to ensure back to address works correctly * Post Registration Data (#1122) * Post Registration Data * Add Validation for checkbox * Adding error handling * lint fix * Update company-house-details.component.spec.ts * code review comments * refactoring * fix ordering * Clear session * fix Organisation Type * yarn audit * add cancel Link --------- Co-authored-by: John Benjamin <john.benjamin@hmcts.net> Co-authored-by: connorpgpmcelroy <74015088+connorpgpmcelroy@users.noreply.github.com> * EUI-8835 Register Other Org - Organisation page changes (#1124) * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * e2e test for register other create scenario (#1128) * e2e test for register other create scenario * ROO basic flow fixes * Add required changes and test changes (#1131) * Add required changes and test changes * Add the previousUrl existence check * Make previousUrl change * system user auth for prd api * ROO e2e test fix for current change impact on test * new register org BDD scenarios * Feature/e UI 8869 (#1135) * Integrate Create Organisation * Organisation Type * remove dead code * Feature toggle Organisation Details * Update app.routes.ts (#1136) * Update app.routes.ts Blocks and redirects either of two routes to the other * Update app.routes.ts * Change common-lib for tag * Change tag * fix Address optional fields (#1142) * ROO functional tests (#1139) * emabled playwring as codecept driver * CVE suppress * hooks fix * more ROO tests * ROO test updates * yarn audit changes * playwright chromium install * functional test screenshot fix, invite user fix * test fixes * excluded in-dev and failing tests * test fix * test inclusion exclsuion in AAT preview for feature toggles features * Unassigned cases functional tests added * smoke test fix * smoke test command fix * yarn functional test command fix * CVE updates * functional test comand update * assigned cases tests added --------- Co-authored-by: Uday Denduluri <uday.denduluri1@hmcts.net> * test update * a11y test fix * Override the LD Key for Preview (#1143) * Override LD Key * Adding ENV * lint fix * preview changes * preview * preview LD key * LAUNCH_DARKLY_CLIENT_ID * LD client * audit changes --------- Co-authored-by: sreekanthpuligadda <52752138+sreekanthpuligadda@users.noreply.github.com> Co-authored-by: connorpgpmcelroy <74015088+connorpgpmcelroy@users.noreply.github.com> * CVE updates --------- Co-authored-by: Uday Denduluri <uday.denduluri1@hmcts.net> Co-authored-by: DavidJayakumar <David.Jayakumar@hmcts.net> Co-authored-by: David Rajkumar Jayakumar <107850923+DavidJayakumar@users.noreply.github.com> Co-authored-by: connorpgpmcelroy <connor.mcelroy@hmcts.net> Co-authored-by: udaydenduluri33 <50869558+udaydenduluri33@users.noreply.github.com> Co-authored-by: sreekanthpuligadda <52752138+sreekanthpuligadda@users.noreply.github.com> Co-authored-by: connorpgpmcelroy <74015088+connorpgpmcelroy@users.noreply.github.com> Co-authored-by: sreekanthpuligadda <sreekanth.puligadda@hmcts.net>
hmcts · Oct 23, 2023 · 76ed751 · 76ed751
1 parent 28a1fa9
commit 76ed751
Show file tree

Hide file tree

Showing 140 changed files with 6,682 additions and 972 deletions.
diff --git a/api/auth/index.ts b/api/auth/index.ts
@@ -1,6 +1,5 @@
 import { AUTH, AuthOptions, xuiNode } from '@hmcts/rpx-xui-node-lib';
 import { NextFunction, Request, Response } from 'express';
-import { EnhancedRequest } from '../models/enhanced-request.interface';
 import { getConfigValue, showFeature } from '../configuration';
 import {
   COOKIE_TOKEN,
@@ -13,19 +12,20 @@ import {
   MICROSERVICE,
   NOW,
   OAUTH_CALLBACK_URL,
+  REDISCLOUD_URL,
   REDIS_KEY_PREFIX,
   REDIS_TTL,
-  REDISCLOUD_URL,
   S2S_SECRET,
-  SERVICE_S2S_PATH,
+  SERVICES_CCD_COMPONENT_API_PATH,
   SERVICES_IDAM_API_PATH,
   SERVICES_IDAM_ISS_URL,
   SERVICES_IDAM_WEB, SERVICES_RD_PROFESSIONAL_API_PATH,
-  SESSION_SECRET,
-  SERVICES_CCD_COMPONENT_API_PATH
+  SERVICE_S2S_PATH,
+  SESSION_SECRET
 } from '../configuration/references';
 import { http } from '../lib/http';
 import * as log4jui from '../lib/log4jui';
+import { EnhancedRequest } from '../models/enhanced-request.interface';
 import { getOrganisationDetails } from '../organisation';
 
 const logger = log4jui.getLogger('auth');
@@ -92,7 +92,8 @@ export const getXuiNodeMiddleware = () => {
   const routeCredential = {
     password,
     routes: [
-      '/external/addresses'
+      '/external/addresses',
+      '/external/getLovRefData'
     ],
     scope: 'openid profile roles manage-user create-user',
     userName

diff --git a/api/configuration/references.ts b/api/configuration/references.ts
@@ -84,3 +84,6 @@ export const PACT_CONSUMER_VERSION = 'pact.consumerVersion';
 export const PACT_BRANCH_NAME = 'pact.branchName';
 export const PACT_BROKER_USERNAME = 'pact.brokerUsername';
 export const PACT_BROKER_PASSWORD = 'pact.brokerPassword';
+
+// LD PREVIEW KEY
+export const PREVIEW_LD_KEY = 'previewLDKey';
diff --git a/api/configurationUI/index.ts b/api/configurationUI/index.ts
@@ -6,6 +6,7 @@ import {
   LAUNCH_DARKLY_CLIENT_ID,
   LINKS_MANAGE_CASES_LINK,
   LINKS_MANAGE_ORG_LINK,
+  PREVIEW_LD_KEY,
   PROTOCOL,
   SERVICE_S2S_PATH,
   SERVICES_FEE_AND_PAY_API_PATH,
@@ -23,18 +24,21 @@ router.get('/', configurationUIRoute);
  * All the following environmental variables are passed to the UI.
  */
 export async function configurationUIRoute(req, res): Promise<void> {
+  const environment = process && process.env && process.env.PUI_ENV;
+  const launchDarklyClientId = environment !== 'preview' ? getConfigValue(LAUNCH_DARKLY_CLIENT_ID) : getConfigValue(PREVIEW_LD_KEY);
   res.status(200).send({
     feeAndPayApiPath: getConfigValue(SERVICES_FEE_AND_PAY_API_PATH),
     googleAnalyticsKey: getConfigValue(GOOGLE_ANALYTICS_KEY),
     idamWeb: getConfigValue(SERVICES_IDAM_WEB),
-    launchDarklyClientId: getConfigValue(LAUNCH_DARKLY_CLIENT_ID),
+    launchDarklyClientId,
     manageCaseLink: getConfigValue(LINKS_MANAGE_CASES_LINK),
     manageOrgLink: getConfigValue(LINKS_MANAGE_ORG_LINK),
     protocol: getConfigValue(PROTOCOL),
     rdProfessionalApiPath: getConfigValue(SERVICES_RD_PROFESSIONAL_API_PATH),
     s2sPath: getConfigValue(SERVICE_S2S_PATH),
     servicesIdamApiPath: getConfigValue(SERVICES_IDAM_API_PATH),
-    servicesTandCPath: getConfigValue(SERVICES_TERMS_AND_CONDITIONS_API_PATH)
+    servicesTandCPath: getConfigValue(SERVICES_TERMS_AND_CONDITIONS_API_PATH),
+    envrionment: environment ? environment : 'LOCAL'
   });
 }
 

diff --git a/api/models/registrationData.ts b/api/models/registrationData.ts
@@ -0,0 +1,81 @@
+import { AddressModel } from '@hmcts/rpx-xui-common-lib';
+
+export interface ContactDetails {
+    firstName: string;
+    lastName: string;
+    workEmailAddress: string;
+}
+
+export interface Regulator {
+    regulatorType: string;
+    regulatorName?: string;
+    organisationRegistrationNumber?: string;
+}
+
+export interface OrganisationType {
+  key: string;
+  description: string;
+}
+
+export type RegistrationData = {
+    companyName: string;
+    companyHouseNumber?: string;
+    hasDxReference: boolean;
+    dxNumber?: string;
+    dxExchange?: string;
+    services: string[];
+    otherServices?: string;
+    hasPBA: boolean;
+    contactDetails: ContactDetails;
+    address: AddressModel;
+    organisationType: OrganisationType;
+    otherOrganisationType?: string;
+    otherOrganisationDetail?: string;
+    regulatorRegisteredWith: string;
+    inInternationalMode: boolean;
+    regulators: Regulator[];
+    hasIndividualRegisteredWithRegulator: boolean;
+    individualRegulators?: Regulator[];
+    pbaNumbers: string[];
+}
+
+export type RegistrationRequest = {
+    name: string,
+    status?: string,
+    statusMessage?: string,
+    sraId?: string,
+    sraRegulated?: string,
+    companyNumber?: string,
+    companyUrl?: string,
+    superUser: {
+      firstName: string,
+      lastName: string,
+      email: string
+    },
+    paymentAccount: string [],
+    contactInformation: [
+      {
+        uprn?: string,
+        addressLine1: string,
+        addressLine2: string,
+        addressLine3: string,
+        townCity: string,
+        county: string,
+        country: string,
+        postCode: string,
+        dxAddress?: [
+          {
+            dxNumber: string,
+            dxExchange: string
+          }
+        ]
+      }
+    ],
+    orgType: string,
+    orgAttributes?: [
+      {
+        key: string,
+        value: string
+      }
+    ]
+}
diff --git a/api/openRoutes.ts b/api/openRoutes.ts
@@ -8,6 +8,7 @@ import getLovRefDataRouter from './prd/lov';
 // TODO: rename from prdRouter
 import getappInsightsInstrumentationKey from './monitoring-tools';
 import prdRouter from './register-org';
+import registerOrgRouter from './registerOrganisation';
 import addressRouter from './addresses';
 
 // TODO: Not sure if this is needed
@@ -25,6 +26,7 @@ const router = Router({ mergeParams: true });
  * @see local.ts / server.ts
  */
 router.use('/register-org', prdRouter);
+router.use('/register-org-new', registerOrgRouter);
 router.use('/monitoring-tools', getappInsightsInstrumentationKey);
 router.use('/addresses', addressRouter);
 

diff --git a/api/organisationTypesRouter/mockOrganisationTypes.ts b/api/organisationTypesRouter/mockOrganisationTypes.ts
@@ -1,10 +1,12 @@
 export const organisationTypes = [
-  { name: 'Solicitor Regulation Authority', id: 'SRA' },
-  { name: 'Financial Conduct Authority', id: 'FCA' },
-  { name: 'Institute of Charted Accountants for England and Wales', id: 'ICA' },
-  { name: 'Charted Institute for Legal Executives', id: 'CILE' },
-  { name: 'Certification For Bar Standard Boards', id: 'CFBSS' },
-  { name: 'Office of Immigration Services Commissioner (OISC)', id: 'OISC' },
+  { name: 'Solicitor Regulation Authority (SRA)', id: 'SRA' },
+  { name: 'Financial Conduct Authority (FCA)', id: 'FCA' },
+  { name: 'Institute of Charted Accountants in England and Wales', id: 'ICA' },
+  { name: 'Charted Institute of Legal Executives', id: 'CILE' },
+  { name: 'Certification by the Bar Standards Board', id: 'CFBSS' },
+  { name: 'Office of the Immigration Services Commissioner (OISC)', id: 'OISC' },
+  { name: 'Law Society of England and Wales', id: 'LSEW' },
+  { name: 'Law Society of Scotland', id: 'LSS' },
   { name: 'Other', id: 'Other' },
   { name: 'Not Applicable', id: 'NA' }
 ];
diff --git a/api/registerOrganisation/index.ts b/api/registerOrganisation/index.ts
@@ -0,0 +1,80 @@
+import { NextFunction, Request, Response, Router } from 'express';
+import { RegistrationData, RegistrationRequest } from '../models/registrationData';
+import { generateS2sToken } from '../lib/s2sTokenGeneration';
+import { getConfigValue } from '../configuration';
+import { SERVICES_RD_PROFESSIONAL_API_PATH, SERVICE_S2S_PATH } from '../configuration/references';
+import { http } from '../lib/http';
+
+export function mapRequestObject(requestBody: RegistrationData): RegistrationRequest {
+  const request: RegistrationRequest = {
+    name: requestBody.companyName,
+    companyNumber: requestBody.companyHouseNumber,
+    superUser: {
+      firstName: requestBody.contactDetails.firstName,
+      lastName: requestBody.contactDetails.lastName,
+      email: requestBody.contactDetails.workEmailAddress
+    },
+    paymentAccount: requestBody.pbaNumbers,
+    contactInformation: [
+      {
+        addressLine1: requestBody.address.addressLine1,
+        addressLine2: convertEmptyStringToNull(requestBody.address.addressLine2),
+        addressLine3: convertEmptyStringToNull(requestBody.address.addressLine3),
+        townCity: requestBody.address.postTown,
+        county: requestBody.address.county,
+        country: requestBody.address.country,
+        postCode: requestBody.address.postCode,
+        dxAddress: getDx(requestBody)
+      }
+    ],
+    orgType: requestBody.organisationType.key
+  };
+  return request;
+}
+
+export const router = Router({ mergeParams: true });
+
+function getDx(requestBody: RegistrationData): [{ dxNumber: string; dxExchange: string; }] {
+  const dxNumber = convertEmptyStringToNull(requestBody.dxNumber);
+  const dxExchange = convertEmptyStringToNull(requestBody.dxExchange);
+  if (dxNumber && dxExchange) {
+    return [{
+      dxNumber,
+      dxExchange
+    }];
+  }
+  return null;
+}
+
+export async function handleRegisterOrgRoute(req: Request, res: Response, next: NextFunction): Promise<any> {
+  const registerPayload = req.body as RegistrationData;
+
+  const s2sServicePath = getConfigValue(SERVICE_S2S_PATH);
+
+  const s2sToken = await generateS2sToken(s2sServicePath);
+  const rdProfessionalPath = getConfigValue(SERVICES_RD_PROFESSIONAL_API_PATH);
+  /**
+   * We use the S2S token to set the headers.
+   */
+  const url = `${rdProfessionalPath}/refdata/external/v2/organisations`;
+  const options = {
+    headers: { ServiceAuthorization: `Bearer ${s2sToken}` }
+  };
+  const axiosInstance = http({} as unknown as Request);
+  try {
+    const registerRequest = mapRequestObject(registerPayload);
+    const response = await axiosInstance.post(url, registerRequest, options);
+    res.send(response.data);
+  } catch (error) {
+    next(error);
+  }
+}
+
+router.post('/register', handleRegisterOrgRoute);
+
+export default router;
+
+function convertEmptyStringToNull(term: string): string {
+  return term === '' ? null : term;
+}
+
diff --git a/charts/xui-mo-webapp/values.preview.template.yaml b/charts/xui-mo-webapp/values.preview.template.yaml
@@ -15,10 +15,12 @@ nodejs:
     #SERVICES_TERMS_AND_CONDITIONS_API_SERVICE: http://xui-terms-and-conditions-aat.service.core-compute-aat.internal
     #S2S_SERVICE: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal
     #FEE_AND_PAY_API: https://payment-api-aat.service.core-compute-aat.internal
+    SERVICES_PRD_COMMONDATA_API: http://rd-commondata-api-aat.service.core-compute-aat.internal
     MANAGE_CASE_LINK: https://manage-case.aat.platform.hmcts.net/cases
     MANAGE_ORG_LINK: https://manage-org.aat.platform.hmcts.net/
 
     APPINSIGHTS_INSTRUMENTATIONKEY: ${APPINSIGHTS_INSTRUMENTATIONKEY}
+    LAUNCH_DARKLY_CLIENT_ID: ${PREVIEW_LD_KEY}
     PUI_ENV: preview
     FEATURE_SECURE_COOKIE_ENABLED: false
     FEATURE_TERMS_AND_CONDITIONS_ENABLED: false

diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -1,6 +1,7 @@
 {
     "environment": "NODE_CONFIG_ENV",
     "appInsightsInstrumentationKey": "APPINSIGHTS_INSTRUMENTATIONKEY",
+    "previewLDKey": "PREVIEW_LD_KEY",
     "cookies": {
         "token": "COOKIE_TOKEN",
         "userId": "COOKIE_USER_ID"

diff --git a/config/default.json b/config/default.json
@@ -1,5 +1,6 @@
 {
   "environment": "DEFAULT ENVIRONMENT",
+  "previewLDKey": "5de6610b23ce5408280f2268",
   "stub": false,
   "appInsightsInstrumentationKey": "",
   "secrets": {

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "test:coverage:node": "cd api && yarn coverage",
     "test:crossbrowser": "protractor ./test/e2e/config/crossbrowser.conf.js",
     "test:node": "cd api && yarn test",
-    "test:functional": "yarn test:api && yarn run test:codeceptE2E",
+    "test:functional": "yarn build && node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock && yarn playwright install chromium && yarn test:api && yarn run test:xuiIntegration && yarn run test:codeceptE2E",
     "test:functional:backup": "webdriver-manager update --versions.chrome 2.40 && protractor ./test/e2e/config/functional.conf.js",
     "test:functional:local": "webdriver-manager update --versions.chrome 2.40 && protractor ./test/e2e/config/functional.conf.js --local",
     "test:fullfunctional": "yarn test:api && yarn run test:codeceptE2E",
@@ -46,13 +46,15 @@
     "test:ngIntegrationMockEnv": "node -e 'require(`./test/nodeMock/availablePortFinder.js`).configureTestProxyPort()'",
     "test:node:watch": "cd api && yarn test:watch",
     "test:pact:run-and-publish": "yarn test-pact && yarn publish-pact",
-    "test:smoke": "TEST_TYPE=smoke  npx codeceptjs run  --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features --grep @smoke ",
+    "test:smoke": "node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=smoke  npx codeceptjs run  --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features",
     "test:smoke:local": "webdriver-manager update --versions.chrome 2.40 && protractor ./test/e2e/config/smoke.conf.js --local",
     "test-pact": "NODE_PATH=.  NODE_ENV=pacttesting LOG_LEVEL=info mocha --timeout 10000 -r ts-node/register api/test/pact/pact-tests/**/*.spec.ts",
     "testx": "cd api && yarn coverage && cd .. && yarn test:ng //node tests are broken need to fix",
-    "test:codeceptE2EDebug": "TEST_TYPE=e2e  npx codeceptjs run  --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features --grep @functional_test  ",
-    "test:codeceptE2E": "TEST_TYPE=e2e  npx codeceptjs run-workers --suites 6 --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features --grep @fullFunctional ",
-    "test:backendMock": "DEBUG=true nodemon test_codecept/backendMock/app --standalone"
+    "test:codeceptE2EDebug": "DEBUG=true TEST_TYPE=e2e  npx codeceptjs run  --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features",
+    "test:codeceptE2E": "TEST_TYPE=e2e  npx codeceptjs run-workers --suites 6 --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features",
+    "test:backendMock": "DEBUG=true nodemon test_codecept/backendMock/app --standalone",
+    "test:xuiIntegrationDebug": "DEBUG=true NODE_CONFIG_ENV=mock TEST_TYPE=ngIntegration  npx codeceptjs run  -p pauseOnFail --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features",
+    "test:xuiIntegration": "yarn build && node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=ngIntegration PARALLEL=true  npx codeceptjs run-workers --suites 6  --config=./test_codecept/codeceptCommon/codecept.conf.ts  --features "
   },
   "private": true,
   "dependencies": {
@@ -74,7 +76,7 @@
     "@hmcts/frontend": "0.0.50-alpha",
     "@hmcts/nodejs-healthcheck": "1.7.0",
     "@hmcts/properties-volume": "0.0.13",
-    "@hmcts/rpx-xui-common-lib": "1.9.0-address-display-full",
+    "@hmcts/rpx-xui-common-lib": "1.9.0-route-expected-feature-2",
     "@hmcts/rpx-xui-node-lib": "2.27.1",
     "@ng-idle/core": "^10.0.0",
     "@ng-idle/keepalive": "^10.0.0",
@@ -130,6 +132,7 @@
     "node-http-proxy-json": "^0.1.9",
     "otp": "^0.1.3",
     "p-iteration": "^1.1.7",
+    "playwright": "^1.18",
     "redis": "^3.0.2",
     "rpx-xui-translation": "^0.1.1",
     "rx-polling": "^1.1.0",

diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
@@ -47,7 +47,14 @@ export const ROUTES: Routes = [
   },
   {
     path: 'register-org',
-    loadChildren: () => import('../register/register.module').then((m) => m.RegisterModule)
+    loadChildren: () => import('../register/register.module').then((m) => m.RegisterModule),
+    canActivate: [FeatureToggleGuard],
+    data: {
+      title: 'Register Organisation',
+      needsFeaturesEnabled: [AppConstants.FEATURE_NAMES.newRegisterOrg],
+      expectFeatureEnabled: false,
+      featureDisabledRedirect: '/register-org-new/register'
+    }
   },
   {
     path: 'register-org-new',
@@ -56,6 +63,7 @@ export const ROUTES: Routes = [
     data: {
       title: 'Register Organisation',
       needsFeaturesEnabled: [AppConstants.FEATURE_NAMES.newRegisterOrg],
+      expectFeatureEnabled: true,
       featureDisabledRedirect: '/register-org/register'
     }
   },