Merge branch 'main' into gvkries/exmgr-optimzations

gvkries · Jul 3, 2024 · b25c2a2 · b25c2a2
2 parents d728199 + 1524e0f
commit b25c2a2
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 39 deletions.
diff --git a/.github/workflows/close_stale_prs_issues.yml b/.github/workflows/close_stale_prs_issues.yml
@@ -4,8 +4,10 @@ name: Close Stale PRs and Issues
 
 on:
   schedule:
-    # Every day at 1:39 AM UTC. A random time to avoid GitHub Actions being overloaded by scheduled workflows.
-    - cron: '39 1 * * *'
+    # Every four hours at :39 UTC. A random time to avoid GitHub Actions being overloaded by scheduled workflows. Need
+    # to run this relatively frequently to avoid "No more operations left! Exiting..." warnings. Increasing the operations
+    # (see https://github.com/actions/stale#operations-per-run) is risky.
+    - cron: '39 */4 * * *'
 
 jobs:
   close-stale-prs-issues:

diff --git a/.github/workflows/community_metrics.yml b/.github/workflows/community_metrics.yml
@@ -59,6 +59,7 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore type:discussions created:${{ env.LAST_MONTH }} category:Q&A'
         HIDE_TIME_TO_CLOSE: true
+        HIDE_ITEMS_CLOSED_COUNT: true
 
     - name: Concatenate Issue/PR and Discussion Metrics
       shell: pwsh

diff --git a/.github/workflows/first_time_contributor.yml b/.github/workflows/first_time_contributor.yml
@@ -17,17 +17,18 @@ jobs:
     - uses: OrchardCMS/welcome-action@task/update-to-node-20
       with:
         FIRST_ISSUE_COMMENT: >
