From 73f940233f66e011332c6f2d704cdef07e9473f3 Mon Sep 17 00:00:00 2001 From: Kuan Fan <31664961+kuanfandevops@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:41:00 -0700 Subject: [PATCH] Tracking pull request to merge release-2.17.0 to master (#2849) * fix: added type check for exclusion report on snapshot (#2855) Co-authored-by: Your Name --------- Co-authored-by: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> Co-authored-by: Your Name --- .github/workflows/dev-release.yaml | 8 ++++---- .github/workflows/tfrs-release.yaml | 6 +++--- .pipeline/lib/config.js | 4 ++-- backend/api/viewsets/ComplianceReport.py | 3 ++- frontend/package.json | 2 +- openshift-v4/templates/backup-container-2.6.1/cronjob.md | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dev-release.yaml b/.github/workflows/dev-release.yaml index 836634c1d..f49ec52a1 100644 --- a/.github/workflows/dev-release.yaml +++ b/.github/workflows/dev-release.yaml @@ -1,11 +1,11 @@ ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly ## For each release, update lib/config.js: version and releaseBranch -name: TFRS Dev release-2.16.0 +name: TFRS Dev release-2.17.0 on: push: - branches: [ release-2.16.0 ] + branches: [ release-2.17.0 ] paths: - frontend/** - backend/** @@ -15,8 +15,8 @@ on: env: ## The pull request number of the Tracking pull request to merge the release branch to main ## Also remember to update the version in .pipeline/lib/config.js - PR_NUMBER: 2836 - RELEASE_NAME: release-2.16.0 + PR_NUMBER: 2849 + RELEASE_NAME: release-2.17.0 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/tfrs-release.yaml b/.github/workflows/tfrs-release.yaml index f9989da47..5d9368269 100644 --- a/.github/workflows/tfrs-release.yaml +++ b/.github/workflows/tfrs-release.yaml @@ -1,7 +1,7 @@ ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly ## For each release, update lib/config.js: version and releaseBranch -name: TFRS release-2.16.0 +name: TFRS release-2.17.0 on: workflow_dispatch: @@ -10,8 +10,8 @@ on: env: ## The pull request number of the Tracking pull request to merge the release branch to main ## Also remember to update the version in .pipeline/lib/config.js - PR_NUMBER: 2836 - RELEASE_NAME: release-2.16.0 + PR_NUMBER: 2849 + RELEASE_NAME: release-2.17.0 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.pipeline/lib/config.js b/.pipeline/lib/config.js index d04b647af..f2b0970e6 100644 --- a/.pipeline/lib/config.js +++ b/.pipeline/lib/config.js @@ -1,7 +1,7 @@ 'use strict'; const options= require('@bcgov/pipeline-cli').Util.parseArguments() const changeId = options.pr //aka pull-request -const version = '2.16.0' +const version = '2.17.0' const name = 'tfrs' const ocpName = 'apps.silver.devops' @@ -13,7 +13,7 @@ options.git.repository='tfrs' 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-2.16.0' + releaseBranch: 'release-2.17.0' }, dev: {namespace:'0ab226-dev' , name: `${name}`, phase: 'dev' , changeId:changeId, suffix: `-dev` , instance: `${name}-dev` , version:`${version}`, tag:`dev-${version}`, dbServiceName: 'tfrs-spilo', diff --git a/backend/api/viewsets/ComplianceReport.py b/backend/api/viewsets/ComplianceReport.py index 30ebd49e9..72d7de0f6 100644 --- a/backend/api/viewsets/ComplianceReport.py +++ b/backend/api/viewsets/ComplianceReport.py @@ -552,7 +552,8 @@ def list(self, request, *args, **kwargs): return Response(data) def compliance_to_new_act(self, obj, snapshot): - if int(obj.compliance_period.description) > 2022 and snapshot is not None: + if int(obj.compliance_period.description) > 2022 \ + and snapshot is not None and obj.type.the_type != "Exclusion Report": lines = snapshot.get('summary').get('lines') if lines.get('29A') is None: previous_transactions = [] diff --git a/frontend/package.json b/frontend/package.json index 40612cd38..acbfccfa3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "tfrs", - "version": "2.16.0", + "version": "2.17.0", "dependencies": { "@babel/eslint-parser": "^7.19.1", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", diff --git a/openshift-v4/templates/backup-container-2.6.1/cronjob.md b/openshift-v4/templates/backup-container-2.6.1/cronjob.md index a725e1d43..856844347 100644 --- a/openshift-v4/templates/backup-container-2.6.1/cronjob.md +++ b/openshift-v4/templates/backup-container-2.6.1/cronjob.md @@ -6,7 +6,7 @@ KNP: allow CronJob to connect to Spilo oc process -f ./db-backup-cronjob-2.6.1.yaml \ JOB_NAME=tfrs-db-backup \ JOB_PERSISTENT_STORAGE_NAME=backup \ -SCHEDULE="00 07 * * *" \ +SCHEDULE="00 07,21 * * *" \ TAG_NAME=2.6.1 \ DATABASE_SERVICE_NAME=tfrs-spilo-readonly \ DATABASE_DEFAULT_PORT=5432 \