Ntrnl 377 add environment variables to substitute reference to cabinet office or co words

.env.example

@@ -10,6 +10,8 @@ GITHUB_OWNER="test"
 GITHUB_REPO_ISSUE_ASSIGNEE="test"
 GITHUB_REPO_ISSUE_LABEL="test"
 GITHUB_TERRAFORM_REPO="test"
+DEPARTMENT_NAME ="Cabinet Office"
+GITHUB_ORG_NAME ="cabinetoffice"
 HUMAN="true"
 LOG_LEVEL="info"
 NODE_ENV="development"

docker-compose.yml

@@ -22,6 +22,8 @@ services:
       - GITHUB_REPO_ISSUE_ASSIGNEE=${GITHUB_REPO_ISSUE_ASSIGNEE}
       - GITHUB_REPO_ISSUE_LABEL=${GITHUB_REPO_ISSUE_LABEL}
       - GITHUB_TERRAFORM_REPO=${GITHUB_TERRAFORM_REPO}
+      - DEPARTMENT_NAME=${DEPARTMENT_NAME}
+      - GITHUB_ORG_NAME=${GITHUB_ORG_NAME}
       - HUMAN=${HUMAN}
       - LOG_LEVEL=${LOG_LEVEL}
       - NODE_ENV=${NODE_ENV}

src/config/index.ts

@@ -2,6 +2,9 @@ import { getEnvironmentValue } from '../utils/getEnvironmentValue';
 
 export const SERVICE_NAME = 'GitHub Requests';
 
+export const DEPARTMENT_NAME = getEnvironmentValue('DEPARTMENT_NAME');
+export const GITHUB_ORG_NAME = getEnvironmentValue('GITHUB_ORG_NAME');
+
 export const PATH_SSL_PRIVATE_KEY = getEnvironmentValue('PATH_SSL_PRIVATE_KEY', 'false');
 export const PATH_SSL_CERTIFICATE = getEnvironmentValue('PATH_SSL_CERTIFICATE', 'false');
 

src/config/nunjucks.ts

@@ -18,4 +18,6 @@ export const configureNunjucks = (app: express.Application, viewsPath: string) =
     nunjucksEnv.addGlobal('CDN_HOST', config.CDN_HOST);
     nunjucksEnv.addGlobal('SERVICE_URL', config.SERVICE_URL);
     nunjucksEnv.addGlobal('SERVICE_NAME', config.SERVICE_NAME);
+    nunjucksEnv.addGlobal('DEPARTMENT_NAME', config.DEPARTMENT_NAME);
+    nunjucksEnv.addGlobal('GITHUB_ORG_NAME', config.GITHUB_ORG_NAME);
 };

src/views/accessibility-statement.html

@@ -36,7 +36,7 @@ <h2 class="govuk-heading-m" id="reporting">
   </h2>
 
   <p class="govuk-body">We’re always looking to improve the accessibility of this service. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, you can find contact details on our
-    <a class="govuk-link" href="#">contact page.</a> <!--Add link to contact us page when created. -->
+    <a class="govuk-link" href="/contact-us">contact page.</a> 
   </p>
 
   <h2 class="govuk-heading-m" id="technical-information">

src/views/add-member.html

@@ -8,7 +8,7 @@
   <h1 class="govuk-heading-l">Add a GitHub Member</h1>
 
   <p class="govuk-body">
-    When a user requires access to our GitHub organisations (e.g they have joined The Cabinet Office) they should be added to the cabinetoffice GitHub organisation.
+    When a user requires access to our GitHub organisations (e.g they have joined {{ DEPARTMENT_NAME }}) they should be added to the {{ GITHUB_ORG_NAME }} GitHub organisation.
   </p>
 
   {% include "include/error-list.html" %}
@@ -50,7 +50,7 @@ <h1 class="govuk-heading-l">Add a GitHub Member</h1>
       name: "contract_type",
       fieldset: {
         legend: {
-          text: "Is the GitHub account holder permanently employed within the CO orginsation?",
+          text: "Is the GitHub account holder permanently employed within the " + DEPARTMENT_NAME + " department?",
           isPageHeading: true,
           classes: "govuk-fieldset__legend--l"
         }

src/views/add-team-member.html

@@ -8,7 +8,7 @@
   <h1 class="govuk-heading-l">Add Member(s) to Team.</h1>
 
   <p class="govuk-body">
-    When user(s) has access to our GitHub organisations and they wish to be added to a team within the cabinetoffice GitHub organisation.
+    When user(s) has access to our GitHub organisations and they wish to be added to a team within {{ GITHUB_ORG_NAME }} GitHub organisation.
   </p>
 
   {% include "include/error-list.html" %}

src/views/confirmation.html

@@ -11,7 +11,7 @@
   <h2 class="govuk-heading-m">What happens next</h2>
 
   <p class="govuk-body">
-    We’ve sent your request to cabinetoffice internal developer platform.
+    We’ve sent your request to {{ GITHUB_ORG_NAME }} internal developer platform.
   </p>
   <p class="govuk-body">
     They will contact you either to confirm your request, or to ask for more information.

test/setup.ts

@@ -17,4 +17,6 @@ export default () => {
     process.env.SESSION_APP_KEY = 'test';
     process.env.GITHUB_KEY = 'key';
     process.env.UNSANITISED_TEST_KEY = '   test      ';
+    process.env.DEPARTMENT_NAME = 'Cabinet Office';
+    process.env.GITHUB_ORG_NAME = 'cabinetoffice';
 };