-          Thank you for submitting your first issue, awesome! 🚀 We're thrilled to receive your input. If you haven't 
-          completed the template yet, please take a moment to do so. This ensures that we fully understand your feature 
-          request or bug report. A core team member will review your issue and get back to you.
+          Thank you for submitting your first issue, awesome! 🚀 We're thrilled to receive your input. If you haven't
+          completed the template yet, please take a moment to do so. This ensures that we fully understand your feature
+          request or bug report. On what happens next, see 
+          [the docs](https://docs.orchardcore.net/en/latest/guides/contributing/managing-issues/#what-happens-after-you-open-an-issue).
         FIRST_PR_COMMENT: >
-          Thank you for submitting your first pull request, awesome! 🚀 If you haven't already, please take a moment 
-          to review our [contribution guide](https://docs.orchardcore.net/en/latest/guides/contributing/). This 
-          guide provides helpful information to ensure your contribution aligns with our standards. A core team member 
+          Thank you for submitting your first pull request, awesome! 🚀 If you haven't already, please take a moment
+          to review our [contribution guide](https://docs.orchardcore.net/en/latest/guides/contributing/). This
+          guide provides helpful information to ensure your contribution aligns with our standards. A core team member
           will review your pull request.
         FIRST_PR_MERGED_COMMENT: >
-          Congratulations on your first PR merge! 🎉 Thank you for your contribution! We're looking forward to welcoming 
+          Congratulations on your first PR merge! 🎉 Thank you for your contribution! We're looking forward to welcoming
           other contributions of yours in the future. @all-contributors please add @{{ author }} for code.
         STAR_MESSAGE: > 
-          If you like Orchard Core, please star our repo and join our 
+          If you like Orchard Core, please star our repo and join our
           [community channels](https://github.com/OrchardCMS/OrchardCore/?tab=readme-ov-file#get-in-touch).
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,12 +12,12 @@
 
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.309.4" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.309.7" />
     <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
     <PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
-    <PackageVersion Include="Azure.Identity" Version="1.11.4" />
+    <PackageVersion Include="Azure.Identity" Version="1.12.0" />
     <PackageVersion Include="Azure.Search.Documents" Version="11.5.1" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
@@ -29,7 +29,7 @@
     <PackageVersion Include="GraphQL.MicrosoftDI" Version="7.8.0" />
     <PackageVersion Include="GraphQL.SystemTextJson" Version="7.8.0" />
     <PackageVersion Include="Jint" Version="3.1.3" />
-    <PackageVersion Include="JsonPath.Net" Version="1.1.0" />
+    <PackageVersion Include="JsonPath.Net" Version="1.1.2" />
     <PackageVersion Include="HtmlSanitizer" Version="8.1.860-beta" />
     <PackageVersion Include="Irony" Version="1.5.1" />
     <PackageVersion Include="libphonenumber-csharp" Version="8.13.39" />
@@ -53,7 +53,7 @@
       See https://github.com/OrchardCMS/OrchardCore/pull/16057 for more information.
     -->
 
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.6.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.6.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="MimeKit" Version="4.6.0" />
@@ -64,12 +64,12 @@
     <PackageVersion Include="NJsonSchema" Version="11.0.1" />
     <PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.11" />
     <PackageVersion Include="NodaTime" Version="3.1.11" />
-    <PackageVersion Include="OpenIddict.Core" Version="5.6.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.6.0" />
-    <PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.6.0" />
-    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.6.0" />
-    <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.6.0" />
-    <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.6.0" />
+    <PackageVersion Include="OpenIddict.Core" Version="5.7.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.7.0" />
+    <PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.7.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.7.0" />
+    <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.7.0" />
+    <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.7.0" />
     <PackageVersion Include="OrchardCore.Translations.All" Version="1.8.0" />
     <PackageVersion Include="PdfPig" Version="0.1.8" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />

diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Assets/Styles/mde.scss b/src/OrchardCore.Modules/OrchardCore.Markdown/Assets/Styles/mde.scss
@@ -14,7 +14,7 @@
 
 .EasyMDEContainer {
     display: block;
-    color: black;
+    color: var(--bs-body-color);
 }
 
 .EasyMDEContainer.sided--no-fullscreen {
@@ -109,7 +109,7 @@
 
 .editor-toolbar.fullscreen {
     width: 100%;
-    height: 50px;
+    height: var(--oc-top-nav-height, 50px);
     padding-top: 10px;
     padding-bottom: 10px;
     box-sizing: border-box;
@@ -124,7 +124,7 @@
 
 .editor-toolbar.fullscreen::before {
     width: 20px;
-    height: 50px;
+    height: var(--oc-top-nav-height, 50px);
     background: -moz-linear-gradient(left, rgba(var(--bs-body-bg-rgb), 1) 0%, rgba(var(--bs-body-bg-rgb), 0) 100%);
     background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(var(--bs-body-bg-rgb), 1)), color-stop(100%, rgba(var(--bs-body-bg-rgb), 0)));
     background: -webkit-linear-gradient(left, rgba(var(--bs-body-bg-rgb), 1) 0%, rgba(var(--bs-body-bg-rgb), 0) 100%);
@@ -140,7 +140,7 @@
 
 .editor-toolbar.fullscreen::after {
     width: 20px;
-    height: 50px;
+    height: var(--oc-top-nav-height, 50px);
     background: -moz-linear-gradient(left, rgba(var(--bs-body-bg-rgb), 0) 0%, rgba(var(--bs-body-bg-rgb), 1) 100%);
     background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(var(--bs-body-bg-rgb), 0)), color-stop(100%, rgba(var(--bs-body-bg-rgb), 1)));
     background: -webkit-linear-gradient(left, rgba(var(--bs-body-bg-rgb), 0) 0%, rgba(var(--bs-body-bg-rgb), 1) 100%);
@@ -275,13 +275,13 @@
     position: fixed;
     bottom: 0;
     width: 50%;
-    top: 50px;
+    top: var(--oc-top-nav-height, 50px);
     right: 0;
     z-index: var(--oc-mde-zindex);
     overflow: auto;
     display: none;
     box-sizing: border-box;
-    border: 1px solid #ddd;
+    border: var(--bs-border-width, 1px) solid var(--bs-border-color, #bbb);
     word-wrap: break-word;
 }
 
@@ -315,7 +315,7 @@
 
 .editor-preview table td,
 .editor-preview table th {
-    border: 1px solid #ddd;
+    border: var(--bs-border-width, 1px) solid var(--bs-border-color, #bbb);
     padding: 5px;
 }
 
@@ -373,7 +373,7 @@
     position: relative;
     background: var(--bs-body-bg);
     border-radius: 0;
-    border: 1px solid #fff;
+    border: var(--bs-border-width, 1px) solid var(--bs-border-color, #bbb);
 }
 
 .editor-toolbar .easymde-dropdown:hover {

diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/wwwroot/Styles/mde.css b/src/OrchardCore.Modules/OrchardCore.Markdown/wwwroot/Styles/mde.css
@@ -18,7 +18,7 @@
 
 .EasyMDEContainer {
   display: block;
-  color: black;
+  color: var(--bs-body-color);
 }
 
 .EasyMDEContainer.sided--no-fullscreen {
@@ -157,7 +157,7 @@
 
 .editor-toolbar.fullscreen {
   width: 100%;
-  height: 50px;
+  height: var(--oc-top-nav-height, 50px);
   box-sizing: border-box;
   position: fixed;
   top: 0;
@@ -182,7 +182,7 @@
 
 .editor-toolbar.fullscreen::before {
   width: 20px;
-  height: 50px;
+  height: var(--oc-top-nav-height, 50px);
   position: fixed;
   top: 0;
 }
@@ -214,7 +214,7 @@
 
 .editor-toolbar.fullscreen::after {
   width: 20px;
-  height: 50px;
+  height: var(--oc-top-nav-height, 50px);
   position: fixed;
   top: 0;
 }
@@ -398,7 +398,7 @@
   position: fixed;
   bottom: 0;
   width: 50%;
-  top: 50px;
+  top: var(--oc-top-nav-height, 50px);
   z-index: var(--oc-mde-zindex);
   overflow: auto;
   display: none;
@@ -407,7 +407,7 @@
 }
 
 [dir] .editor-preview-side {
-  border: 1px solid #ddd;
+  border: var(--bs-border-width, 1px) solid var(--bs-border-color, #bbb);
 }
 
 [dir=ltr] .editor-preview-side {
@@ -447,7 +447,7 @@
 }
 
 [dir] .editor-preview table td, [dir] .editor-preview table th {
-  border: 1px solid #ddd;
+  border: var(--bs-border-width, 1px) solid var(--bs-border-color, #bbb);
   padding: 5px;
 }
 
@@ -508,7 +508,7 @@
 [dir] .editor-toolbar .easymde-dropdown {
   background: var(--bs-body-bg);
   border-radius: 0;
-  border: 1px solid #fff;
+  border: var(--bs-border-width, 1px) solid var(--bs-border-color, #bbb);
 }
 
 [dir] .editor-toolbar .easymde-dropdown:hover {