/// Serializes the redirect action.
///
- public static string GenerateRedirectActionResponse(string url, bool replace, bool allowSpa)
+ public static string GenerateRedirectActionResponse(string url, bool replace, bool allowSpa, string? downloadName)
{
// create result object
var result = new JObject();
@@ -266,6 +266,7 @@ public static string GenerateRedirectActionResponse(string url, bool replace, bo
result["action"] = "redirect";
if (replace) result["replace"] = true;
if (allowSpa) result["allowSpa"] = true;
+ if (downloadName is object) result["download"] = downloadName;
return result.ToString(Formatting.None);
}
diff --git a/src/Samples/Common/ViewModels/FeatureSamples/Redirect/RedirectPostbackConcurrencyViewModel.cs b/src/Samples/Common/ViewModels/FeatureSamples/Redirect/RedirectPostbackConcurrencyViewModel.cs
new file mode 100644
index 0000000000..75f53ba0b1
--- /dev/null
+++ b/src/Samples/Common/ViewModels/FeatureSamples/Redirect/RedirectPostbackConcurrencyViewModel.cs
@@ -0,0 +1,65 @@
+using System.Diagnostics.Metrics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotVVM.Core.Storage;
+using DotVVM.Framework.ViewModel;
+
+namespace DotVVM.Samples.BasicSamples.ViewModels.FeatureSamples.Redirect
+{
+ class RedirectPostbackConcurrencyViewModel : DotvvmViewModelBase
+ {
+ public static int GlobalCounter = 0;
+ private readonly IReturnedFileStorage returnedFileStorage;
+
+ [Bind(Direction.ServerToClient)]
+ public int Counter { get; set; } = GlobalCounter;
+
+ public int MiniCounter { get; set; } = 0;
+
+ [FromQuery("empty")]
+ public bool IsEmptyPage { get; set; } = false;
+ [FromQuery("loadDelay")]
+ public int LoadDelay { get; set; } = 0;
+
+ public RedirectPostbackConcurrencyViewModel(IReturnedFileStorage returnedFileStorage)
+ {
+ this.returnedFileStorage = returnedFileStorage;
+ }
+ public override async Task Init()
+ {
+ await Task.Delay(LoadDelay); // delay to enable user to click DelayIncrement button between it succeeding and loading the next page
+ await base.Init();
+ }
+
+ public async Task DelayIncrement()
+ {
+ await Task.Delay(1000);
+
+ Interlocked.Increment(ref GlobalCounter);
+
+ Context.RedirectToRoute(Context.Route.RouteName, query: new { empty = true, loadDelay = 2000 });
+ }
+
+ public async Task GetFileStandard()
+ {
+ await Context.ReturnFileAsync("test file"u8.ToArray(), "test.txt", "text/plain");
+ }
+
+ public async Task GetFileCustom()
+ {
+ var metadata = new ReturnedFileMetadata()
+ {
+ FileName = "test_custom.txt",
+ MimeType = "text/plain",
+ AttachmentDispositionType = "attachment"
+ };
+
+ var stream = new MemoryStream("test custom file"u8.ToArray());
+ var generatedFileId = await returnedFileStorage.StoreFileAsync(stream, metadata).ConfigureAwait(false);
+
+ var url = Context.TranslateVirtualPath("~/dotvvmReturnedFile?id=" + generatedFileId);
+ Context.RedirectToUrl(url);
+ }
+ }
+}
diff --git a/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/DateOnlyTranslations.dothtml b/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/DateOnlyTranslations.dothtml
new file mode 100644
index 0000000000..e35bb76f45
--- /dev/null
+++ b/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/DateOnlyTranslations.dothtml
@@ -0,0 +1,36 @@
+@viewModel DotVVM.Samples.Common.ViewModels.FeatureSamples.JavascriptTranslation.DateTimeTranslationsViewModel, DotVVM.Samples.Common
+@import System
+
+
+
+
+
+
+
+
+
+
+
+ DateOnly testing
+
+
+
+
+
+ DateOnly.ToString:
+
+
+
+ DateOnly properties:
+
+ {{value: DateOnly.FromDateTime(NullableDateTimeProp).Day}}. {{value: DateOnly.FromDateTime(NullableDateTimeProp).Month}}. {{value: DateOnly.FromDateTime(NullableDateTimeProp).Year}}
+
+
+
+
+
+
diff --git a/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/DateTimeTranslations.dothtml b/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/DateTimeTranslations.dothtml
index d5500c9643..626044f233 100644
--- a/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/DateTimeTranslations.dothtml
+++ b/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/DateTimeTranslations.dothtml
@@ -24,11 +24,19 @@
TimeShift.setTimezoneOffset(-120);
}())
+
DateTime testing
+
+
+
Year:
diff --git a/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/TimeOnlyTranslations.dothtml b/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/TimeOnlyTranslations.dothtml
new file mode 100644
index 0000000000..3741b97752
--- /dev/null
+++ b/src/Samples/Common/Views/FeatureSamples/JavascriptTranslation/TimeOnlyTranslations.dothtml
@@ -0,0 +1,35 @@
+@viewModel DotVVM.Samples.Common.ViewModels.FeatureSamples.JavascriptTranslation.DateTimeTranslationsViewModel, DotVVM.Samples.Common
+@import System
+
+
+
+
+
+
+
+
+
+
+
+ TimeOnly testing
+
+
+
+
+ TimeOnly.ToString:
+
+
+
+ TimeOnly properties:
+
+ {{value: TimeOnly.FromDateTime(NullableDateTimeProp).Hour}} hours {{value: TimeOnly.FromDateTime(NullableDateTimeProp).Minute}} minues {{value: TimeOnly.FromDateTime(NullableDateTimeProp).Second}} seconds and {{value: TimeOnly.FromDateTime(NullableDateTimeProp).Millisecond}} milliseconds
+
+
+
+
+
+
diff --git a/src/Samples/Common/Views/FeatureSamples/Localization/LocalizableRoute.dothtml b/src/Samples/Common/Views/FeatureSamples/Localization/LocalizableRoute.dothtml
index 23394a4f4c..cce5c3578b 100644
--- a/src/Samples/Common/Views/FeatureSamples/Localization/LocalizableRoute.dothtml
+++ b/src/Samples/Common/Views/FeatureSamples/Localization/LocalizableRoute.dothtml
@@ -6,6 +6,8 @@
+
+
diff --git a/src/Samples/Common/Views/FeatureSamples/Redirect/RedirectPostbackConcurrency.dothtml b/src/Samples/Common/Views/FeatureSamples/Redirect/RedirectPostbackConcurrency.dothtml
new file mode 100644
index 0000000000..f9838fcdc6
--- /dev/null
+++ b/src/Samples/Common/Views/FeatureSamples/Redirect/RedirectPostbackConcurrency.dothtml
@@ -0,0 +1,33 @@
+@viewModel DotVVM.Samples.BasicSamples.ViewModels.FeatureSamples.Redirect.RedirectPostbackConcurrencyViewModel, DotVVM.Samples.Common
+
+
+ Hello from DotVVM!
+
+
+
+ Back
+
+
+
Redirect and postback concurrency test
+
+ Testing Concurrency=Deny / Concurrency=Queue with redirect and file returns.
+
+
First, we have a set of buttons incrementing a static variable, each takes about 2sec and redirects to a blank page afterwards
+
GlobalCounter =
+
MiniCounter(Concurrency=Deny) =
+
+
+ Increment (Concurrency=Default)
+ Increment (Concurrency=Deny)
+ Increment (Concurrency=Queue)
+
+
+
We also test that returning files does not block the page forever,
+
+
+ Standard return file
+ Custom return file (will have delay before page works)
+
+