Merge remote-tracking branch 'origin/dev' into issue/NEST-462

Lombiq · Oct 19, 2023 · 605a4f4 · 605a4f4
2 parents 44cd8e5 + e787941
commit 605a4f4
Show file tree

Hide file tree

Showing 24 changed files with 67 additions and 34 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
-  <PropertyGroup Condition="'$([MSBuild]::IsOSUnixLike())' == 'false'">
+  <PropertyGroup>
     <!-- Use a single installation of Node.js Extensions for all projects in the solution. Currently, only works on
          Windows. -->
     <UseGlobalNodeJsExtensionsNpmPackage>true</UseGlobalNodeJsExtensionsNpmPackage>
@@ -26,13 +26,13 @@
        package dependencies instead of submodules. -->
    <!--<PropertyGroup>
     <NuGetBuild>true</NuGetBuild>
-  </PropertyGroup>--> 
+  </PropertyGroup>-->
 
   <!-- Uncomment this to run .NET static code analyzers during rebuilds. -->
   <!--<PropertyGroup>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
   </PropertyGroup>-->
-    
+
   <Import Project="tools/Lombiq.Analyzers/Lombiq.Analyzers.OrchardCore/Build.props" />
 
   <!-- This option hasn't improved the build time in this solution, but we'll keep it turned on regardless because it

diff --git a/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj b/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
@@ -34,14 +34,14 @@
     <PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="6.3.0-alpha.1.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="6.3.0-alpha.1.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="6.3.0-alpha.1.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="6.3.0-alpha.1.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="6.3.0-alpha.1.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="6.3.0-alpha.1.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="6.3.0-alpha.1.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="6.3.0-alpha.1.osoe-638" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="6.3.0-alpha.2.lmbq-249" />
     <PackageReference Include="Lombiq.JsonEditor" Version="6.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.Privacy" Version="7.0.2-alpha.2.osoe-638" />

diff --git a/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Recipes/Lombiq.OSOCE.NuGet.Tests.recipe.json b/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Recipes/Lombiq.OSOCE.NuGet.Tests.recipe.json
@@ -36,6 +36,7 @@
         "Lombiq.Hosting.Tenants.Management.ShellSettingsEditor",
         "Lombiq.Hosting.Tenants.EmailQuotaManagement",
         "Lombiq.Hosting.Tenants.IdleTenantManagement.ShutDownIdleTenants",
+        "Lombiq.Hosting.Tenants.Maintenance.ChangeUserSensitiveContent",
         "Lombiq.JsonEditor",
         "Lombiq.OSOCE.Samples",
         "Lombiq.OSOCE.NuGet.TestModule",

diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj
@@ -23,12 +23,13 @@
     <PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="7.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="4.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="5.0.1-alpha.0.osoe-638" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="6.3.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="6.3.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="6.3.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="6.3.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="6.3.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="6.3.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
     <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="4.0.1-alpha.0.osoe-638" />
     <PackageReference Include="Lombiq.Privacy.Tests.UI" Version="7.0.2-alpha.2.osoe-638" />

diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs
@@ -0,0 +1,23 @@
+using Lombiq.Hosting.Tenants.Maintenance.Tests.UI.Extensions;
+using Lombiq.Tests.UI.Attributes;
+using Lombiq.Tests.UI.Services;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Lombiq.OSOCE.NuGet.Tests.UI.Tests.ModuleTests;
+
+public class BehaviorMaintenanceTests : UITestBase
+{
+    public BehaviorMaintenanceTests(ITestOutputHelper testOutputHelper)
+        : base(testOutputHelper)
+    {
+    }
+
+    [Theory, Chrome]
+    public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully(Browser browser) =>
+        ExecuteTestAfterSetupAsync(
+            async context => await context.ChangeUserSensitiveContentMaintenanceExecutionAsync(),
+            browser,
+            configuration => configuration.ChangeUserSensitiveContentMaintenanceConfiguration());
+}
diff --git a/src/Libraries/Lombiq.HelpfulLibraries b/src/Libraries/Lombiq.HelpfulLibraries
diff --git a/src/Libraries/Lombiq.OrchardCoreApiClient b/src/Libraries/Lombiq.OrchardCoreApiClient
diff --git a/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json b/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json
@@ -38,6 +38,7 @@
         "Lombiq.Hosting.Tenants.Maintenance",
         "Lombiq.Hosting.Tenants.Maintenance.UpdateSiteUrl",
         "Lombiq.Hosting.Tenants.Maintenance.AddSiteOwnerPermissionToRole",
+        "Lombiq.Hosting.Tenants.Maintenance.ChangeUserSensitiveContent",
         "Lombiq.Hosting.Tenants.IdleTenantManagement.ShutDownIdleTenants",
         "Lombiq.Hosting.Tenants.EmailQuotaManagement",
         "Lombiq.JsonEditor",

