Tracking pull request to bring release-1.6.23.2 to master (#1765)

.pipeline/lib/build.js

@@ -15,6 +15,7 @@ module.exports = settings => {
   console.log( oc.git.http_url);
   console.log( oc.git.ref);
 
+  /*
   //build backend
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/backend/backend-bc.yaml`, {
     'param':{
@@ -25,6 +26,7 @@ module.exports = settings => {
       'GIT_REF': oc.git.ref
     }
   }))
+  */
 
   //build frontend
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/frontend/frontend-angular-app-bc.yaml`, {
@@ -56,7 +58,7 @@ module.exports = settings => {
     'RELEASE_BRANCH': phases[phase].releaseBranch
   }
 }))
-
+*/
  //build notification server
  objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/notification/notification-server-bc.yaml`, {
   'param':{
@@ -67,7 +69,7 @@ module.exports = settings => {
     'GIT_REF': oc.git.ref
   }
 }))
-
+/*
  //build scan coordinator server
  objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/scan-coordinator/scan-coordinator-bc.yaml`, {
   'param':{

.pipeline/lib/config.js

@@ -7,7 +7,7 @@ const ocpName = 'apps.silver.devops'
 const phases = {
   build: {  namespace:'0ab226-tools'    , name: `${name}`, phase: 'build'  , changeId:changeId, suffix: `-build-${changeId}`  , 
             instance: `${name}-build-${changeId}`  , version:`${version}-${changeId}`, tag:`build-${version}-${changeId}`,
-            releaseBranch: 'release-1.6.23.1'
+            releaseBranch: 'release-1.6.23.2'
           },
   dev: {namespace:'0ab226-dev'    , name: `${name}`, phase: 'dev'  , changeId:changeId, suffix: `-dev-${changeId}`  , 
         instance: `${name}-dev-${changeId}`  , version:`${version}-${changeId}`, tag:`dev-${version}-${changeId}`,

.pipeline/lib/deploy.js

@@ -15,6 +15,7 @@ module.exports = settings => {
 
   //The deployment of your cool app goes here ▼▼▼
 
+  /*
   //deploy backend
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/backend/backend-dc.yaml`, {
     'param': {
@@ -38,6 +39,7 @@ module.exports = settings => {
       'REPLICAS':phases[phase].backendReplicas
     }
   }))
+  */
 
   //deploy frontend
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/frontend/frontend-dc.yaml`, {
@@ -68,7 +70,7 @@ module.exports = settings => {
       'MEMORY_LIMIT': phases[phase].celeryMemoryLimit
     }
   })) 
-
+*/
   //deploy notification server
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/notification/notification-server-dc.yaml`, {
     'param': {
@@ -83,7 +85,7 @@ module.exports = settings => {
       'MEMORY_LIMIT':phases[phase].notificationServerMemoryLimit
     }
   }))
- 
+ /*
   //deploy scan coordinator
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/scan-coordinator/scan-coordinator-dc.yaml`, {
     'param': {

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tfrs",
-  "version": "1.6.23-1",
+  "version": "1.6.23-2",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome": "^1.1.8",

frontend/src/compliance_reporting/components/ComplianceReportIntro.js

@@ -4,6 +4,14 @@ import PropTypes from 'prop-types';
 const ComplianceReportIntro = (props) => {
   const complianceReportDueDate = `20${Number(props.period.substr(-2)) + 1}`;
 
+  let litresText = ' 75 million ';
+
+  if (Number(props.period) === 2021) {
+    litresText = ' 25 million ';
+  } else if (Number(props.period) > 2021) {
+    litresText = ' 200,000 litres ';
+  }
+
   return (
     <div className="page-compliance-reporting-intro">
       <div>
@@ -32,16 +40,14 @@ const ComplianceReportIntro = (props) => {
         which they refer.
         </p>
         <p>
-        Payment of penalties must be sent to the Ministry of Energy, Mines and Petroleum Resources
-        at the same time as this report is submitted.
-        </p>
-        <p>
-        Cheques or money orders are to be made payable to the Minister of Finance.
+        An administrative penalty must be made payable to the Minister of Finance. Payment is due
+        March 31 following each compliance period. For more information please contact the Low
+        Carbon Fuels Branch via email at <a href="mailto:[email protected]">[email protected]</a>.
         </p>
 
         <h3>Small  Fuel Supplier Exemption</h3>
         <p>
-        Fuel suppliers and their affiliates who supplied less than a total of 75 million litres of
+        Fuel suppliers and their affiliates who supplied less than a total of {litresText} litres of
         gasoline and diesel class fuels (combined) in the {props.period} compliance period
         may apply to be exempted from Part 2 and/or Part 3 requirements.  A Part 2 or Part 3 fuel
         supplier who applies to be exempted must submit an Exemption Report, available from (