Tracking pull request to merge release-2.2.0 to master (#2047)

* update to 2.2.0 * chore: updated unit test auth for local testing * update workflow name (#2052) * chore - adds developer-guide, updates readme, removes minio.env from gitignore * update release name 2.2.0 * fix-readds line to docker-compose * add allowPrivilegeEscalation * update spilo dep * fix: tfrs-2050 - autocompletion * fix: unit test fixes, docker file exception fix * replace react-bootstrap-autosuggest usage with custom AutocompletedInput component * update spilo and rabbitmq deployment * Update README.md * fix: added default for missing env * Bump django from 3.2.16 to 3.2.17 in /backend Bumps [django](https://github.com/django/django) from 3.2.16 to 3.2.17. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@3.2.16...3.2.17) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * feat: user login history table added with keycloak auth * dashboard load fix * removing loggin and comments * refactor UNSAFE_componentWillReceiveProps method * refactor UNSAFE_componentWillReceiveProps * Make user auth fields editable for Admins * fix: revert to unsafe components until proper fix can be implemented --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: AlexZorkin <[email protected]> Co-authored-by: emi-hi <[email protected]> Co-authored-by: tim738745 <[email protected]> Co-authored-by: Alex Zorkin <[email protected]> Co-authored-by: kcabhar <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jig-patel <[email protected]>
bcgov · Feb 14, 2023 · f33289f · f33289f
1 parent 9a09a68
commit f33289f
Show file tree

Hide file tree

Showing 42 changed files with 1,360 additions and 1,056 deletions.
diff --git a/.github/workflows/build-release.yaml → .github/workflows/release-2.2.0.yaml b/.github/workflows/build-release.yaml → .github/workflows/release-2.2.0.yaml
@@ -1,18 +1,19 @@
-## For each release, the value of workflow name, branches and PR_NUMBER need to be adjusted accordingly
+## 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.1.0
+name: TFRS release-2.2.0
 
 on:
   push:
-    branches: [ release-2.1.0 ]
+    branches: [ release-2.2.0 ]
   workflow_dispatch:
   workflow_call:
 
 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: 1966
-  RELEASE_NAME: release-2.1.0
+  PR_NUMBER: 2047
+  RELEASE_NAME: release-2.2.0
 
 jobs:
 

diff --git a/.gitignore b/.gitignore
@@ -89,8 +89,6 @@ backend/sonar-runner/.settings/
 frontend/sonar-runner/.settings/
 sonar-runner/.settings/
 
-# local settings
-minio.env
 
 # package-lock
 package-lock.json

diff --git 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.1.0'
+const version = '2.2.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.1.0'
+            releaseBranch: 'release-2.2.0'
           },
   dev: {namespace:'0ab226-dev'    , name: `${name}`, phase: 'dev'  , changeId:changeId, suffix: `-dev`  , 
         instance: `${name}-dev`  , version:`${version}`, tag:`dev-${version}`, dbServiceName: 'tfrs-spilo',
@@ -74,7 +74,7 @@ const phases = {
         schemaSpyAuditCpuRequest: '50m', schemaSpyAuditCpuLimit: '300m', schemaSpyAuditMemoryRequest: '256Mi', schemaSpyAuditMemoryLimit: '512Mi'
       },
   prod: {namespace:'0ab226-prod'    , name: `${name}`, phase: 'prod'  , changeId:changeId, suffix: `-prod`  , 
-        instance: `${name}-prod`  , version:`${version}`, tag:`prod-${version}`, dbServiceName: 'patroni-master-prod',
+        instance: `${name}-prod`  , version:`${version}`, tag:`prod-${version}`, dbServiceName: 'tfrs-spilo',
         frontendCpuRequest: '40m', frontendCpuLimit: '80m', frontendMemoryRequest: '60Mi', frontendMemoryLimit: '120Mi', frontendReplicas: 4,
             frontendKeycloakAuthority: 'https://loginproxy.gov.bc.ca/auth', frontendKeycloakClientId: 'tfrs-on-gold-4308', frontendKeycloakCallbackUrl: 'https://lowcarbonfuels.gov.bc.ca',
             frontendKeycloakLogoutUrl: 'https://lowcarbonfuels.gov.bc.ca', 

diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ sonar-project.properties
 ## Documentation
 - [TFRS Readme](https://raw.githubusercontent.com/bcgov/tfrs/master/README.md)
 - [TFRS Project Documentation](https://github.com/bcgov/tfrs/wiki)
-- [TFRS Developer Documentation](https://github.com/bcgov/tfrs-docs/)
+- [TFRS Developer Documentation](./developer-guide.md)
 
 ## Getting Help or Reporting an Issue
 To report bugs/issues/features requests, please file an [issue](https://github.com/bcgov/tfrs/issues/).
@@ -96,4 +96,27 @@ This repository is maintained by [Low Carbon Fuels Branch](http://www2.gov.bc.ca
 
 Thanks to BrowserStack for Testing Tool support via OpenSource Licensing
 
-[![BrowserStack](browserstack-logo-white-small.png)](http://browserstack.com/)
+[![BrowserStack](browserstack-logo-white-small.png)](http://browserstack.com/)]
+
+
+# List of Dev Work | What to do before bringing in a new ticket into a Sprint
+
+This is a list that was created on 2023-02-01 with all Zelda Devs to provide alternative work instead of bringing in a new ticket.  
+
+**Team Rule* Do not bring in ticket After Friday 
+
+1. Help another Dev - see if other Devs need help to finish their ticket 
+
+2. PR Reviews – linked to the task above 
+
+3. Writing additional tests – for both tront and back end 
+
+4. Take a look at Tech Debt tickets - If we bring in tickets let's bring in Tech Debt first 
+
+5. Learning time: 
+
+- Take the opportunity to familiarize yourself with business logic, tech (anything around work we do) 
+
+- New learning and applying it to our work 
+
+- Innovation work 
diff --git a/backend/api/fixtures/development/dockerized.py b/backend/api/fixtures/development/dockerized.py
diff --git a/backend/api/fixtures/test/test_compliance_periods.json b/backend/api/fixtures/test/test_compliance_periods.json
@@ -108,5 +108,35 @@
     },
     "model": "api.complianceperiod",
     "pk": "11"
+  },
+  {
+    "fields": {
+        "description": "2021",
+        "display_order": "12",
+        "effective_date": "2021-01-01",
+        "expiration_date": "2021-12-31"
+    },
+    "model": "api.complianceperiod",
+    "pk": "12"
+  },
+  {
+    "fields": {
+        "description": "2022",
+        "display_order": "13",
+        "effective_date": "2022-01-01",
+        "expiration_date": "2022-12-31"
+    },
+    "model": "api.complianceperiod",
+    "pk": "13"
+  },
+  {
+    "fields": {
+        "description": "2023",
+        "display_order": "14",
+        "effective_date": "2023-01-01",
+        "expiration_date": "2023-12-31"
+    },
+    "model": "api.complianceperiod",
+    "pk": "14"
   }
 ]
diff --git a/backend/api/fixtures/test/test_credit_trade_comments.json b/backend/api/fixtures/test/test_credit_trade_comments.json
@@ -8,7 +8,8 @@
       "last_name": "FS",
       "organization": [
         "Air Liquide Canada Inc."
-      ]
+      ],
+      "keycloak_user_id": "fs_air_liquide"
     },
     "model": "api.user",
     "pk": null
@@ -34,7 +35,8 @@
       "last_name": "FS",
       "organization": [
         "Husky Oil Ltd."
-      ]
+      ],
+      "keycloak_user_id": "fs_husky"
     },
     "model": "api.user",
     "pk": null
@@ -60,7 +62,8 @@
       "last_name": "FS",
       "organization": [
         "Shell Canada Products"
-      ]
+      ],
+      "keycloak_user_id": "fs_shell"
     },
     "model": "api.user",
     "pk": null

diff --git a/backend/api/fixtures/test/test_prodlike_government_users_and_roles.json b/backend/api/fixtures/test/test_prodlike_government_users_and_roles.json
@@ -8,7 +8,8 @@
       "last_name": "Gov",
       "organization": [
         "Government of British Columbia"
-      ]
+      ],
+      "keycloak_user_id": "gov_director"
     },
     "model": "api.user",
     "pk": null
