Merge pull request #564 from atlas-bi/dev

chore(sync) Syncing changes from dev to alpha

Author: Sean-Pickering

.github/workflows/test.yaml

@@ -115,7 +115,7 @@ jobs:
 
       - name: upload cov
         if: always()
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: ./coverage.cobertura.xml
           verbose: true
@@ -233,7 +233,7 @@ jobs:
 
       - name: upload cov
         if: always()
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: ./coverage.cobertura.xml
           verbose: true

package.json

@@ -40,7 +40,7 @@
     "gulp-autoprefixer": "8.0.0",
     "gulp-concat": "2.6.1",
     "gulp-cssnano": "2.1.3",
-    "gulp-postcss": "9.1.0",
+    "gulp-postcss": "10.0.0",
     "gulp-purgecss": "5.0.0",
     "gulp-rename": "2.0.0",
     "gulp-replace": "^1.1.4",
@@ -61,7 +61,7 @@
     "stylelint-config-prettier-scss": "1.0.0",
     "stylelint-config-standard-scss": "^13.0.0",
     "stylelint-scss": "^6.0.0",
-    "xo": "^0.56.0"
+    "xo": "^0.57.0"
   },
   "homepage": "https://demo.atlas.bi",
   "license": "AGPL-3.0-or-later",
@@ -164,7 +164,7 @@
       "unicorn/prefer-at": "warn"
     }
   },
-  "version": "3.15.0-alpha.1",
+  "version": "3.15.1",
   "dependencies": {
     "sass": "^1.63.6"
   }

web.Tests/web.Tests.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="BrowserStackLocal" Version="2.3.1" />
     <PackageReference Include="MartinCostello.BrowserStack.Automate" Version="4.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Selenium.WebDriver" Version="4.17.0" />

web/Services/EmailService.cs

@@ -57,11 +57,12 @@ public async Task SendAsync(string subject, string body, string sender, string r
                     System.Text.Encoding.UTF8,
                     MediaTypeNames.Text.Html
                 );
-
-                LinkedResource MyImage = new LinkedResource(
-                    _cache.Get("logo_path").ToString(),
-                    "image/png"
-                )
+                string logo = "wwwroot/img/atlas-a-logo.svg";
+                if (_cache.Get("logo_path") != null)
+                {
+                    logo = _cache.Get("logo_path").ToString();
+                }
+                LinkedResource MyImage = new LinkedResource(logo, "image/png")
                 {
                     ContentId = "atlas_logo",
                     TransferEncoding = TransferEncoding.Base64,

web/web.csproj

@@ -41,7 +41,7 @@
     <PackageReference Include="Hangfire.InMemory" Version="0.7.0" />
     <PackageReference Include="HtmlSanitizer" Version="8.0.838" />
     <PackageReference Include="LigerShark.WebOptimizer.AutoPrefixer" Version="7.1.8-beta" />
-    <PackageReference Include="LigerShark.WebOptimizer.Core" Version="3.0.396" />
+    <PackageReference Include="LigerShark.WebOptimizer.Core" Version="3.0.403" />
     <PackageReference Include="Markdig" Version="0.34.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
@@ -52,7 +52,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUglify" Version="1.21.3" />
+    <PackageReference Include="NUglify" Version="1.21.4" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
     <PackageReference Include="Slugify.Core" Version="4.0.1" />
     <PackageReference Include="SolrNet" Version="1.1.1" />