Tracking pull request to merge release-1.7.0 to main (#244)

* update to 1.7.0 * changes to search feature results (#245) * changes to search feature results * fix typos * exclude attached documents from admin model * admin fields change (#246) * update templates for CORS_ORIGIN_WHITELIST Co-authored-by: vibhiquartech <[email protected]> Co-authored-by: tim738745 <[email protected]>
bcgov · Aug 2, 2022 · c56db98 · c56db98
1 parent dd2aa2e
commit c56db98
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 54 deletions.
diff --git a/django/api/admin.py b/django/api/admin.py
@@ -35,7 +35,33 @@ def has_delete_permission(self, request, obj=None):
 @admin.register(GoElectricRebateApplication)
 class GoElectricRebateApplicationAdmin(admin.ModelAdmin):
     search_fields = ["drivers_licence", "id", "status"]
-    pass
+    exclude = (
+        "sin",
+        "doc1",
+        "doc2",
+        "user",
+    )
+    readonly_fields = (
+        "id",
+        "last_name",
+        "first_name",
+        "middle_names",
+        "status",
+        "email",
+        "user_is_bcsc",
+        "address",
+        "city",
+        "postal_code",
+        "drivers_licence",
+        "date_of_birth",
+        "tax_year",
+        "application_type",
+        "doc1_tag",
+        "doc2_tag",
+        "consent_personal",
+        "consent_tax",
+        "is_legacy",
+    )
 
 
 # The proxy model is used to avoid a Django limitation where a model can only

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^2.14.0",

diff --git a/openshift/templates/backend/backend-dc.yaml b/openshift/templates/backend/backend-dc.yaml
@@ -94,11 +94,6 @@ objects:
     metadata:
       creationTimestamp: null
       name: "${NAME}-backend${SUFFIX}"
-    #      labels:
-    #        name: backend
-    #        app: itvr
-    #        role: backend
-    #        env: '${ENV_NAME}'
     spec:
       ports:
         - name: backend
@@ -174,28 +169,6 @@ objects:
         name: "${NAME}-backend${SUFFIX}"
         weight: 100
       wildcardPolicy: None
-  #  - apiVersion: route.openshift.io/v1
-  #    kind: Route
-  #    metadata:
-  #      creationTimestamp: null
-  #      labels:
-  #        name: backend
-  #        app: itvr
-  #        role: backend
-  #        env: '${ENV_NAME}'
-  #      name: '${NAME}-backend-health${SUFFIX}'
-  #    spec:
-  #      host: ${HOST_NAME}
-  #      path: /health
-  #      port:
-  #        targetPort: backend
-  #      tls:
-  #        termination: edge
-  #      to:
-  #        kind: Service
-  #        name: '${NAME}-backend${SUFFIX}'
-  #        weight: 100
-  #      wildcardPolicy: None
   - apiVersion: apps.openshift.io/v1
     kind: DeploymentConfig
     metadata:

diff --git a/openshift/templates/frontend/frontend-dc-docker.yaml b/openshift/templates/frontend/frontend-dc-docker.yaml
@@ -126,30 +126,31 @@ objects:
       type: ClusterIP
     status:
       loadBalancer: {}
-  - apiVersion: route.openshift.io/v1
-    kind: Route
-    metadata:
-      creationTimestamp: null
-      annotations:
-        haproxy.router.openshift.io/timeout: 1200s
-      labels:
-        name: frontend
-        app: zeva
-        role: frontend
-        env: ${ENV_NAME}
-      name: ${NAME}-frontend${SUFFIX}
-    spec:
-      host: ${HOST_NAME}
-      port:
-        targetPort: web
-      tls:
-        insecureEdgeTerminationPolicy: Redirect
-        termination: edge
-      to:
-        kind: Service
-        name: ${NAME}-frontend${SUFFIX}
-        weight: 100
-      wildcardPolicy: None
+# Commented after ITVR goes live as the official route is enabled
+#  - apiVersion: route.openshift.io/v1
+#    kind: Route
+#    metadata:
+#      creationTimestamp: null
+#      annotations:
+#        haproxy.router.openshift.io/timeout: 1200s
+#      labels:
+#        name: frontend
+#        app: zeva
+#        role: frontend
+#        env: ${ENV_NAME}
+#      name: ${NAME}-frontend${SUFFIX}
+#    spec:
+#      host: ${HOST_NAME}
+#      port:
+#        targetPort: web
+#      tls:
+#        insecureEdgeTerminationPolicy: Redirect
+#        termination: edge
+#      to:
+#        kind: Service
+#        name: ${NAME}-frontend${SUFFIX}
+#        weight: 100
+#      wildcardPolicy: None
   - apiVersion: apps.openshift.io/v1
     kind: DeploymentConfig
     metadata:

diff --git a/openshift/templates/task-queue/task-queue-dc.yaml b/openshift/templates/task-queue/task-queue-dc.yaml
@@ -41,6 +41,9 @@ parameters:
   - name: CRA_ENVIRONMENT
     description: the environment for CRA, P for production, A for all other envs
     required: true    
+  - name: CORS_ORIGIN_WHITELIST
+    description: CORS_ORIGIN_WHITELIST
+    required: true    
 objects:
   - apiVersion: image.openshift.io/v1
     kind: ImageStream
@@ -202,7 +205,7 @@ objects:
                 - name: DJANGO_TASKS
                   value: 'true'
                 - name: CORS_ORIGIN_WHITELIST
-                  value: "https://${NAME}${SUFFIX}.apps.silver.devops.gov.bc.ca"          
+                  value: ${CORS_ORIGIN_WHITELIST}      
                 - name: NCDA_CLIENT_ID
                   valueFrom:
                     secretKeyRef: