Fixed bug in referencing master page from embedded resource (#1754)

* Fixed issue with master page defines as embedded resource * UI test added
riganti · Jan 14, 2024 · cb8e675 · cb8e675
1 parent 5b6b6a3
commit cb8e675
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 1 deletion.
diff --git a/src/Framework/Framework/Hosting/EmbeddedMarkupFileLoader.cs b/src/Framework/Framework/Hosting/EmbeddedMarkupFileLoader.cs
@@ -50,7 +50,7 @@ public class EmbeddedMarkupFileLoader : IMarkupFileLoader
             //load the file
             using (Stream stream = assembly.GetManifestResourceStream(resourceName)!)
             using (StreamReader sr = new StreamReader(stream))
-                return new MarkupFile(resourceName, resourceName, sr.ReadToEnd());
+                return new MarkupFile(virtualPath, virtualPath, sr.ReadToEnd());
         }
 
         /// <summary>

diff --git a/src/Samples/Common/DotVVM.Samples.Common.csproj b/src/Samples/Common/DotVVM.Samples.Common.csproj
@@ -20,6 +20,7 @@
     <None Remove="script\**" />
   </ItemGroup>
   <ItemGroup>
+    <Content Remove="Views\FeatureSamples\EmbeddedResourceControls\EmbeddedResourceMasterPage.dotmaster" />
     <Content Remove="Views\FeatureSamples\ViewModules\ModuleControl.dotcontrol" />
   </ItemGroup>
   <ItemGroup>
@@ -98,6 +99,8 @@
     <None Remove="Views\FeatureSamples\CustomPrimitiveTypes\RouteLink.dothtml" />
     <None Remove="Views\FeatureSamples\CustomPrimitiveTypes\TextBox.dothtml" />
     <None Remove="Views\FeatureSamples\CustomPrimitiveTypes\UsedInControls.dothtml" />
+    <None Remove="Views\FeatureSamples\EmbeddedResourceControls\EmbeddedResourceMasterPage.dotmaster" />
+    <None Remove="Views\FeatureSamples\EmbeddedResourceControls\PageWithEmbeddedResourceMasterPage.dothtml" />
     <None Remove="Views\FeatureSamples\Formatting\AutoResourceInclusion.dothtml" />
     <None Remove="Views\FeatureSamples\Formatting\AutoResourceInclusionMaster.dotmaster" />
     <None Remove="Views\FeatureSamples\Formatting\ToStringGlobalFunctionBug.dothtml" />
@@ -193,6 +196,7 @@
     <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Views\FeatureSamples\EmbeddedResourceControls\EmbeddedResourceMasterPage.dotmaster" />
     <EmbeddedResource Include="Views\FeatureSamples\ViewModules\LinkModuleControl.dotcontrol" />
     <EmbeddedResource Include="Views\FeatureSamples\ViewModules\ModuleControl.dotcontrol" />
   </ItemGroup>

diff --git a/...ViewModels/FeatureSamples/EmbeddedResourceControls/EmbeddedResourceMasterPageViewModel.cs b/...ViewModels/FeatureSamples/EmbeddedResourceControls/EmbeddedResourceMasterPageViewModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DotVVM.Framework.ViewModel;
+using DotVVM.Framework.Hosting;
+
+namespace DotVVM.Samples.Common.ViewModels.FeatureSamples.EmbeddedResourceControls
+{
+    public class EmbeddedResourceMasterPageViewModel : DotvvmViewModelBase
+    {
+
+    }
+}
+
diff --git a/...ls/FeatureSamples/EmbeddedResourceControls/PageWithEmbeddedResourceMasterPageViewModel.cs b/...ls/FeatureSamples/EmbeddedResourceControls/PageWithEmbeddedResourceMasterPageViewModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DotVVM.Framework.ViewModel;
+using DotVVM.Framework.Hosting;
+
+namespace DotVVM.Samples.Common.ViewModels.FeatureSamples.EmbeddedResourceControls
+{
+    public class PageWithEmbeddedResourceMasterPageViewModel : EmbeddedResourceMasterPageViewModel
+    {
+
+    }
+}
+
diff --git a/...Common/Views/FeatureSamples/EmbeddedResourceControls/EmbeddedResourceMasterPage.dotmaster b/...Common/Views/FeatureSamples/EmbeddedResourceControls/EmbeddedResourceMasterPage.dotmaster
@@ -0,0 +1,18 @@
+@viewModel DotVVM.Samples.Common.ViewModels.FeatureSamples.EmbeddedResourceControls.EmbeddedResourceMasterPageViewModel, DotVVM.Samples.Common
+
+<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <h1>Embedded resource master page</h1>
+
+    <dot:ContentPlaceHolder ID="MainContent" />
+
+</body>
+</html>
+
+
diff --git a/.../Views/FeatureSamples/EmbeddedResourceControls/PageWithEmbeddedResourceMasterPage.dothtml b/.../Views/FeatureSamples/EmbeddedResourceControls/PageWithEmbeddedResourceMasterPage.dothtml
@@ -0,0 +1,9 @@
+@viewModel DotVVM.Samples.Common.ViewModels.FeatureSamples.EmbeddedResourceControls.PageWithEmbeddedResourceMasterPageViewModel, DotVVM.Samples.Common
+@masterPage embedded://DotVVM.Samples.Common/Views.FeatureSamples.EmbeddedResourceControls.EmbeddedResourceMasterPage.dotmaster
+
+<dot:Content ContentPlaceHolderID="MainContent">
+
+    <p>Success</p>
+
+</dot:Content>
+
diff --git a/src/Samples/Tests/Abstractions/SamplesRouteUrls.designer.cs b/src/Samples/Tests/Abstractions/SamplesRouteUrls.designer.cs
diff --git a/src/Samples/Tests/Tests/Feature/EmbeddedResourceControlsTests.cs b/src/Samples/Tests/Tests/Feature/EmbeddedResourceControlsTests.cs
@@ -25,5 +25,15 @@ public void Feature_EmbeddedResourceControls_EmbeddedResourceControls()
                 AssertUI.Attribute(browser.First("input[type=button]"), "value", "This is text");
             });
         }
+
+        [Fact]
+        public void Feature_EmbeddedResourceControls_PageWithEmbeddedResourceMasterPage()
+        {
+            RunInAllBrowsers(browser => {
+                browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_EmbeddedResourceControls_PageWithEmbeddedResourceMasterPage);
+
+                AssertUI.TextEquals(browser.Single("p"), "Success");
+            });
+        }
     }
 }