MMI-3269 Override report from address

Update DevOps

Author: Fosol

app/editor/src/features/admin/reports/ReportFormSections.tsx

@@ -123,21 +123,19 @@ export const ReportFormSections = () => {
       <Row gap="1rem">
         <Col className="frm-in options" flex="1">
           <div>
-            <label>Subject Line Options</label>
+            <label>Email Options</label>
           </div>
-          <Col>
-            <p>Customize the email subject line.</p>
-            <Row alignItems="center">
-              <Col flex="1">
-                <FormikText label="Text" name="settings.subject.text" required />
-              </Col>
-              <FormikCheckbox
-                label="Show Today's Date"
-                name="settings.subject.showTodaysDate"
-                tooltip="Whether today's date will be included in the report subject line"
-              />
-            </Row>
-          </Col>
+          <FormikText label="From" name="settings.from" />
+          <Row alignItems="center">
+            <Col flex="1">
+              <FormikText label="Subject" name="settings.subject.text" required />
+            </Col>
+            <FormikCheckbox
+              label="Show Today's Date"
+              name="settings.subject.showTodaysDate"
+              tooltip="Whether today's date will be included in the report subject line"
+            />
+          </Row>
         </Col>
         <ReportOptions />
       </Row>

libs/net/ches/ChesService.cs

@@ -228,7 +228,7 @@ public async Task<EmailResponseModel> SendEmailAsync(IEmail email)
         {
             ArgumentNullException.ThrowIfNull(email);
 
-            email.From = this.Options.From ?? email.From;
+            email.From = !String.IsNullOrWhiteSpace(this.Options.From) ? this.Options.From : email.From;
 
             if (this.Options.BccUser)
             {

libs/net/kafka/Models/ReportRequestModel.cs

@@ -51,6 +51,11 @@ public class ReportRequestModel
     /// </summary>
     public int? AssignedId { get; set; }
 
+    /// <summary>
+    /// get/set - Email Address that this report will be sent from.
+    /// </summary>
+    public string? From { get; set; }
+
     /// <summary>
     /// get/set - Comma separated email addresses that this report will be sent to instead of subscribers.
     /// </summary>

libs/net/models/Settings/ReportSettingsModel.cs

@@ -6,6 +6,11 @@ namespace TNO.API.Models.Settings;
 public class ReportSettingsModel
 {
     #region Properties
+    /// <summary>
+    /// get/set - The email from address.
+    /// </summary>
+    public string From { get; set; } = "";
+
     /// <summary>
     /// get/set - Subject configuration settings.
     /// </summary>
@@ -42,6 +47,7 @@ public ReportSettingsModel() { }
 
     public ReportSettingsModel(Dictionary<string, object> settings, JsonSerializerOptions options)
     {
+        this.From = settings.GetDictionaryJsonValue<string>("from", "", options)!;
         this.Subject = settings.GetDictionaryJsonValue<ReportSubjectSettingsModel>("subject", new(), options)!;
         this.Headline = settings.GetDictionaryJsonValue<ReportHeadlineSettingsModel>("headline", new(), options)!;
         this.Content = settings.GetDictionaryJsonValue<ReportContentSettingsModel>("content", new(), options)!;

libs/net/template/ReportEngine.cs

@@ -233,7 +233,6 @@ public async Task<string> GenerateBase64ImageAsync(
         var optionsBytes = Encoding.UTF8.GetBytes(optionsJson);
         var optionsBase64 = Convert.ToBase64String(optionsBytes);
 
-
         // Send request to Charts API to generate base64
         var body = new StringContent(dataJson, Encoding.UTF8, System.Net.Mime.MediaTypeNames.Application.Json);
         var width = model.ChartTemplate.SectionSettings.Width.HasValue ? $"width={model.ChartTemplate.SectionSettings.Width.Value}" : "";
@@ -244,7 +243,7 @@ public async Task<string> GenerateBase64ImageAsync(
                 model.ChartTemplate.SectionSettings.ChartType ?? "bar",
                 $"?{width}{height}&options={optionsBase64}"),
             body);
-        this.Logger.LogDebug("Chart generated, chartTemplateId:{templateId} options:{options}", model.ChartTemplate.Id, optionsJson);
+        this.Logger.LogDebug("Chart generated, chartTemplateId:{templateId}", model.ChartTemplate.Id);
         return await response.Content.ReadAsStringAsync();
     }
 
@@ -499,7 +498,7 @@ await section.ChartTemplates.ForEachAsync(async chart =>
                 {
                     chart.SectionSettings ??= new();
                     chart.SectionSettings.Options = MergeChartOptions(chart.Settings, chart.SectionSettings);
-                    var chartOptions = chart.SectionSettings.Options.ToJson();
+                    // var chartOptions = chart.SectionSettings.Options.ToJson();
 
                     var chartModel = new ChartEngineContentModel(
                         ReportSectionModel.GenerateChartUid(section.Id, chart.Id),
@@ -508,7 +507,7 @@ await section.ChartTemplates.ForEachAsync(async chart =>
                         settings.UseAllContent ? null : content);
                     var chartRequestModel = new ChartRequestModel(chartModel);
                     var base64Image = await this.GenerateBase64ImageAsync(chartRequestModel);
-                    this.Logger.LogDebug("Chart generated, reportId:{reportId} instanceId:{instanceId} sectionId:{sectionId} chartId:{chartId} options:{options}", report.Id, reportInstance?.Id, section.Id, chart.Id, chartOptions);
+                    this.Logger.LogDebug("Chart generated, reportId:{reportId} instanceId:{instanceId} sectionId:{sectionId} chartId:{chartId}", report.Id, reportInstance?.Id, section.Id, chart.Id);
 
                     // Replace Chart Stubs with the generated image.
                     body = body.Replace(ReportSectionModel.GenerateChartUid(section.Id, chart.Id), base64Image);

libs/npm/core/src/hooks/api/interfaces/IReportSettingsModel.ts

@@ -6,6 +6,7 @@ import {
 } from '.';
 
 export interface IReportSettingsModel {
+  from: string;
   subject: IReportSubjectSettingsModel;
   headline: IReportHeadlineSettingsModel;
   content: IReportContentSettingsModel;

openshift/kustomize/services/reporting/base/deploy.yaml

@@ -162,13 +162,13 @@ spec:
                 configMapKeyRef:
                   name: reporting-service
                   key: TOPICS
-
-            # CHES Configuration
-            - name: CHES__From
+            - name: Service__DefaultFrom
               valueFrom:
                 configMapKeyRef:
                   name: ches
                   key: CHES_FROM
+
+            # CHES Configuration
             - name: CHES__EmailEnabled
               valueFrom:
                 configMapKeyRef:

openshift/kustomize/shared_resources/overlays/dev/kustomization.yaml

@@ -21,6 +21,13 @@ generatorOptions:
   disableNameSuffixHash: true
 
 patches:
+  - target:
+      kind: ConfigMap
+      name: ches
+    patch: |-
+      - op: replace
+        path: /data/CHES_FROM
+        value: Media Monitoring Insights <dev.mmi@gov.bc.ca>
   - target:
       kind: ConfigMap
       name: keycloak

openshift/kustomize/shared_resources/overlays/prod/kustomization.yaml

@@ -21,6 +21,13 @@ generatorOptions:
   disableNameSuffixHash: true
 
 patches:
+  - target:
+      kind: ConfigMap
+      name: ches
+    patch: |-
+      - op: replace
+        path: /data/CHES_FROM
+        value: Media Monitoring Insights <mmi@gov.bc.ca>
   - target:
       kind: ConfigMap
       name: keycloak

openshift/kustomize/shared_resources/overlays/test/kustomization.yaml

@@ -21,6 +21,13 @@ generatorOptions:
   disableNameSuffixHash: true
 
 patches:
+  - target:
+      kind: ConfigMap
+      name: ches
+    patch: |-
+      - op: replace
+        path: /data/CHES_FROM
+        value: Media Monitoring Insights <test.mmi@gov.bc.ca>
   - target:
       kind: ConfigMap
       name: keycloak