Merge pull request #241 from GeekInTheNorth/main

Merge Main back into Develop
GeekInTheNorth · Sep 23, 2024 · 2014672 · 2014672
2 parents 12082ef + db391e7
commit 2014672
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 21 deletions.
diff --git a/Sample/OptimizelyTwelveTest/OptimizelyTwelveTest.csproj b/Sample/OptimizelyTwelveTest/OptimizelyTwelveTest.csproj
@@ -4,10 +4,11 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EPiServer.CMS" Version="12.23.0" />
-    <PackageReference Include="EPiServer.Find.Cms" Version="15.2.0" />
+    <PackageReference Include="EPiServer.CMS" Version="12.31.0" />
+    <PackageReference Include="EPiServer.Find.Cms" Version="16.2.0" />
     <PackageReference Include="MediatR" Version="12.1.1" />
-    <PackageReference Include="Stott.Optimizely.RobotsHandler" Version="2.6.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
+    <PackageReference Include="Stott.Optimizely.RobotsHandler" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Sample/OptimizelyTwelveTest/modules/_protected/CMS/CMS.zip b/Sample/OptimizelyTwelveTest/modules/_protected/CMS/CMS.zip
diff --git a/...e/OptimizelyTwelveTest/modules/_protected/EPiServer.Cms.TinyMce/EPiServer.Cms.TinyMce.zip b/...e/OptimizelyTwelveTest/modules/_protected/EPiServer.Cms.TinyMce/EPiServer.Cms.TinyMce.zip
diff --git a/...OptimizelyTwelveTest/modules/_protected/EPiServer.Cms.UI.Admin/EPiServer.Cms.UI.Admin.zip b/...OptimizelyTwelveTest/modules/_protected/EPiServer.Cms.UI.Admin/EPiServer.Cms.UI.Admin.zip
diff --git a/...zelyTwelveTest/modules/_protected/EPiServer.Cms.UI.Settings/EPiServer.Cms.UI.Settings.zip b/...zelyTwelveTest/modules/_protected/EPiServer.Cms.UI.Settings/EPiServer.Cms.UI.Settings.zip
diff --git a/...Test/modules/_protected/EPiServer.Cms.UI.VisitorGroups/EPiServer.Cms.UI.VisitorGroups.zip b/...Test/modules/_protected/EPiServer.Cms.UI.VisitorGroups/EPiServer.Cms.UI.VisitorGroups.zip
diff --git a/Sample/OptimizelyTwelveTest/modules/_protected/Find/Find.zip b/Sample/OptimizelyTwelveTest/modules/_protected/Find/Find.zip
diff --git a/Sample/OptimizelyTwelveTest/modules/_protected/Shell/Shell.zip b/Sample/OptimizelyTwelveTest/modules/_protected/Shell/Shell.zip
diff --git a/src/Stott.Security.Optimizely.Test/Stott.Security.Optimizely.Test.csproj b/src/Stott.Security.Optimizely.Test/Stott.Security.Optimizely.Test.csproj
@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
     <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Stott.Security.Optimizely/Static/main.5042c405.js.map b/src/Stott.Security.Optimizely/Static/main.5042c405.js.map
diff --git a/...curity.Optimizely/Static/main.5042c405.js → ...curity.Optimizely/Static/main.79ae4d09.js b/...curity.Optimizely/Static/main.5042c405.js → ...curity.Optimizely/Static/main.79ae4d09.js
diff --git a/...izely/Static/main.5042c405.js.LICENSE.txt → ...izely/Static/main.79ae4d09.js.LICENSE.txt b/...izely/Static/main.5042c405.js.LICENSE.txt → ...izely/Static/main.79ae4d09.js.LICENSE.txt
diff --git a/src/Stott.Security.Optimizely/Static/main.79ae4d09.js.map b/src/Stott.Security.Optimizely/Static/main.79ae4d09.js.map
diff --git a/src/Stott.Security.Optimizely/Stott.Security.Optimizely.csproj b/src/Stott.Security.Optimizely/Stott.Security.Optimizely.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Version>2.7.0.0</Version>
+    <Version>2.8.0.0</Version>
     <RepositoryUrl>https://github.com/GeekInTheNorth/Stott.Security.Optimizely</RepositoryUrl>
     <PackageProjectUrl>https://github.com/GeekInTheNorth/Stott.Security.Optimizely</PackageProjectUrl>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -14,10 +14,10 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryType>git</RepositoryType>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <AssemblyVersion>2.7.0.0</AssemblyVersion>
+    <AssemblyVersion>2.8.0.0</AssemblyVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageOutputPath>D:\Repos\Nuget</PackageOutputPath>
-    <PackageReleaseNotes>Add a preview widget to the CMS Edit interface and some quality of life UI enhancements.</PackageReleaseNotes>
+    <PackageReleaseNotes>Update of the menu system, caching and lazy loading improvements and package updates.</PackageReleaseNotes>
     <Nullable>enable</Nullable>
     <Title>Stott Security</Title>
   </PropertyGroup>
@@ -63,15 +63,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EPiServer.CMS.UI.Core" Version="12.23.0" />
+    <PackageReference Include="EPiServer.CMS.UI.Core" Version="[12.27.0,13.0.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.0,8.0.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.1,9.0.0)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Stott.Security.React/src/Navigation/NavigationContainer.js b/src/Stott.Security.React/src/Navigation/NavigationContainer.js
@@ -16,8 +16,8 @@ function NavigationContainer() {
     const [toastTitle, setToastTitle] = useState('');
     const [toastDescription, setToastDescription] = useState('');
     const [toastHeaderClass, setToastHeaderClass] = useState('');
-    const [showCspSettings, setShowCspSettings] = useState(true);
-    const [showCspSandbox, setShowCspSandbox] = useState(true);
+    const [showCspSettings, setShowCspSettings] = useState(false);
+    const [showCspSandbox, setShowCspSandbox] = useState(false);
     const [showCspSources, setShowCspSources] = useState(false);
     const [showCspViolations, setShowCspViolations] = useState(false);
     const [showCorsSettings, setShowCorsSettings] = useState(false);
@@ -97,11 +97,17 @@ function NavigationContainer() {
 
     useEffect(() => {
         const handleHashChange = () => {
-            var hash = window.location.hash?.substring(1) ?? 'csp-settings';
-            handleSelect(hash);
+            var hash = window.location.hash?.substring(1);
+            if (hash && hash !== '') {
+                handleSelect(hash);
+            }
+            else {
+                handleSelect('csp-settings');
+            }
         };
 
         window.addEventListener('hashchange', handleHashChange);
+        handleHashChange();
 
         return () => {
             window.removeEventListener('hashchange', handleHashChange);