diff --git a/src/Modules/Lombiq.ChartJs b/src/Modules/Lombiq.ChartJs
diff --git a/src/Modules/Lombiq.ContentEditors b/src/Modules/Lombiq.ContentEditors
diff --git a/src/Modules/Lombiq.DataTables b/src/Modules/Lombiq.DataTables
diff --git a/src/Modules/Lombiq.HelpfulExtensions b/src/Modules/Lombiq.HelpfulExtensions
diff --git a/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights b/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights
diff --git a/src/Modules/Lombiq.Hosting.BuildVersionDisplay b/src/Modules/Lombiq.Hosting.BuildVersionDisplay
diff --git a/src/Modules/Lombiq.Hosting.Tenants b/src/Modules/Lombiq.Hosting.Tenants
diff --git a/src/Modules/Lombiq.JsonEditor b/src/Modules/Lombiq.JsonEditor
diff --git a/src/Modules/Lombiq.Privacy b/src/Modules/Lombiq.Privacy
diff --git a/src/Modules/Lombiq.UIKit b/src/Modules/Lombiq.UIKit
diff --git a/src/Modules/Lombiq.VueJs b/src/Modules/Lombiq.VueJs
diff --git a/src/Themes/Lombiq.BaseTheme b/src/Themes/Lombiq.BaseTheme
diff --git a/src/Themes/Lombiq.Hosting.MediaTheme b/src/Themes/Lombiq.Hosting.MediaTheme
diff --git a/src/Utilities/Lombiq.NodeJs.Extensions b/src/Utilities/Lombiq.NodeJs.Extensions
diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs
@@ -27,4 +27,11 @@ public Task AddSiteOwnerPermissionToRoleMaintenanceTaskShouldBeExecutedSuccessfu
             async context => await context.TestSiteOwnerPermissionToRoleMaintenanceExecutionAsync(),
             browser,
             configuration => configuration.SetAddSiteOwnerPermissionToRoleMaintenanceConfiguration());
+
+    [Theory, Chrome]
+    public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully(Browser browser) =>
+        ExecuteTestAfterSetupAsync(
+            async context => await context.ChangeUserSensitiveContentMaintenanceExecutionAsync(),
+            browser,
+            configuration => configuration.ChangeUserSensitiveContentMaintenanceConfiguration());
 }
diff --git a/tools/Lombiq.Analyzers b/tools/Lombiq.Analyzers
+1 −1		Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
+1 −1		Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+2 −2		Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
+15 −0		Lombiq.Hosting.Tenants.Maintenance.Tests.UI/Extensions/MaintenanceExtensions.cs
+20 −0		Lombiq.Hosting.Tenants.Maintenance.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+33 −25		Lombiq.Hosting.Tenants.Maintenance.Tests.UI/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj
+19 −0		....Hosting.Tenants.Maintenance.Tests.UI/Recipes/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.Users.recipe.json
+1 −0		Lombiq.Hosting.Tenants.Maintenance/Constants/FeatureNames.cs
+4 −1		Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
+7 −0		....Tenants.Maintenance/Maintenance/ChangeUserSensitiveContent/ChangeUserSensitiveContentMaintenanceOptions.cs
+73 −0		...Tenants.Maintenance/Maintenance/ChangeUserSensitiveContent/ChangeUserSensitiveContentMaintenanceProvider.cs
+28 −0		Lombiq.Hosting.Tenants.Maintenance/Maintenance/ChangeUserSensitiveContent/Startup.cs
+9 −0		Lombiq.Hosting.Tenants.Maintenance/Manifest.cs
+19 −0		Lombiq.Hosting.Tenants.Maintenance/Readme.md
+1 −1		Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
+1 −1		Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
+1 −1		Lombiq.VueJs.Samples/Lombiq.VueJs.Samples.csproj
+15 −6		Lombiq.VueJs/Assets/Scripts/helpers/process-helpers.js
+2 −2		Lombiq.VueJs/Assets/Scripts/helpers/vue-sfc-compiler-pipeline.js
+1 −1		Lombiq.VueJs/Lombiq.VueJs.csproj
+1 −1		Lombiq.NodeJs.Extensions/build/Common.props
+1 −1		Lombiq.NodeJs.Extensions/package.json
+7 −4		Lombiq.NodeJs.Extensions/scripts/clean-assets.js
+10 −4		Lombiq.NodeJs.Extensions/scripts/copy-assets.js
+2 −2		Lombiq.NodeJs.Extensions/scripts/find-recursively.js
+1 −1		Lombiq.NodeJs.Extensions/scripts/get-cwd.js
+39 −39		Lombiq.NodeJs.Extensions/scripts/get-path.js
+11 −0		Lombiq.NodeJs.Extensions/scripts/get-project-directory.js
+10 −0		Lombiq.NodeJs.Extensions/scripts/handle-error.js
+6 −2		Lombiq.NodeJs.Extensions/scripts/lint-markdown.js
+3 −10		Lombiq.NodeJs.Extensions/scripts/lint-styles.js
+9 −4		Lombiq.NodeJs.Extensions/scripts/minify.js
+1 −0		Lombiq.NodeJs.Extensions/scripts/run-pnpm-script.js