Merge branch 'master' into nigel_test

hmcts · Sep 12, 2024 · ba753e2 · ba753e2
2 parents 7ba2fef + c7c7f72
commit ba753e2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/charts/cmc-citizen-frontend/Chart.yaml b/charts/cmc-citizen-frontend/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cmc-citizen-frontend
 home: https://github.com/hmcts/cmc-citizen-frontend
-version: 4.1.57
+version: 4.1.56
 description: Helm chart for the HMCTS CMC Citizen Frontend service
 # be aware when bumping version that it is used elsewhere, e.g.:
 # chart-cmc - demo: https://github.com/hmcts/chart-cmc/tree/master/cmc

diff --git a/charts/cmc-citizen-frontend/values.yaml b/charts/cmc-citizen-frontend/values.yaml
@@ -51,6 +51,7 @@ nodejs:
     AUTO_ENROLL_INTO_NEW_FEATURE: true
     FEATURE_BREATHING_SPACE: false
     FEES_API_KEYWORDS_ENABLE: false
+    FEATURE_DISABLE_PAGES: false
 
   keyVaults:
     cmc:

diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -88,7 +88,8 @@
     "dashboard_pagination_enabled": "dashboard_pagination_enabled",
     "breathingSpace": "FEATURE_BREATHING_SPACE",
     "newClaimFees": "FEATURE_NEW_CLAIM_FEES",
-    "feeKeywordsEnable": "FEES_API_KEYWORDS_ENABLE"
+    "feeKeywordsEnable": "FEES_API_KEYWORDS_ENABLE",
+    "disablePages": "FEATURE_DISABLE_PAGES"
   },
 
   "oauth": {

diff --git a/config/default.json b/config/default.json
@@ -99,7 +99,8 @@
     "dashboard_pagination_enabled": false,
     "breathingSpace": true,
     "newClaimFees": true,
-    "feeKeywordsEnable": false
+    "feeKeywordsEnable": false,
+    "disablePages": false
   },
   "oauth": {
     "clientId": "cmc_citizen"

diff --git a/src/main/app.ts b/src/main/app.ts
@@ -93,14 +93,16 @@ if (env !== 'mocha') {
   new CsrfProtection().enableFor(app)
 }
 
-logger.info('Loading EligibilityFeature')
-new EligibilityFeature().enableFor(app)
-
 logger.info('Loading DashboardFeature')
 new DashboardFeature().enableFor(app)
 
-logger.info('Loading ClaimIssueFeature')
-new ClaimIssueFeature().enableFor(app)
+if (!FeatureToggles.isEnabled('disablePages')) {
+  logger.info('Loading EligibilityFeature')
+  new EligibilityFeature().enableFor(app)
+
+  logger.info('Loading ClaimIssueFeature')
+  new ClaimIssueFeature().enableFor(app)
+}
 
 logger.info('Loading DefendantFirstContactFeature')
 new DefendantFirstContactFeature().enableFor(app)

diff --git a/src/main/features/dashboard/views/index.njk b/src/main/features/dashboard/views/index.njk
@@ -9,7 +9,7 @@
   {% include "./banner/banner-claim-threshold.njk" %}
   <div class="grid-row">
     <div class="column-full">
-      {% if not claimDraftSaved %}
+      {% if not claimDraftSaved and not featureToggles.disablePages %}
         {{ internalLink(t('Make a new money claim'), EligibilityPaths.startPage.uri, 'newclaim', 'start-now') }}
       {% endif %}
       {% if claimsAsClaimant | length or claimDraftSaved %}
@@ -31,7 +31,7 @@
           </tr>
           </thead>
           <tbody>
-          {% if claimDraftSaved %}
+          {% if claimDraftSaved and not featureToggles.disablePages  %}
             <tr class="draft mobile-table">
               <td>{{ internalLink(t('Draft claim'), DashboardPaths.claimantPage.evaluateUri({ externalId: 'draft' })) }}</td>
               <td>-</td>