Merge branch 'orcasound:main' into main

.github/workflows/OrcaHello.Web.Api.yaml

@@ -1,6 +1,12 @@
 name: OrcaHello.Web.Api
 
 on:
+  pull_request:
+    branches:
+    - main
+    paths:
+    - ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api/**
+    - ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Shared/**
   push:
     branches:
     - main
@@ -10,7 +16,7 @@ on:
   workflow_dispatch: # Allow manual workflow invocation from the Github Actions UI
 
 env:
-  DOTNET_VERSION: 6.0.x
+  DOTNET_VERSION: 8.0.x
   DOTNET_RUNTIME: win-x86
   WORKING_DIR: ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api
   PUBLISH_DIR: output
@@ -31,7 +37,7 @@ jobs:
         egress-policy: audit
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Set up .NET Core
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}

.github/workflows/OrcaHello.Web.UI.yaml

@@ -1,6 +1,12 @@
 name: OrcaHello.Web.UI
 
 on:
+  pull_request:
+    branches:
+    - main
+    paths:
+    - ModeratorFrontEnd/OrcaHello/OrcaHello.Web.UI/**
+    - ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Shared/**
   push:
     branches:
     - main
@@ -10,7 +16,7 @@ on:
   workflow_dispatch: # Allow manual workflow invocation from the Github Actions UI
 
 env:
-  DOTNET_VERSION: 6.0.x
+  DOTNET_VERSION: 8.0.x
   DOTNET_RUNTIME: win-x86
   WORKING_DIR: ModeratorFrontEnd/OrcaHello/OrcaHello.Web.UI
   PUBLISH_DIR: output
@@ -31,7 +37,7 @@ jobs:
         egress-policy: audit
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Set up .NET Core
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}

ModeratorFrontEnd/OrcaHello/OrcaHello.Web.UI/OrcaHello.Web.UI.csproj

@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Blazorade.Msal" Version="2.2.0" />
     <PackageReference Include="Radzen.Blazor" Version="4.20.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.1.2" />
   </ItemGroup>
 
   <ItemGroup>

NotificationSystem/SendModeratorEmail.cs

@@ -35,13 +35,15 @@ public static async Task Run(
 
             var newDocumentCreated = false;
             DateTime? documentTimeStamp = null;
+            string location = null;
 
             foreach (var document in input)
             {
                 if (!document.GetPropertyValue<bool>("reviewed"))
                 {
                     newDocumentCreated = true;
                     documentTimeStamp = document.GetPropertyValue<DateTime>("timestamp");
+                    location = document.GetPropertyValue<string>("location.name");
                     break;
                 }
             }
@@ -53,13 +55,14 @@ public static async Task Run(
             }
 
             // TODO: make better email
-            string body = EmailTemplate.GetModeratorEmailBody(documentTimeStamp);
+            string body = EmailTemplate.GetModeratorEmailBody(documentTimeStamp, location);
 
             log.LogInformation("Retrieving email list and sending notifications");
             foreach (var emailEntity in EmailHelpers.GetEmailEntities(cloudTable, "Moderator"))
             {
+                string emailSubject = string.Format("OrcaHello Candidate at location {0}", location);
                 var email = EmailHelpers.CreateEmail(Environment.GetEnvironmentVariable("SenderEmail"),
-                    emailEntity.Email, "Please validate new OrcaHello detection", body);
+                    emailEntity.Email, emailSubject, body);
                 await messageCollector.AddAsync(email);
             }
         }

NotificationSystem/SendSubscriberEmail.cs

@@ -64,7 +64,7 @@ public static async Task<string> CreateBody(CloudQueue cloudQueue)
                 await cloudQueue.DeleteMessageAsync(message);
             }
 
-            return EmailTemplate.GeSubscriberEmailBody(messagesJson);
+            return EmailTemplate.GetSubscriberEmailBody(messagesJson);
         }
     }
 }

NotificationSystem/Template/EmailTemplate.cs

@@ -8,12 +8,12 @@ namespace NotificationSystem.Template
     // TODO: we should move all html out of code and maybe use a preset email template for better design. 
     public static class EmailTemplate
     {
-        public static string GetModeratorEmailBody(DateTime? timestamp)
+        public static string GetModeratorEmailBody(DateTime? timestamp, string location)
         {
-            return $"<html><head><style>{GetCSS()}</style></head><body>{GetModeratorEmailHtml(timestamp)}</body></html>";
+            return $"<html><head><style>{GetCSS()}</style></head><body>{GetModeratorEmailHtml(timestamp, location)}</body></html>";
         }
 
-        public static string GeSubscriberEmailBody(List<JObject> messages)
+        public static string GetSubscriberEmailBody(List<JObject> messages)
         {
             return $"<html><head><style>{GetCSS()}</style></head><body>{GetSubscriberEmailHtml(messages)}</body></html>";
         }
@@ -26,7 +26,7 @@ private static string GetSubscriberEmailHtml(List<JObject> messages)
                 <body>
                 <div class='card'>
                 <h1>
-                Southern Resident Killer Whale Spotted
+                Southern Resident Killer Whale Detected
                 </h1>
                 <p>
                 Dear subscriber, a Southern Resident Killer Whale was most recently detected at around {timeString} PDT. 
@@ -47,7 +47,7 @@ Please be mindful of their presence when travelling in the areas below.
                 </p>
                 </div>
                 <footer>
-                  In partnership with Microsoft AI 4 Earth, Orca Sound and Orca Conservancy.
+                  In partnership with Microsoft AI 4 Earth, Orcasound and Orca Conservancy.
                 </footer>
                 </body>
             ";
@@ -101,21 +101,21 @@ private static string GetMapUri(string locationName)
             }
         }
 
-        private static string GetModeratorEmailHtml(DateTime? timestamp)
+        private static string GetModeratorEmailHtml(DateTime? timestamp, string location)
         {
             string timeString = GetPDTTimestring(timestamp);
 
             return $@"
                 <body>
                 <div class='card'>
                 <h1>
-                Orca Call Identified
+                Orca Call Candidate
                 </h1>
                 <p>
-                Dear moderator, a potential Southern Resident Killer Whale call was detected on {timeString} PDT. 
+                Dear moderator, a potential Southern Resident Killer Whale call was detected on {timeString} PDT at {location} location. 
                 </p>
                 <p>
-                This is a request for your moderation to confirm whether the sound belongs to a Southern Resident Killer Whale on the portal below.
+                This is a request for your moderation to confirm whether the sound was produced by Southern Resident Killer Whale on the portal below.
                 </p>
                 <hr/>
                 <h2>
@@ -131,7 +131,7 @@ Go to portal
                 <footer>
                   <br>
                   <center>
-                  In partnership with Microsoft AI 4 Earth, Orca Sound and Orca Conservancy.
+                  In partnership with Microsoft AI 4 Earth, Orcasound and Orca Conservancy.
                   </center>
                 </footer>
                 </body>