@@ -34,7 +35,8 @@
       "last_name": "Gov",
       "organization": [
         "Government of British Columbia"
-      ]
+      ],
+      "keycloak_user_id": "gov_analyst"
     },
     "model": "api.user",
     "pk": null
@@ -60,7 +62,8 @@
       "last_name": "Gov",
       "organization": [
         "Government of British Columbia"
-      ]
+      ],
+      "keycloak_user_id": "gov_manager"
     },
     "model": "api.user",
     "pk": null
@@ -86,7 +89,8 @@
       "last_name": "Admin",
       "organization": [
         "Government of British Columbia"
-      ]
+      ],
+      "keycloak_user_id": "gov_admin"
     },
     "model": "api.user",
     "pk": null

diff --git a/backend/api/fixtures/test/test_users_and_organizations_v0.3.1.json b/backend/api/fixtures/test/test_users_and_organizations_v0.3.1.json
@@ -56,7 +56,8 @@
       "last_name": "Supplier 1",
       "organization": [
         "Test Org 1"
-      ]
+      ],
+      "keycloak_user_id": "fs_user_1"
     },
     "model": "api.user",
     "pk": null
@@ -82,7 +83,8 @@
       "last_name": "Supplier 2",
       "organization": [
         "Test Org 2"
-      ]
+      ],
+      "keycloak_user_id": "fs_user_2"
     },
     "model": "api.user",
     "pk": null
@@ -108,7 +110,8 @@
       "last_name": "Supplier 3",
       "organization": [
         "Test Org 3"
-      ]
+      ],
+      "keycloak_user_id": "fs_user_3"
     },
     "model": "api.user",
     "pk": null

diff --git a/backend/api/fixtures/test/test_users_multiple_roles.json b/backend/api/fixtures/test/test_users_multiple_roles.json
@@ -8,7 +8,8 @@
       "last_name": "Role",
       "organization": [
         "Government of British Columbia"
-      ]
+      ],
+      "keycloak_user_id": "gov_multi_role"
     },
     "model": "api.user",
     "pk": null