Tracking pull request to merge release-1.6.23.1 to master (#1741)

* update to 1.6.23-1, it was 1.6.22.3, it really should be 1.6.23

* Fixed internal comments showing up for supplier spreadsheet (#1740)

* update pipeline for the release

* only deploy frontend and backend for 1.6.23.1

* added relemase management

Co-authored-by: Richard <[email protected]>

.pipeline/lib/build.js

@@ -45,7 +45,7 @@ module.exports = settings => {
       'GIT_REF': oc.git.ref
     }
   }))
-
+/*
  //build celery
  objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/celery/celery-bc.yaml`, {
   'param':{
@@ -88,7 +88,7 @@ objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/
     'RELEASE_BRANCH': phases[phase].releaseBranch
   }
 }))
-
+*/
   oc.applyRecommendedLabels(
     objects,
     phases[phase].name,

.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'
+            releaseBranch: 'release-1.6.23.1'
           },
   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

@@ -39,6 +39,7 @@ module.exports = settings => {
     }
   }))
 
+  //deploy frontend
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/frontend/frontend-dc.yaml`, {
     'param': {
       'NAME': phases[phase].name,
@@ -52,7 +53,7 @@ module.exports = settings => {
     }
   }))
 
-
+/** 
   //deploy celery
   objects = objects.concat(oc.processDeploymentTemplate(`${templatesLocalBaseUrl}/templates/celery/celery-dc.yaml`, {
     'param': {
@@ -164,7 +165,7 @@ module.exports = settings => {
       }
     }))
   }
-
+*/
   oc.applyRecommendedLabels(
     objects,
     phases[phase].name,

backend/api/services/SpreadSheetBuilder.py

@@ -86,8 +86,7 @@ def add_fuel_codes(self, fuel_codes):
                                 col.value_accessor(fuel_code),
                                 col.format)
 
-
-    def add_credit_transfers(self, credit_trades):
+    def add_credit_transfers(self, credit_trades, user):
         """
         Adds a spreadsheet for credit transfers
         """
@@ -143,11 +142,17 @@ def add_credit_transfers(self, credit_trades):
             worksheet.write(row_index, 8, credit_trade.trade_effective_date,
                             date_format)
 
+            comments = credit_trade.unprivileged_comments
+
+            if user.has_perm('VIEW_PRIVILEGED_COMMENTS'):
+                comments = credit_trade.comments
+
             comment = "\n".join(
                 '{}: "{}"'.format(
                     comment.create_user.display_name, comment.comment
-                ) for comment in credit_trade.comments
+                ) for comment in comments
             )
+
             worksheet.write(row_index, 9, comment, comment_format)
 
         # set the widths for the columns that we expect to be longer

backend/api/viewsets/CreditTrade.py

@@ -260,7 +260,7 @@ def xls(self, request):
             )
 
         workbook = SpreadSheetBuilder()
-        workbook.add_credit_transfers(credit_trades)
+        workbook.add_credit_transfers(credit_trades, request.user)
 
         if request.user.is_government_user:
             fuel_suppliers = Organization.objects.extra(

frontend/package.json

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

openshift-v4/release-management/release-management.drawio

@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2021-04-15T19:49:29.325Z" agent="5.0 (Macintosh; Intel Mac OS X 11_2_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36" etag="V5RVpe3OK7GSMLwDDyiQ" version="14.5.8" type="device"><diagram id="LU24Kr6hN9gGyUAq_PZh" name="Page-1">3Vpdb9owFP01PIJiOwnksWNdt2mTpvHQ7WlyiUncOnHkmAL79bMTh3w4dFSlAfGC4uOP2Pcc3+vrMELzZHsncBZ/5yFhI+iE2xH6OIJwBlz1q4FdCQDP90okEjQ0WA0s6F9iQMegaxqSvNVQcs4kzdrgkqcpWcoWhoXgm3azFWftt2Y4IhawWGJmo/c0lLFZl+fU+GdCo7h6M3BMTYKrxgbIYxzyTQNCtyM0F5zL8inZzgnTxqvsUvb7dKB2PzFBUnlMhx9392jx9Wfsjjfbe7Zgf77cuWPfzE3uqgWTUK3fFLmQMY94itltjX4QfJ2GRI/qqFLd5hvnmQKBAh+JlDtDJl5LrqBYJszUki2VvxrPv/VQE8+UPm7NyEVhVxVSKXa/moVGL12suxWlql+5Pr2og2YzUM7XYklesFUlPywiIl9oh/bkql1BeELUfFQ/QRiW9Lk9D2zkGe3b1QyqB0PiKwg14z5jtjZvmjrQJ24P0YypTaQJ3cRUkkWGi9Vv1D5u04XzrNxZK7rVtBubPhMhyfZlq9pWMB3QzOwK4xdgtW02jU1moLixvyrs5HaDlt0SnEsiLLOpNcu2fXIp+BOZc8aFQlKeapuuKGMdCDMapaq4VDZSA6MP2oJUuZobU5HQMGSHCGnvulNQADoUIJsCt4cC+F4UAGAZ+0zOCFy6K0JHuiLg9EvgaF9UdL0RAu8aDTJOU5k3Rv6hgVpZPuwoy5+1I9N/2iPf6YipnEEtrf1S3qA271LU5lyN2t4a+U6jNgBfpTaABlAbssILCVEwrVzupYRlrxsTzh2WXctumRgDP7CPM9cTlwOvzUFgc+APGZe9Xg6mTnC9HHhdn3JuDqYWB8qpEpyTMZj4E4iumAqnvR2U8CwqgiGpCOztgJdPOCKTx5ynqmadhVgSPUP1bugkNM+VQeC8CLU6jsakDIqaP/WUrpMHnWg4Re+ytriW0ITinR6jIBlObJrzGGf6MeTLdVJY9H9h46Ek6NtDBZyAI9drc+TbFAEEbI4AeLdcwrFYQr7v4dWF5cHT7tEXnjngAjsRbnka93o9jZWGuD0ydoZ0NcAOsQPkKKMTXpkdnTpM+6kZ6NLMPp4DuAIEwsv2Fj2nkmGdhX08bx9LJvaVztW6i30wO5+7sE+JIMAwwOFlyXj/9eRSZDyz7FZkOJX/v0b1ztyOenuO1cOqF9pHNlu2aXijP+rVZg1xHhd2AW//xnTKwHcgnjWs6/UYt8Jed2NmXXEBEHTY9TuslQsw3V64LAs632mqy7L9QGVktwY61b1ZtfbrEMWB2/hhRDHr3u11k69jNdF1HagrrvfWhH1aK5PmZYzTiOh8mepMeu/DnZSQUMNSp98PuinOMkZ1Vl427aY4TpG5b4rJXGTGPescPsY9eePJUm5VrP+mULJY/9kD3f4D</diagram></mxfile>