Merge pull request #587 from bcgov/feat/update-logo-in-emails

feat!: change the URL used for the logo in the email templates
bcgov · Dec 20, 2023 · 9f9125b · 9f9125b
2 parents 3b3f6ed + 25c84a7
commit 9f9125b
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 37 deletions.
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/docker-compose.yml b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/docker-compose.yml
@@ -76,6 +76,7 @@ services:
       - CHES_SECRET=56b613b2-fbf8-481a-b464-38967c66e066
       - CHES_AUTH_URL=https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token
       - CHES_HOST_URL=https://ches-dev.api.gov.bc.ca
+      - APP_HOST=${APP_HOST:-epd-frontend-dev.apps.silver.devops.gov.bc.ca}
 
     networks:
       - forms-flow-bpm-network

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Common/CommonEmailWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Common/CommonEmailWorkflow.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_08oxgyg" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.0.0" modeler:executionPlatform="Camunda Platform">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_08oxgyg" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.18.0" modeler:executionPlatform="Camunda Platform">
   <bpmn:process id="common-email-workflow" name="CommonEmailWorkflow" isExecutable="true" camunda:historyTimeToLive="300">
     <bpmn:startEvent id="Event_0kew5uc" name="Start">
       <bpmn:outgoing>Flow_15fflso</bpmn:outgoing>
@@ -120,6 +120,11 @@ system.out.println ("result: "+result);</bpmn:script>
       <bpmn:extensionElements>
         <camunda:inputOutput>
           <camunda:inputParameter name="category">${category}</camunda:inputParameter>
+          <camunda:inputParameter name="host">
+            <camunda:script scriptFormat="javascript">const host = (java.lang.System).getenv('APP_HOST');
+console.log(`host: ${host}`);
+execution.setVariable("host", host);</camunda:script>
+          </camunda:inputParameter>
           <camunda:outputParameter name="support">
             <camunda:script scriptFormat="groovy">dmnResult.get("support")</camunda:script>
           </camunda:outputParameter>
@@ -146,34 +151,6 @@ system.out.println ("result: "+result);</bpmn:script>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="common-email-workflow">
-      <bpmndi:BPMNEdge id="Flow_0tc827u_di" bpmnElement="Flow_0tc827u">
-        <di:waypoint x="740" y="120" />
-        <di:waypoint x="780" y="120" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1uskeb8_di" bpmnElement="Flow_1uskeb8">
-        <di:waypoint x="610" y="120" />
-        <di:waypoint x="640" y="120" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1v2p747_di" bpmnElement="Flow_1v2p747">
-        <di:waypoint x="470" y="120" />
-        <di:waypoint x="510" y="120" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1lr16lw_di" bpmnElement="Flow_1lr16lw">
-        <di:waypoint x="1030" y="120" />
-        <di:waypoint x="1072" y="120" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_15fflso_di" bpmnElement="Flow_15fflso">
-        <di:waypoint x="208" y="120" />
-        <di:waypoint x="240" y="120" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_093urcj_di" bpmnElement="Flow_093urcj">
-        <di:waypoint x="880" y="120" />
-        <di:waypoint x="930" y="120" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0cog7s9_di" bpmnElement="Flow_0cog7s9">
-        <di:waypoint x="340" y="120" />
-        <di:waypoint x="370" y="120" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Event_0kew5uc_di" bpmnElement="Event_0kew5uc">
         <dc:Bounds x="172" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -205,6 +182,34 @@ system.out.println ("result: "+result);</bpmn:script>
       <bpmndi:BPMNShape id="ScriptTask_1l8slzj_di" bpmnElement="Task_1q29nrc">
         <dc:Bounds x="640" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0cog7s9_di" bpmnElement="Flow_0cog7s9">
+        <di:waypoint x="340" y="120" />
+        <di:waypoint x="370" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_093urcj_di" bpmnElement="Flow_093urcj">
+        <di:waypoint x="880" y="120" />
+        <di:waypoint x="930" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_15fflso_di" bpmnElement="Flow_15fflso">
+        <di:waypoint x="208" y="120" />
+        <di:waypoint x="240" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1lr16lw_di" bpmnElement="Flow_1lr16lw">
+        <di:waypoint x="1030" y="120" />
+        <di:waypoint x="1072" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1v2p747_di" bpmnElement="Flow_1v2p747">
+        <di:waypoint x="470" y="120" />
+        <di:waypoint x="510" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1uskeb8_di" bpmnElement="Flow_1uskeb8">
+        <di:waypoint x="610" y="120" />
+        <di:waypoint x="640" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0tc827u_di" bpmnElement="Flow_0tc827u">
+        <di:waypoint x="740" y="120" />
+        <di:waypoint x="780" y="120" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/nir_application.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/nir_application.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="nir_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/nom_application.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/nom_application.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="nom_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/request_updated.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/request_updated.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="nom_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sds_application.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sds_application.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="nir_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sir_application_approved.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sir_application_approved.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="sir_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sir_application_rejected.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sir_application_rejected.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="sir_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sosc_application.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/sosc_application.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="sosc_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/srcr_application.ftl b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/templates/srcr_application.ftl
@@ -12,7 +12,7 @@
     <table style="width: 580px;">
         <tr>
             <td style="width: 151px;">
-                <img style="width: 151px;" src="https://taft.fin.gov.bc.ca/img/BCID_H_rgb_pos_150.png">
+                <img style="width: 151px;" src="https://${host}/static/media/logo-banner.e5eec500e32dc7377862.png">
             </td>
             <td>
                 <span id="srcr_notification" style="overflow: visible;line-height: 30px;text-align: left;font-style: normal;font-weight: bold;font-size: 20px;color: rgba(0, 51, 102, 1);letter-spacing: -0.2px;vertical-align: middle;">Site Remediation Services</span>