Merge pull request #334 from neozhu/navigation

add GlobalVariable
neozhu · Mar 26, 2023 · a1930b6 · a1930b6
2 parents ea2e09d + eb600de
commit a1930b6
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 14 deletions.
diff --git a/src/Application/Constants/GlobalVariable.cs b/src/Application/Constants/GlobalVariable.cs
@@ -0,0 +1,5 @@
+namespace CleanArchitecture.Blazor.Application.Constants;
+public static class GlobalVariable
+{
+    public static long maxAllowedSize => 512000 * 100;
+}
diff --git a/src/Blazor.Server.UI/Components/Common/PickUserAutocomplete.cs b/src/Blazor.Server.UI/Components/Common/PickUserAutocomplete.cs
@@ -26,7 +26,7 @@ public override  Task SetParametersAsync(ParameterView parameters)
         return base.SetParametersAsync(parameters);
 
     }
-    private async Task<IEnumerable<string>> searchKeyValues(string value, CancellationToken cancellation)
+    private Task<IEnumerable<string>> searchKeyValues(string value, CancellationToken cancellation)
     {
         // if text is null or empty, show complete list
         _userList = _dataProvider.DataSource.Where(x => x.TenantId == TenantId).ToList();
@@ -39,7 +39,7 @@ private async Task<IEnumerable<string>> searchKeyValues(string value, Cancellati
         {
             result = _userList.Where(x => x.UserName.Contains(value, StringComparison.OrdinalIgnoreCase) || x.Email.Contains(value, StringComparison.OrdinalIgnoreCase)).Select(x => x.UserName).ToList();
         }
-        return result;
+        return Task.FromResult(result.AsEnumerable());
     }
 
     private string toString(string str)

diff --git a/src/Blazor.Server.UI/Pages/Customers/Customers.razor b/src/Blazor.Server.UI/Pages/Customers/Customers.razor
@@ -378,7 +378,7 @@
     {
         _uploading = true;
         var stream = new MemoryStream();
-        await file.OpenReadStream().CopyToAsync(stream);
+        await file.OpenReadStream(GlobalVariable.maxAllowedSize).CopyToAsync(stream);
         var command = new ImportCustomersCommand(file.Name, stream.ToArray());
         var result = await _mediator.Send(command);
         if (result.Succeeded)

diff --git a/src/Blazor.Server.UI/Pages/Documents/_UploadFilesFormDialog.razor b/src/Blazor.Server.UI/Pages/Documents/_UploadFilesFormDialog.razor
@@ -64,7 +64,6 @@
     private ISender _mediator { get; set; } = default!;
     [Inject] private IUploadService _uploadService { get; set; } = default!;
     List<FileUploadProgress> uploadedFiles = new();
-    const long MAXALLOWEDSIZE =  5242880;
     private async ValueTask LoadFiles(InputFileChangeEventArgs e)
     {
         try
@@ -90,7 +89,7 @@
             {
                 foreach (var file in files)
                 {
-                    using var stream = file.OpenReadStream(maxAllowedSize: 10 * 1024 * 1024);
+                    using var stream = file.OpenReadStream(GlobalVariable.maxAllowedSize);
                     while (await stream.ReadAsync(buffer) is int read && read > 0)
                     {
                         uploadedFiles[startIndex].UploadedBytes += read;
@@ -141,7 +140,7 @@
                 {
                     try
                     {
-                        var filestream = uploaded.File.OpenReadStream(MAXALLOWEDSIZE);
+                        var filestream = uploaded.File.OpenReadStream(GlobalVariable.maxAllowedSize);
                         var imgstream = new MemoryStream();
                         await filestream.CopyToAsync(imgstream);
                         imgstream.Position = 0;

diff --git a/src/Blazor.Server.UI/Pages/Identity/Users/Profile.razor b/src/Blazor.Server.UI/Pages/Identity/Users/Profile.razor
@@ -226,7 +226,7 @@
     }
     private async Task UploadPhoto(InputFileChangeEventArgs e)
     {
-        var filestream = e.File.OpenReadStream();
+        var filestream = e.File.OpenReadStream(GlobalVariable.maxAllowedSize);
         var imgstream = new MemoryStream();
         await filestream.CopyToAsync(imgstream);
         imgstream.Position = 0;

diff --git a/src/Blazor.Server.UI/Pages/Identity/Users/Users.razor b/src/Blazor.Server.UI/Pages/Identity/Users/Users.razor
@@ -749,7 +749,7 @@
     {
         _uploading = true;
         var stream = new MemoryStream();
-        await file.OpenReadStream().CopyToAsync(stream);
+        await file.OpenReadStream(GlobalVariable.maxAllowedSize).CopyToAsync(stream);
         var result = await _excelService.ImportAsync(stream.ToArray(), mappers: new Dictionary<string, Func<DataRow, ApplicationUser, object?>>
             {
                 { L["User Name"], (row, item) => item.UserName = row[L["User Name"]]?.ToString() },

diff --git a/src/Blazor.Server.UI/Pages/Identity/Users/_UserForm.razor b/src/Blazor.Server.UI/Pages/Identity/Users/_UserForm.razor
@@ -168,7 +168,7 @@
 
     private async Task UploadPhoto(InputFileChangeEventArgs e)
     {
-        var filestream = e.File.OpenReadStream();
+        var filestream = e.File.OpenReadStream(GlobalVariable.maxAllowedSize);
         var imgstream = new MemoryStream();
         await filestream.CopyToAsync(imgstream);
         imgstream.Position = 0;

diff --git a/src/Blazor.Server.UI/Pages/Products/Products.razor b/src/Blazor.Server.UI/Pages/Products/Products.razor
@@ -436,7 +436,7 @@
     {
         _uploading = true;
         var stream = new MemoryStream();
-        await file.OpenReadStream().CopyToAsync(stream);
+        await file.OpenReadStream(GlobalVariable.maxAllowedSize).CopyToAsync(stream);
         var command = new ImportProductsCommand(file.Name, stream.ToArray());
 
         var result = await _mediator.Send(command);

diff --git a/src/Blazor.Server.UI/Pages/Products/_ProductFormDialog.razor b/src/Blazor.Server.UI/Pages/Products/_ProductFormDialog.razor
@@ -135,7 +135,7 @@
             {
                 try
                 {
-                    var filestream = file.OpenReadStream(MAXALLOWEDSIZE);
+                    var filestream = file.OpenReadStream(GlobalVariable.maxAllowedSize);
                     var imgstream = new MemoryStream();
                     await filestream.CopyToAsync(imgstream);
                     imgstream.Position = 0;

diff --git a/src/Blazor.Server.UI/Pages/SystemManagement/Dictionaries.razor b/src/Blazor.Server.UI/Pages/SystemManagement/Dictionaries.razor
@@ -398,7 +398,7 @@
     {
         _uploading = true;
         var stream = new MemoryStream();
-        await e.File.OpenReadStream().CopyToAsync(stream);
+        await e.File.OpenReadStream(GlobalVariable.maxAllowedSize).CopyToAsync(stream);
         var command = new ImportKeyValuesCommand(e.File.Name, stream.ToArray());
         var result = await _mediator.Send(command);
         if(result.Succeeded){

diff --git a/src/Blazor.Server.UI/Shared/MainLayout.razor.cs b/src/Blazor.Server.UI/Shared/MainLayout.razor.cs
@@ -40,14 +40,13 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     }
     private async Task ApplyUserPreferences()
     {
-
+        _defaultDarkMode =await _mudThemeProvider.GetSystemPreference();
         UserPreferences = await _layoutService.ApplyUserPreferences(_defaultDarkMode);
     }
     protected override async Task OnInitializedAsync()
     {
         _layoutService.MajorUpdateOccured += LayoutServiceOnMajorUpdateOccured;
         _layoutService.SetBaseTheme(Theme.ApplicationTheme());
-        _layoutService.SetDarkMode(_defaultDarkMode);
         _hotKeysContext = _hotKeys.CreateContext().Add(ModKey.Ctrl, Key.K, async () => await OpenCommandPalette(), "Open command palette.");
         await base.OnInitializedAsync();