From 4550188830ab566f3b99b7016a216d6fa38f8e58 Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Sun, 2 Feb 2025 10:48:48 +0800
Subject: [PATCH 01/13] Roles.razor

---
 src/Infrastructure/Services/ExcelService.cs   | 242 ++++++++--------
 .../LoadingButton/MudLoadingButton.razor      | 103 +++++--
 .../Pages/Identity/Roles/Roles.razor          | 274 ++++++++++++------
 .../Pages/Identity/Users/Users.razor          |   6 +-
 .../Pages/PicklistSets/PicklistSets.razor     | 204 +++++++------
 src/Server.UI/Server.UI.csproj                |   2 +-
 src/Server.UI/Services/DialogServiceHelper.cs |  45 +--
 7 files changed, 539 insertions(+), 337 deletions(-)

diff --git a/src/Infrastructure/Services/ExcelService.cs b/src/Infrastructure/Services/ExcelService.cs
index 6add75d9f..243f3da51 100644
--- a/src/Infrastructure/Services/ExcelService.cs
+++ b/src/Infrastructure/Services/ExcelService.cs
@@ -16,152 +16,164 @@ public ExcelService(IStringLocalizer<ExcelService> localizer)
         _localizer = localizer;
     }
 
-    public Task<byte[]> CreateTemplateAsync(IEnumerable<string> fields, string sheetName = "Sheet1")
+    /// <summary>
+    /// Applies the header cell style.
+    /// </summary>
+    /// <param name="cell">The cell to style.</param>
+    private void ApplyHeaderStyle(IXLCell cell)
     {
-        using (var workbook = new XLWorkbook())
-        {
-            workbook.Properties.Author = "";
-            var ws = workbook.Worksheets.Add(sheetName);
-            var colIndex = 1;
-            var rowIndex = 1;
-            foreach (var header in fields)
-            {
-                var cell = ws.Cell(rowIndex, colIndex);
-                var style = cell.Style;
-                style.Fill.PatternType = XLFillPatternValues.Solid;
-                style.Fill.BackgroundColor = XLColor.LightBlue;
-                style.Border.BottomBorder = XLBorderStyleValues.Thin;
-
-                cell.Value = header;
+        var style = cell.Style;
+        style.Fill.PatternType = XLFillPatternValues.Solid;
+        style.Fill.BackgroundColor = XLColor.LightBlue;
+        style.Border.BottomBorder = XLBorderStyleValues.Thin;
+    }
 
-                colIndex++;
-            }
+    /// <summary>
+    /// Saves the given workbook to a byte array.
+    /// </summary>
+    /// <param name="workbook">The workbook to save.</param>
+    /// <returns>A byte array representing the workbook.</returns>
+    private static byte[] SaveWorkbookToByteArray(XLWorkbook workbook)
+    {
+        using var stream = new MemoryStream();
+        workbook.SaveAs(stream);
+        stream.Seek(0, SeekOrigin.Begin);
+        return stream.ToArray();
+    }
 
-            using (var stream = new MemoryStream())
-            {
-                workbook.SaveAs(stream);
-                stream.Seek(0, SeekOrigin.Begin);
-                return Task.FromResult(stream.ToArray());
-            }
+    public Task<byte[]> CreateTemplateAsync(IEnumerable<string> fields, string sheetName = "Sheet1")
+    {
+        using var workbook = new XLWorkbook();
+        workbook.Properties.Author = string.Empty;
+        var ws = workbook.Worksheets.Add(sheetName);
+        int rowIndex = 1;
+        int colIndex = 1;
+        foreach (var header in fields)
+        {
+            var cell = ws.Cell(rowIndex, colIndex++);
+            ApplyHeaderStyle(cell);
+            cell.Value = header;
         }
+
+        return Task.FromResult(SaveWorkbookToByteArray(workbook));
     }
 
     public Task<byte[]> ExportAsync<TData>(IEnumerable<TData> data, Dictionary<string, Func<TData, object?>> mappers, string sheetName = "Sheet1")
     {
-        using (var workbook = new XLWorkbook())
+        using var workbook = new XLWorkbook();
+        workbook.Properties.Author = string.Empty;
+        var ws = workbook.Worksheets.Add(sheetName);
+        int rowIndex = 1;
+        int colIndex = 1;
+        var headers = mappers.Keys.ToList();
+
+        // Write header row
+        foreach (var header in headers)
         {
-            workbook.Properties.Author = "";
-            var ws = workbook.Worksheets.Add(sheetName);
-            var colIndex = 1;
-            var rowIndex = 1;
-            var headers = mappers.Keys.ToList();
-            foreach (var header in headers)
-            {
-                var cell = ws.Cell(rowIndex, colIndex);
-                var style = cell.Style;
-                style.Fill.PatternType = XLFillPatternValues.Solid;
-                style.Fill.BackgroundColor = XLColor.LightBlue;
-                style.Border.BottomBorder = XLBorderStyleValues.Thin;
-
-                cell.Value = header;
-
-                colIndex++;
-            }
-
-            var dataList = data.ToList();
-            foreach (var item in dataList)
-            {
-                colIndex = 1;
-                rowIndex++;
-
-                var result = headers.Select(header => mappers[header](item));
+            var cell = ws.Cell(rowIndex, colIndex++);
+            ApplyHeaderStyle(cell);
+            cell.Value = header;
+        }
 
-                foreach (var value in result)
-                {
-                    ws.Cell(rowIndex, colIndex).Value = value == null ? Blank.Value : value.ToString();
-                    colIndex++;
-                }
-            }
+        // Write data rows
+        var dataList = data.ToList();
+        foreach (var item in dataList)
+        {
+            colIndex = 1;
+            rowIndex++;
 
-            using (var stream = new MemoryStream())
+            foreach (var header in headers)
             {
-                workbook.SaveAs(stream);
-                stream.Seek(0, SeekOrigin.Begin);
-                return Task.FromResult(stream.ToArray());
+                var value = mappers[header](item);
+                // If the value is null, write a Blank.Value; otherwise, use its string representation.
+                ws.Cell(rowIndex, colIndex++).Value = value == null ? Blank.Value : value.ToString();
             }
         }
+
+        return Task.FromResult(SaveWorkbookToByteArray(workbook));
     }
 
-    public async Task<IResult<IEnumerable<TEntity>>> ImportAsync<TEntity>(byte[] data, Dictionary<string, Func<DataRow, TEntity, object?>> mappers, string sheetName = "Sheet1")
+    public async Task<IResult<IEnumerable<TEntity>>> ImportAsync<TEntity>(
+        byte[] data,
+        Dictionary<string, Func<DataRow, TEntity, object?>> mappers,
+        string sheetName = "Sheet1")
     {
-        using (var workbook = new XLWorkbook(new MemoryStream(data)))
+        using var workbook = new XLWorkbook(new MemoryStream(data));
+        if (!workbook.Worksheets.TryGetWorksheet(sheetName, out var ws))
         {
-            if (!workbook.Worksheets.TryGetWorksheet(sheetName, out var ws))
-            {
-                return await Result<IEnumerable<TEntity>>.FailureAsync(string.Format(_localizer["Sheet with name {0} does not exist!"], sheetName));
-            }
-
-            var dt = new DataTable();
-            var titlesInFirstRow = true;
-
-            foreach (var firstRowCell in ws.Range(1, 1, 1, ws.LastCellUsed().Address.ColumnNumber).Cells())
-            {
-                dt.Columns.Add(titlesInFirstRow ? firstRowCell.GetString() : $"Column {firstRowCell.Address.ColumnNumber}");
-            }
+            var msg = string.Format(_localizer["Sheet with name {0} does not exist!"], sheetName);
+            return await Result<IEnumerable<TEntity>>.FailureAsync(msg);
+        }
 
-            var startRow = titlesInFirstRow ? 2 : 1;
-            var headers = mappers.Keys.ToList();
-            var errors = new List<string>();
+        // Check if the worksheet contains any cells.
+        var lastCellUsed = ws.LastCellUsed()?.Address.ColumnNumber ?? 0;
+        if (lastCellUsed == 0)
+        {
+            var msg = string.Format(_localizer["Sheet with name {0} is empty!"], sheetName);
+            return await Result<IEnumerable<TEntity>>.FailureAsync(msg);
+        }
 
-            foreach (var header in headers)
-            {
-                if (!dt.Columns.Contains(header))
-                {
-                    errors.Add(string.Format(_localizer["Header '{0}' does not exist in table!"], header));
-                }
-            }
+        // Create a DataTable from the header row.
+        var dt = new DataTable();
+        bool titlesInFirstRow = true;
+        foreach (var cell in ws.Range(1, 1, 1, lastCellUsed).Cells())
+        {
+            string colName = titlesInFirstRow ? cell.GetString() : $"Column {cell.Address.ColumnNumber}";
+            dt.Columns.Add(colName);
+        }
+        int startRow = titlesInFirstRow ? 2 : 1;
 
-            if (errors.Any())
+        // Validate that all expected headers exist.
+        var headers = mappers.Keys.ToList();
+        var errors = new List<string>();
+        foreach (var header in headers)
+        {
+            if (!dt.Columns.Contains(header))
             {
-                return await Result<IEnumerable<TEntity>>.FailureAsync(errors.ToArray());
+                errors.Add(string.Format(_localizer["Header '{0}' does not exist in table!"], header));
             }
+        }
+        if (errors.Any())
+        {
+            return await Result<IEnumerable<TEntity>>.FailureAsync(errors.ToArray());
+        }
 
-            var lastRow = ws.LastRowUsed();
-            var list = new List<TEntity>();
+        var lastRowNumber = ws.LastRowUsed()?.RowNumber() ?? 0;
+        var list = new List<TEntity>();
 
-            foreach (var row in ws.Rows(startRow, lastRow.RowNumber()))
+        // Process each row in the worksheet.
+        for (int rowIndex = startRow; rowIndex <= lastRowNumber; rowIndex++)
+        {
+            var row = ws.Row(rowIndex);
+            try
             {
-                try
+                var dataRow = dt.NewRow();
+                // Populate the DataRow with cell values.
+                foreach (var cell in row.Cells(1, dt.Columns.Count))
                 {
-                    var dataRow = dt.Rows.Add();
-                    var item = (TEntity?)Activator.CreateInstance(typeof(TEntity)) ?? throw new NullReferenceException($"{nameof(TEntity)}");
-
-                    foreach (var cell in row.Cells())
-                    {
-                        if (cell.DataType == XLDataType.DateTime)
-                        {
-                            dataRow[cell.Address.ColumnNumber - 1] = cell.GetDateTime().ToString("yyyy-MM-dd HH:mm:ss");
-                        }
-                        else
-                        {
-                            dataRow[cell.Address.ColumnNumber - 1] = cell.Value.ToString();
-                        }
-                    }
-
-                    foreach (var header in headers)
-                    {
-                        mappers[header](dataRow, item);
-                    }
-
-                    list.Add(item);
+                    int colIndex = cell.Address.ColumnNumber - 1;
+                    dataRow[colIndex] = cell.DataType == XLDataType.DateTime
+                        ? cell.GetDateTime().ToString("yyyy-MM-dd HH:mm:ss")
+                        : cell.Value.ToString();
                 }
-                catch (Exception e)
+                dt.Rows.Add(dataRow);
+
+                // Create an instance of TEntity and apply the mapping functions.
+                var item = (TEntity)Activator.CreateInstance(typeof(TEntity))!; // using null-forgiving operator
+                foreach (var header in headers)
                 {
-                    return await Result<IEnumerable<TEntity>>.FailureAsync(string.Format(_localizer["Sheet name {0}:{1}"], sheetName, e.Message));
+                    mappers[header](dataRow, item);
                 }
+                list.Add(item);
+            }
+            catch (Exception e)
+            {
+                var errorMsg = string.Format(_localizer["Error in sheet {0}: {1}"], sheetName, e.Message);
+                return await Result<IEnumerable<TEntity>>.FailureAsync(errorMsg);
             }
-
-            return await Result<IEnumerable<TEntity>>.SuccessAsync(list);
         }
+
+        return await Result<IEnumerable<TEntity>>.SuccessAsync(list);
     }
 }
+
diff --git a/src/Server.UI/Components/LoadingButton/MudLoadingButton.razor b/src/Server.UI/Components/LoadingButton/MudLoadingButton.razor
index adb104abc..90f7f1c03 100644
--- a/src/Server.UI/Components/LoadingButton/MudLoadingButton.razor
+++ b/src/Server.UI/Components/LoadingButton/MudLoadingButton.razor
@@ -1,14 +1,23 @@
 @inherits MudBaseButton
 
-<MudButton OnClick="OnClickAsync" StartIcon="@StartIcon" Disabled="@IsDisabled" IconColor="@IconColor" Variant="@Variant" Color="@Color" Size="@Size">
-    @if (_loading)
+<MudButton OnClick="OnClickAsync"
+           StartIcon="@StartIcon"
+           Disabled="@IsDisabled"
+           IconColor="@IconColor"
+           Variant="@Variant"
+           Color="@Color"
+           Size="@Size">
+    @if (Loading)
     {
-        if (LoadingAdornment == Adornment.Start)
+        @if (LoadingAdornment == Adornment.Start)
         {
-            <MudProgressCircular Class="me-2" Size="Size.Small" Color="@LoadingCircularColor" Indeterminate="true" />
+            <MudProgressCircular Class="me-2"
+                                 Size="Size.Small"
+                                 Color="@LoadingCircularColor"
+                                 Indeterminate="true" />
         }
 
-        if (LoadingContent != null)
+        @if (LoadingContent is not null)
         {
             @LoadingContent
         }
@@ -17,9 +26,12 @@
             @ChildContent
         }
 
-        if (LoadingAdornment == Adornment.End)
+        @if (LoadingAdornment == Adornment.End)
         {
-            <MudProgressCircular Class="ms-2" Size="Size.Small" Color="@LoadingCircularColor" Indeterminate="true" />
+            <MudProgressCircular Class="ms-2"
+                                 Size="Size.Small"
+                                 Color="@LoadingCircularColor"
+                                 Indeterminate="true" />
         }
     }
     else
@@ -27,81 +39,116 @@
         @ChildContent
     }
 </MudButton>
-@code{
+
+@code {
+    // Private field backing the Loading property.
     private bool _loading;
+
     /// <summary>
-    /// If applied the text will be added to the component.
+    /// Optional label text for the button.
     /// </summary>
     [Parameter]
     public string? Label { get; set; }
+
     /// <summary>
-    /// The color of the icon. It supports the theme colors.
+    /// Color of the icon; supports theme colors.
     /// </summary>
     [Parameter]
     public Color IconColor { get; set; } = Color.Inherit;
+
     /// <summary>
-    /// Icon placed before the text if set.
+    /// Icon displayed at the start of the button.
     /// </summary>
     [Parameter]
     public string? StartIcon { get; set; }
+
     /// <summary>
-    /// The color of the component. It supports the theme colors.
+    /// Button color; supports theme colors.
     /// </summary>
     [Parameter]
     public Color Color { get; set; } = Color.Default;
+
     /// <summary>
-    /// Placement of the loading adornment. Default is start.
+    /// Position of the loading adornment; defaults to Start.
     /// </summary>
     [Parameter]
     public Adornment LoadingAdornment { get; set; } = Adornment.Start;
 
     /// <summary>
-    /// The Size of the component.
+    /// Size of the button.
     /// </summary>
     [Parameter]
     public Size Size { get; set; } = Size.Medium;
+
     /// <summary>
-    /// The variant to use.
+    /// Variant of the button.
     /// </summary>
     [Parameter]
     public Variant Variant { get; set; } = Variant.Text;
+
+    /// <summary>
+    /// Indicates if the button is in a loading state. When true, displays a loading indicator and may disable the button.
+    /// </summary>
     [Parameter]
     public bool Loading
     {
         get => _loading;
         set
         {
-            if (_loading == value)
-                return;
-
-            _loading = value;
-            StateHasChanged();
+            if (_loading != value)
+            {
+                _loading = value;
+                StateHasChanged();
+            }
         }
     }
+
+    /// <summary>
+    /// When true, disables the button while it is loading. Default is true.
+    /// </summary>
     [Parameter]
-    public RenderFragment ChildContent { get; set; }  // Adding ChildContent parameter
+    public bool DisableWhenLoading { get; set; } = true;
 
+    /// <summary>
+    /// The content displayed within the button.
+    /// </summary>
     [Parameter]
-    public RenderFragment LoadingContent { get; set; }
+    public RenderFragment? ChildContent { get; set; }
 
+    /// <summary>
+    /// Optional content displayed when the button is loading. If not provided, ChildContent is used.
+    /// </summary>
     [Parameter]
-    public Color LoadingCircularColor { get; set; } = Color.Primary;
+    public RenderFragment? LoadingContent { get; set; }
 
     /// <summary>
-    /// Determines if the button should be disabled when loading.
+    /// Color for the loading circular progress indicator.
     /// </summary>
     [Parameter]
-    public bool DisableWhenLoading { get; set; } = true;
+    public Color LoadingCircularColor { get; set; } = Color.Primary;
 
+    /// <summary>
+    /// Determines whether the button is disabled based on its Disabled property and loading state.
+    /// </summary>
     private bool IsDisabled => Disabled || (Loading && DisableWhenLoading);
 
+    /// <summary>
+    /// Handles the button click event, setting the loading state during asynchronous execution.
+    /// Uses try/finally to ensure the loading state is reset even if an exception occurs.
+    /// </summary>
     private async Task OnClickAsync()
     {
         if (IsDisabled)
             return;
 
-        _loading = true;
-        await base.OnClick.InvokeAsync(null);
-        _loading = false;
+        try
+        {
+            Loading = true;
+            await base.OnClick.InvokeAsync(null);
+        }
+        finally
+        {
+            Loading = false;
+        }
     }
 }
diff --git a/src/Server.UI/Pages/Identity/Roles/Roles.razor b/src/Server.UI/Pages/Identity/Roles/Roles.razor
index 42a343983..45d45bc62 100644
--- a/src/Server.UI/Pages/Identity/Roles/Roles.razor
+++ b/src/Server.UI/Pages/Identity/Roles/Roles.razor
@@ -30,39 +30,39 @@
              ServerData="@(ServerReload)">
     <ToolBarContent>
         <MudStack Row Spacing="0" Class="flex-grow-1" Justify="Justify.SpaceBetween">
+            <!-- Left Toolbar: Icon, Title and Tenant selection -->
             <MudStack Row AlignItems="AlignItems.Start">
                 <MudIcon Icon="@Icons.Material.Filled.Groups" Size="Size.Large" />
                 <MudStack Spacing="0">
                     <MudText Typo="Typo.subtitle2" Class="mb-2">@Title</MudText>
-                    <MudSelect T="string" Style="min-width:120px" ValueChanged="OnChangedListView" Value="@_selectedTenantId" Dense="true" Label="@L["List View"]">
+                    <MudSelect T="string" Style="min-width:120px" Value="@_selectedTenantId" ValueChanged="OnChangedListView" Dense="true" Label="@L["List View"]">
                         <MudSelectItem T="string" Value="@(" ")">@L["ALL"]</MudSelectItem>
-                        @foreach (var item in TenantsService.DataSource)
+                        @foreach (var tenant in TenantsService.DataSource)
                         {
-                            <MudSelectItem T="string" Value="@item.Id">@item.Name</MudSelectItem>
+                            <MudSelectItem T="string" Value="@tenant.Id">@tenant.Name</MudSelectItem>
                         }
                     </MudSelect>
                 </MudStack>
             </MudStack>
+            <!-- Right Toolbar: Refresh, Create, More actions and Search -->
             <MudStack Spacing="0" AlignItems="AlignItems.End">
                 <MudToolBar Dense WrapContent="true" Class="py-1 px-0">
-                    <MudButton 
-                               Disabled="@_loading"
-                               OnClick="@(() => OnRefresh())"
+                    <MudButton Disabled="@_loading"
+                               OnClick="OnRefresh"
                                StartIcon="@Icons.Material.Outlined.Refresh">
                         @ConstantString.Refresh
                     </MudButton>
                     @if (_canCreate)
                     {
-                        <MudButton 
-                                   StartIcon="@Icons.Material.Outlined.Add"
+                        <MudButton StartIcon="@Icons.Material.Outlined.Add"
                                    OnClick="OnCreate">
                             @ConstantString.New
                         </MudButton>
                     }
-                    <MudMenu  TransformOrigin="Origin.BottomRight" AnchorOrigin="Origin.BottomRight" EndIcon="@Icons.Material.Filled.MoreVert" Label="@ConstantString.More">
+                    <MudMenu TransformOrigin="Origin.BottomRight" AnchorOrigin="Origin.BottomRight" EndIcon="@Icons.Material.Filled.MoreVert" Label="@ConstantString.More">
                         @if (_canDelete)
                         {
-                            <MudMenuItem Disabled="@(!(_selectedItems.Count > 0))"
+                            <MudMenuItem Disabled="@(_selectedItems.Count == 0)"
                                          OnClick="OnDeleteChecked">
                                 @ConstantString.Delete
                             </MudMenuItem>
@@ -79,7 +79,8 @@
                             <MudMenuItem>
                                 <MudFileUpload T="IBrowserFile" FilesChanged="OnImportData" Accept=".xlsx">
                                     <ActivatorContent>
-                                        <MudButton Class="pa-0 ma-0" Style="font-weight:400;text-transform:none;"
+                                        <MudButton Class="pa-0 ma-0"
+                                                   Style="font-weight:400;text-transform:none;"
                                                    Variant="Variant.Text"
                                                    Disabled="@_uploading">
                                             @ConstantString.Import
@@ -90,20 +91,18 @@
                         }
                     </MudMenu>
                 </MudToolBar>
-                <MudStack Row Spacing="1">
-                    @if (_canSearch)
-                    {
-                        <MudTextField T="string" Immediate="false" Value="_searchString" FullWidth="false" ValueChanged="@(OnSearch)"
-                                      Placeholder="@(L["Search by role name"])" Adornment="Adornment.End"
-                                      AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
-                        </MudTextField>
-                    }
-                </MudStack>
+                @if (_canSearch)
+                {
+                    <MudTextField T="string" Immediate="false" Value="_searchString" FullWidth="false" ValueChanged="OnSearch"
+                                  Placeholder="@(L["Search by role name"])" Adornment="Adornment.End"
+                                  AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
+                    </MudTextField>
+                }
             </MudStack>
         </MudStack>
     </ToolBarContent>
     <Columns>
-        <SelectColumn ShowInFooter="false"></SelectColumn>
+        <SelectColumn ShowInFooter="false" />
         <TemplateColumn HeaderStyle="width:60px" Title="@ConstantString.Actions" Sortable="false">
             <CellTemplate>
                 @if (_canEdit || _canDelete || _canManagePermissions)
@@ -137,7 +136,7 @@
         </TemplateColumn>
         <PropertyColumn Property="x => x.TenantId" Title="@L[_currentDto.GetMemberDescription(x => x.TenantName)]">
             <CellTemplate>
-                    <MudText>@context.Item.TenantName</MudText>
+                <MudText>@context.Item.TenantName</MudText>
             </CellTemplate>
             <FooterTemplate>
                 @L["Selected"]: @_selectedItems.Count
@@ -157,9 +156,17 @@
     </PagerContent>
 </MudDataGrid>
 
-<PermissionsDrawer OnAssignAllChanged="OnAssignAllChangedHandler" Waiting="@_processing" OnOpenChanged="OnOpenChangedHandler" Open="_showPermissionsDrawer" Permissions="_permissions" OnAssignChanged="OnAssignChangedHandler"></PermissionsDrawer>
+<PermissionsDrawer OnAssignAllChanged="OnAssignAllChangedHandler"
+                   Waiting="@_processing"
+                   OnOpenChanged="OnOpenChangedHandler"
+                   Open="_showPermissionsDrawer"
+                   Permissions="_permissions"
+                   OnAssignChanged="OnAssignChangedHandler">
+</PermissionsDrawer>
 
 @code {
+    #region Fields and Properties
+
     [CascadingParameter] private Task<AuthenticationState> AuthState { get; set; } = default!;
     private RoleManager<ApplicationRole> RoleManager = null!;
     private string? Title { get; set; }
@@ -167,6 +174,7 @@
     private string _currentRoleName = string.Empty;
     private int _defaultPageSize = 15;
     private HashSet<ApplicationRoleDto> _selectedItems = new();
+    // Used only for retrieving member descriptions
     private readonly ApplicationRoleDto _currentDto = new();
     private string _searchString = string.Empty;
     private string _selectedTenantId = " ";
@@ -185,6 +193,11 @@
     private bool _uploading;
     private bool _exporting;
     private PermissionHelper PermissionHelper = null!;
+
+    #endregion
+
+    #region Lifecycle
+
     protected override async Task OnInitializedAsync()
     {
         InitializeServices();
@@ -198,68 +211,103 @@
         _canImport = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Import)).Succeeded;
         _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Export)).Succeeded;
     }
+
     private void InitializeServices()
     {
         RoleManager = ScopedServices.GetRequiredService<RoleManager<ApplicationRole>>();
         PermissionHelper = ScopedServices.GetRequiredService<PermissionHelper>();
     }
+
+    #endregion
+
+    #region Grid and Search
+
+    /// <summary>
+    /// Creates the predicate used to filter roles by search text and tenant.
+    /// </summary>
     private Expression<Func<ApplicationRole, bool>> CreateSearchPredicate()
     {
-        return x =>
-           (x.Name!.ToLower().Contains(_searchString) || x.Description!.ToLower().Contains(_searchString)) &&
-           (_selectedTenantId == " " || (_selectedTenantId != " " && x.TenantId == _selectedTenantId));
+        return role =>
+            (role.Name!.ToLower().Contains(_searchString) || role.Description!.ToLower().Contains(_searchString)) &&
+            (_selectedTenantId == " " || role.TenantId == _selectedTenantId);
     }
 
+    /// <summary>
+    /// Retrieves the grid data from the server.
+    /// </summary>
     private async Task<GridData<ApplicationRoleDto>> ServerReload(GridState<ApplicationRoleDto> state)
     {
+        _loading = true;
         try
         {
-            _loading = true;
-           
             var searchPredicate = CreateSearchPredicate();
-            var count = await RoleManager.Roles.CountAsync(searchPredicate);
-            var data = await RoleManager.Roles
+            var totalCount = await RoleManager.Roles.CountAsync(searchPredicate);
+            var roles = await RoleManager.Roles
                 .Where(searchPredicate)
                 .EfOrderBySortDefinitions(state)
-                .Skip(state.Page * state.PageSize).Take(state.PageSize)
+                .Skip(state.Page * state.PageSize)
+                .Take(state.PageSize)
                 .ProjectTo()
                 .ToListAsync();
 
-            return new GridData<ApplicationRoleDto> { TotalItems = count, Items = data };
+            return new GridData<ApplicationRoleDto> { TotalItems = totalCount, Items = roles };
         }
         finally
         {
             _loading = false;
         }
     }
+
+    /// <summary>
+    /// Handles tenant selection changes.
+    /// </summary>
     private async Task OnChangedListView(string tenantId)
     {
         _selectedTenantId = tenantId;
         await _table.ReloadServerData();
     }
+
+    /// <summary>
+    /// Triggers a new search.
+    /// </summary>
     private async Task OnSearch(string text)
     {
-        if (_loading)
-            return;
+        if (_loading) return;
         _searchString = text.ToLower();
         await _table.ReloadServerData();
     }
 
+    /// <summary>
+    /// Refreshes the grid data.
+    /// </summary>
     private async Task OnRefresh()
     {
-        await _table.ReloadServerData();
+        await InvokeAsync(async () =>
+        {
+            _selectedItems = new HashSet<ApplicationRoleDto>();
+            await _table.ReloadServerData();
+        });
     }
 
+    #endregion
+
+    #region Create / Edit Roles
+
+    /// <summary>
+    /// Opens the dialog to create a new role.
+    /// </summary>
     private async Task OnCreate()
     {
-        var model = new ApplicationRoleDto { Name = "" };
-        await ShowRoleDialog(model, L["Create a new role"], async role =>
+        var newRoleDto = new ApplicationRoleDto { Name = string.Empty };
+        await ShowRoleDialog(newRoleDto, L["Create a new role"], async role =>
         {
-            var state = await RoleManager.CreateAsync(role);
-            return state;
+            return await RoleManager.CreateAsync(role);
         });
     }
 
+    /// <summary>
+    /// Opens the dialog to edit an existing role.
+    /// </summary>
     private async Task OnEdit(ApplicationRoleDto item)
     {
         await ShowRoleDialog(item, L["Edit the role"], async role =>
@@ -270,16 +318,21 @@
                 existingRole.TenantId = item.TenantId;
                 existingRole.Description = item.Description;
                 existingRole.Name = item.Name;
-                var state = await RoleManager.UpdateAsync(existingRole);
-                return state;
+                return await RoleManager.UpdateAsync(existingRole);
             }
             return IdentityResult.Failed(new IdentityError { Description = "Role not found." });
         });
     }
 
+    /// <summary>
+    /// Displays a role form dialog and processes the save action.
+    /// </summary>
     private async Task ShowRoleDialog(ApplicationRoleDto model, string title, Func<ApplicationRole, Task<IdentityResult>> saveAction)
     {
-        var parameters = new DialogParameters<RoleFormDialog> { { x => x.Model, model } };
+        var parameters = new DialogParameters<RoleFormDialog>
+        {
+            { x => x.Model, model }
+        };
         var options = new DialogOptions { CloseButton = true, CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
         var dialog = await DialogService.ShowAsync<RoleFormDialog>(title, parameters, options);
         var result = await dialog.Result;
@@ -293,19 +346,26 @@
                     Description = model.Description
                 };
 
-            var state = await saveAction(applicationRole);
-            if (state.Succeeded)
+            var resultState = await saveAction(applicationRole);
+            if (resultState.Succeeded)
             {
-                Snackbar.Add($"{ConstantString.CreateSuccess}", Severity.Info);
+                Snackbar.Add(ConstantString.CreateSuccess, Severity.Info);
                 await OnRefresh();
             }
             else
             {
-                Snackbar.Add($"{string.Join(",", state.Errors.Select(x => x.Description).ToArray())}", Severity.Error);
+                Snackbar.Add(string.Join(",", resultState.Errors.Select(x => x.Description)), Severity.Error);
             }
         }
     }
 
+    #endregion
+
+    #region Permissions Handling
+
+    /// <summary>
+    /// Opens the permissions drawer and loads permissions for the selected role.
+    /// </summary>
     private async Task OnSetPermissions(ApplicationRoleDto item)
     {
         _showPermissionsDrawer = true;
@@ -313,57 +373,70 @@
         _permissions = await PermissionHelper.GetAllPermissionsByRoleId(item.Id);
     }
 
-
-
     private Task OnOpenChangedHandler(bool state)
     {
         _showPermissionsDrawer = state;
         return Task.CompletedTask;
     }
 
+    /// <summary>
+    /// Handles a single permission change.
+    /// </summary>
     private async Task OnAssignChangedHandler(PermissionModel model)
     {
         await ProcessPermissionChange(model, async (roleId, claim, assigned) =>
         {
-            var role = await RoleManager.FindByIdAsync(roleId) ?? throw new NotFoundException($"Application role {roleId} Not Found.");
+            var role = await RoleManager.FindByIdAsync(roleId)
+                ?? throw new NotFoundException($"Application role {roleId} not found.");
             if (assigned)
             {
                 await RoleManager.AddClaimAsync(role, claim);
-                Snackbar.Add($"{L["Permission assigned successfully"]}", Severity.Info);
+                Snackbar.Add(L["Permission assigned successfully"], Severity.Info);
             }
             else
             {
                 await RoleManager.RemoveClaimAsync(role, claim);
-                Snackbar.Add($"{L["Permission removed successfully"]}", Severity.Info);
+                Snackbar.Add(L["Permission removed successfully"], Severity.Info);
             }
         });
     }
 
+    /// <summary>
+    /// Processes batch permission assignment changes.
+    /// </summary>
     private async Task OnAssignAllChangedHandler(List<PermissionModel> models)
     {
-        var roleClaimsDict = models.GroupBy(m => m.RoleId)
-                                    .ToDictionary(g => g.Key!, g => g.ToList());
+        var roleGroups = models
+            .GroupBy(m => m.RoleId)
+            .ToDictionary(g => g.Key!, g => g.ToList());
 
-        foreach (var roleClaims in roleClaimsDict)
+        foreach (var (roleId, permissionModels) in roleGroups)
         {
-            var roleId = roleClaims.Key!;
-            var claims = roleClaims.Value.Select(m => new Claim(m.ClaimType, m.ClaimValue)).ToList();
-            var assignedClaims = roleClaims.Value.Where(m => m.Assigned).Select(m => new Claim(m.ClaimType, m.ClaimValue)).ToList();
-            var unassignedClaims = roleClaims.Value.Where(m => !m.Assigned).Select(m => new Claim(m.ClaimType, m.ClaimValue)).ToList();
+            var assignedClaims = permissionModels
+                .Where(m => m.Assigned)
+                .Select(m => new Claim(m.ClaimType, m.ClaimValue))
+                .ToList();
+            var unassignedClaims = permissionModels
+                .Where(m => !m.Assigned)
+                .Select(m => new Claim(m.ClaimType, m.ClaimValue))
+                .ToList();
 
             await ProcessPermissionsBatch(roleId, assignedClaims, unassignedClaims);
         }
-        Snackbar.Add($"{L["Authorization has been changed"]}", Severity.Info);
+        Snackbar.Add(L["Authorization has been changed"], Severity.Info);
     }
 
+    /// <summary>
+    /// Processes batch permission changes for a role.
+    /// </summary>
     private async Task ProcessPermissionsBatch(string roleId, List<Claim> assignedClaims, List<Claim> unassignedClaims)
     {
         _processing = true;
         try
         {
-            var role = await RoleManager.FindByIdAsync(roleId) ?? throw new NotFoundException($"Application role {roleId} Not Found.");
+            var role = await RoleManager.FindByIdAsync(roleId)
+                ?? throw new NotFoundException($"Application role {roleId} not found.");
 
-            // 批量添加和移除声明
             foreach (var claim in assignedClaims)
             {
                 await RoleManager.AddClaimAsync(role, claim);
@@ -376,10 +449,9 @@
 
             FusionCache.Remove($"get-claims-by-{roleId}");
         }
-        catch (Exception ex)
+        catch (Exception)
         {
-            // Log the exception here
-            throw ex;
+            throw;
         }
         finally
         {
@@ -387,6 +459,9 @@
         }
     }
 
+    /// <summary>
+    /// Toggles a permission assignment and applies the change.
+    /// </summary>
     private async Task ProcessPermissionChange(PermissionModel model, Func<string, Claim, bool, Task> changeAction)
     {
         _processing = true;
@@ -395,82 +470,99 @@
             var roleId = model.RoleId!;
             var claim = new Claim(model.ClaimType, model.ClaimValue);
             model.Assigned = !model.Assigned;
-            var assigned = model.Assigned;
-            await changeAction(roleId, claim, assigned);
-
-
-
+            await changeAction(roleId, claim, model.Assigned);
             FusionCache.Remove($"get-claims-by-{roleId}");
         }
-        catch (Exception ex)
+        catch (Exception)
         {
-            // Log the exception here
-            throw ex;
+            throw;
         }
         finally
         {
             _processing = false;
         }
     }
+
+    #endregion
+
+    #region Deletion
+
+    /// <summary>
+    /// Deletes a single role after confirmation.
+    /// </summary>
     private async Task OnDelete(ApplicationRoleDto dto)
     {
-        await DialogServiceHelper.ShowConfirmationDialogAsync(ConstantString.DeleteConfirmationTitle, string.Format(ConstantString.DeleteConfirmation, dto.Name), async () =>
-        {
-            await InvokeAsync(async () =>
+        await DialogServiceHelper.ShowConfirmationDialogAsync(
+            ConstantString.DeleteConfirmationTitle,
+            string.Format(ConstantString.DeleteConfirmation, dto.Name),
+            async () =>
             {
-                var deleteRoles = await RoleManager.Roles.Where(x => x.Id == dto.Id).ToListAsync();
-                foreach (var role in deleteRoles)
+                var rolesToDelete = await RoleManager.Roles.Where(x => x.Id == dto.Id).ToListAsync();
+                foreach (var role in rolesToDelete)
                 {
                     var deleteResult = await RoleManager.DeleteAsync(role);
                     if (!deleteResult.Succeeded)
                     {
-                        Snackbar.Add($"{string.Join(",", deleteResult.Errors.Select(x => x.Description).ToArray())}", Severity.Error);
+                        Snackbar.Add(string.Join(",", deleteResult.Errors.Select(x => x.Description)), Severity.Error);
                         return;
                     }
                 }
-
-                Snackbar.Add($"{ConstantString.DeleteSuccess}", Severity.Info);
+                Snackbar.Add(ConstantString.DeleteSuccess, Severity.Info);
                 await OnRefresh();
             });
-        });
     }
 
+    /// <summary>
+    /// Deletes all selected roles after confirmation.
+    /// </summary>
     private async Task OnDeleteChecked()
     {
-        await DialogServiceHelper.ShowConfirmationDialogAsync(ConstantString.DeleteConfirmationTitle, string.Format(ConstantString.DeleteConfirmation, $"{_selectedItems.Count}"), async () =>
-        {
-            await InvokeAsync(async () =>
+        await DialogServiceHelper.ShowConfirmationDialogAsync(
+            ConstantString.DeleteConfirmationTitle,
+            string.Format(ConstantString.DeleteConfirmation, _selectedItems.Count),
+            async () =>
             {
-                var deleteId = _selectedItems.Select(x => x.Id).ToArray();
-                var deleteRoles = await RoleManager.Roles.Where(x => deleteId.Contains(x.Id)).ToListAsync();
-                foreach (var role in deleteRoles)
+                var deleteIds = _selectedItems.Select(x => x.Id).ToArray();
+                var rolesToDelete = await RoleManager.Roles.Where(x => deleteIds.Contains(x.Id)).ToListAsync();
+                foreach (var role in rolesToDelete)
                 {
                     var deleteResult = await RoleManager.DeleteAsync(role);
                     if (!deleteResult.Succeeded)
                     {
-                        Snackbar.Add($"{string.Join(",", deleteResult.Errors.Select(x => x.Description).ToArray())}", Severity.Error);
+                        Snackbar.Add(string.Join(",", deleteResult.Errors.Select(x => x.Description)), Severity.Error);
                         return;
                     }
                 }
-                Snackbar.Add($"{ConstantString.DeleteSuccess}", Severity.Info);
+                Snackbar.Add(ConstantString.DeleteSuccess, Severity.Info);
                 await OnRefresh();
             });
-        });
     }
 
+    #endregion
+
+    #region Export / Import
 
+    /// <summary>
+    /// Handles exporting of role data.
+    /// </summary>
     private Task OnExport()
     {
         _exporting = true;
+        // Export logic to be implemented.
         _exporting = false;
         return Task.CompletedTask;
     }
 
+    /// <summary>
+    /// Handles importing role data from a file.
+    /// </summary>
     private Task OnImportData(IBrowserFile file)
     {
         _uploading = true;
+        // Import logic to be implemented.
         _uploading = false;
         return Task.CompletedTask;
     }
 
-}
\ No newline at end of file
+    #endregion
+}
diff --git a/src/Server.UI/Pages/Identity/Users/Users.razor b/src/Server.UI/Pages/Identity/Users/Users.razor
index ef2124c4d..66bc96346 100644
--- a/src/Server.UI/Pages/Identity/Users/Users.razor
+++ b/src/Server.UI/Pages/Identity/Users/Users.razor
@@ -381,7 +381,11 @@
 
     private async Task OnRefresh()
     {
-        await _table.ReloadServerData();
+        await InvokeAsync(async () =>
+        {
+            _selectedItems = new HashSet<ApplicationUserDto>();
+            await _table.ReloadServerData();
+        });
     }
     #region User Creation, Editing, and Deletion
     private async Task ShowUserDialog(ApplicationUserDto model, string title, Func<ApplicationUserDto, Task> processAction)
diff --git a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
index c8710d5e1..d5360bb06 100644
--- a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
+++ b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
@@ -29,45 +29,46 @@
              EditMode="DataGridEditMode.Cell"
              T="PicklistSetDto"
              CommittedItemChanges="@CommittedItemChanges"
-             ServerData="@(ServerReload)">
+             ServerData="ServerReload">
     <ToolBarContent>
         <MudStack Row Spacing="0" Class="flex-grow-1" Justify="Justify.SpaceBetween">
+            <!-- Left Toolbar: Icon, Title and List View -->
             <MudStack Row AlignItems="AlignItems.Start">
                 <MudIcon Icon="@Icons.Material.Filled.ViewList" Size="Size.Large" />
                 <MudStack Spacing="0">
                     <MudText Typo="Typo.subtitle2" Class="mb-2">@Title</MudText>
-                    <MudEnumSelect Style="min-width:120px" TEnum="PickListView" ValueChanged="OnChangedListView" Value="Query.ListView" Dense="true" Label="@L["List View"]">
+                    <MudEnumSelect Style="min-width:120px" TEnum="PickListView" Value="Query.ListView" 
+                                     ValueChanged="OnChangedListView" Dense="true" Label="@L["List View"]">
                     </MudEnumSelect>
                 </MudStack>
             </MudStack>
+            <!-- Right Toolbar: Actions and Search -->
             <MudStack Spacing="0" AlignItems="AlignItems.End">
                 <MudToolBar Dense WrapContent="true" Class="py-1 px-0">
-                    <MudButton 
-                               Disabled="@_loading"
-                               OnClick="@(() => OnRefresh())"
+                    <MudButton Disabled="@_loading"
+                               OnClick="OnRefresh"
                                StartIcon="@Icons.Material.Outlined.Refresh">
                         @ConstantString.Refresh
                     </MudButton>
                     @if (_canCreate)
                     {
-                        <MudButton 
-                        StartIcon="@Icons.Material.Outlined.Add"
-                        OnClick="OnCreate">
+                        <MudButton StartIcon="@Icons.Material.Outlined.Add"
+                                   OnClick="OnCreate">
                             @ConstantString.New
                         </MudButton>
                     }
-                    <MudMenu  TransformOrigin="Origin.BottomRight" AnchorOrigin="Origin.BottomRight" EndIcon="@Icons.Material.Filled.MoreVert" Label="@ConstantString.More">
+                    <MudMenu TransformOrigin="Origin.BottomRight" AnchorOrigin="Origin.BottomRight" EndIcon="@Icons.Material.Filled.MoreVert" Label="@ConstantString.More">
                         @if (_canDelete)
                         {
-                            <MudMenuItem Disabled="@(!(_selectedItems.Count > 0))"
-                            OnClick="OnDeleteChecked">
+                            <MudMenuItem Disabled="@(_selectedItems.Count == 0)"
+                                         OnClick="OnDeleteChecked">
                                 @ConstantString.Delete
                             </MudMenuItem>
                         }
                         @if (_canExport)
                         {
                             <MudMenuItem Disabled="@_exporting"
-                            OnClick="OnExport">
+                                         OnClick="OnExport">
                                 @ConstantString.Export
                             </MudMenuItem>
                         }
@@ -76,9 +77,10 @@
                             <MudMenuItem>
                                 <MudFileUpload T="IBrowserFile" FilesChanged="OnImportData" Accept=".xlsx">
                                     <ActivatorContent>
-                                        <MudButton Class="pa-0 ma-0" Style="font-weight:400;text-transform:none;"
-                                        Variant="Variant.Text"
-                                        Disabled="@_uploading">
+                                        <MudButton Class="pa-0 ma-0"
+                                                   Style="font-weight:400;text-transform:none;"
+                                                   Variant="Variant.Text"
+                                                   Disabled="@_uploading">
                                             @ConstantString.Import
                                         </MudButton>
                                     </ActivatorContent>
@@ -90,10 +92,10 @@
                 <MudStack Row Spacing="1">
                     @if (_canSearch)
                     {
-                        <MudEnumSelect TEnum="Picklist?" Placeholder="@L["Search by picklist"]" Value="@_searchPicklist" Clearable="true" ValueChanged="@(s => OnSearch(s))" Style="width:160px" FullWidth="true"> </MudEnumSelect>
-                        <MudTextField T="string" ValueChanged="@(s => OnSearch(s))" Value="@Query.Keyword" Placeholder="@ConstantString.Search" Adornment="Adornment.End"
-                        AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
-                        </MudTextField>
+                        <MudEnumSelect TEnum="Picklist?" Placeholder="@L["Search by picklist"]" Value="@_searchPicklist" Clearable="true" 
+                                       ValueChanged="OnPicklistSearch" Style="width:160px" FullWidth="true" />
+                        <MudTextField T="string" Value="@Query.Keyword" ValueChanged="OnKeywordSearch" Placeholder="@ConstantString.Search" 
+                                      Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small" />
                     }
                 </MudStack>
             </MudStack>
@@ -102,7 +104,7 @@
     <Columns>
         <PropertyColumn Property="x => x.Name" Title="@L[SelectedItem.GetMemberDescription(x => x.Name)]">
             <EditTemplate>
-                <MudEnumSelect @bind-Value="@context.Item.Name" TEnum="Picklist" OnClose="@(()=>PicklistChanged(context.Item))" Required="true">
+                <MudEnumSelect @bind-Value="@context.Item.Name" TEnum="Picklist" OnClose="@(() => PicklistChanged(context.Item))" Required="true">
                 </MudEnumSelect>
             </EditTemplate>
         </PropertyColumn>
@@ -111,10 +113,10 @@
         <PropertyColumn Property="x => x.Description" Title="@L[SelectedItem.GetMemberDescription(x => x.Description)]" />
         <TemplateColumn HeaderStyle="width:60px" Title="@ConstantString.Delete" Sortable="false">
             <CellTemplate>
-                <MudIconButton Icon="@Icons.Material.Filled.Delete" Variant="Variant.Outlined" Color="Color.Error" title="@ConstantString.Delete" Disabled="@(!_canDelete)" Size="Size.Small" OnClick="@(() => DeleteItem(context.Item))" />
+                <MudIconButton Icon="@Icons.Material.Filled.Delete" Variant="Variant.Outlined" Color="Color.Error" Title="@ConstantString.Delete" Disabled="@(!_canDelete)" Size="Size.Small" OnClick="@(() => DeleteItem(context.Item))" />
             </CellTemplate>
             <EditTemplate>
-                <MudIconButton Icon="@Icons.Material.Filled.Delete" Variant="Variant.Outlined" Color="Color.Error" title="@ConstantString.Delete" Disabled="@(!_canDelete)" Size="Size.Small" OnClick="@(() => DeleteItem(context.Item))" />
+                <MudIconButton Icon="@Icons.Material.Filled.Delete" Variant="Variant.Outlined" Color="Color.Error" Title="@ConstantString.Delete" Disabled="@(!_canDelete)" Size="Size.Small" OnClick="@(() => DeleteItem(context.Item))" />
             </EditTemplate>
         </TemplateColumn>
     </Columns>
@@ -123,8 +125,9 @@
     </PagerContent>
 </MudDataGrid>
 
-
 @code {
+    #region Fields & Properties
+
     [CascadingParameter] private Task<AuthenticationState> AuthState { get; set; } = default!;
     [CascadingParameter] private UserProfile? UserProfile { get; set; }
     private MudDataGrid<PicklistSetDto> _table = null!;
@@ -139,6 +142,7 @@
     private int _defaultPageSize = 15;
 
     private PicklistSetsWithPaginationQuery Query { get; set; } = new();
+
     private bool _canCreate;
     private bool _canSearch;
     private bool _canEdit;
@@ -150,6 +154,10 @@
     private bool _uploading;
     private bool _exporting;
 
+    #endregion
+
+    #region Lifecycle Methods
+
     protected override async Task OnInitializedAsync()
     {
         Title = L[SelectedItem.GetClassDescription()];
@@ -162,6 +170,10 @@
         _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Export)).Succeeded;
     }
 
+    #endregion
+
+    #region Grid Data & Search
+
     private async Task<GridData<PicklistSetDto>> ServerReload(GridState<PicklistSetDto> state)
     {
         try
@@ -171,10 +183,12 @@
             Query.Keyword = _searchString;
             Query.Picklist = _searchPicklist;
             Query.OrderBy = state.SortDefinitions.FirstOrDefault()?.SortBy ?? "Id";
-            Query.SortDirection = state.SortDefinitions.FirstOrDefault()?.Descending ?? true ? SortDirection.Descending.ToString() : SortDirection.Ascending.ToString();
+            Query.SortDirection = (state.SortDefinitions.FirstOrDefault()?.Descending ?? true)
+                                  ? SortDirection.Descending.ToString()
+                                  : SortDirection.Ascending.ToString();
             Query.PageNumber = state.Page + 1;
             Query.PageSize = state.PageSize;
-            var result = await Mediator.Send(Query).ConfigureAwait(false);
+            var result = await Mediator.Send(Query);
             return new GridData<PicklistSetDto> { TotalItems = result.TotalItems, Items = result.Items };
         }
         finally
@@ -182,18 +196,20 @@
             _loading = false;
         }
     }
+
     private async Task OnChangedListView(PickListView listview)
     {
         Query.ListView = listview;
         await _table.ReloadServerData();
     }
-    private async Task OnSearch(string text)
+
+    private async Task OnKeywordSearch(string text)
     {
         _searchString = text;
         await _table.ReloadServerData();
     }
 
-    private async Task OnSearch(Picklist? val)
+    private async Task OnPicklistSearch(Picklist? val)
     {
         _searchPicklist = val;
         await _table.ReloadServerData();
@@ -203,10 +219,16 @@
     {
         PicklistSetCacheKey.Refresh();
         _searchString = string.Empty;
-        await _table.ReloadServerData();
+        await InvokeAsync(() => _table.ReloadServerData());
     }
+
+    #endregion
+
+    #region Edit & Commit Changes
+
     private void PicklistChanged(PicklistSetDto item)
     {
+        // Trigger the commit of cell changes.
         _table.CommittedItemChanges.InvokeAsync(item);
     }
 
@@ -218,40 +240,26 @@
             var result = await Mediator.Send(command);
             if (!result.Succeeded)
             {
-                Snackbar.Add($"{result.ErrorMessage}", Severity.Error);
+                Snackbar.Add(result.ErrorMessage, Severity.Error);
             }
-
             StateHasChanged();
         });
     }
 
-    private async Task DeleteItem(PicklistSetDto item)
-    {
-        var command = new DeletePicklistSetCommand(new[] { item.Id });
-        var contentText = string.Format(ConstantString.DeleteConfirmation, item.Name);
-        await DialogServiceHelper.ShowDeleteConfirmationDialogAsync(command, ConstantString.DeleteConfirmationTitle, contentText, async () =>
-        {
-            await InvokeAsync(async () =>
-        {
-            await _table.ReloadServerData();
-            _selectedItems.Clear();
-        });
-        });
-    }
+    #endregion
 
-    private async Task OnDeleteChecked()
+    #region Create & Delete
+
+    private async Task OnCreate()
     {
-        var command = new DeletePicklistSetCommand(_selectedItems.Select(x => x.Id).ToArray());
-        var contentText = string.Format(ConstantString.DeleteConfirmation, _selectedItems.Count);
-        await DialogServiceHelper.ShowDeleteConfirmationDialogAsync(command, ConstantString.DeleteConfirmationTitle, contentText, async () =>
-        {
-            await InvokeAsync(async () =>
+        var command = new AddEditPicklistSetCommand
         {
-            await _table.ReloadServerData();
-            _selectedItems.Clear();
-        });
-        });
+            Name = SelectedItem.Name,
+            Description = SelectedItem?.Description
+        };
+        await ShowCreateDialog(command, L["Create a picklist"]);
     }
+
     private async Task ShowCreateDialog(AddEditPicklistSetCommand command, string title)
     {
         var parameters = new DialogParameters
@@ -266,50 +274,82 @@
             await _table.ReloadServerData();
         }
     }
-    private async Task OnCreate()
+
+    private async Task DeleteItem(PicklistSetDto item)
     {
-        var command = new AddEditPicklistSetCommand
+        var command = new DeletePicklistSetCommand(new[] { item.Id });
+        var contentText = string.Format(ConstantString.DeleteConfirmation, item.Name);
+        await DialogServiceHelper.ShowDeleteConfirmationDialogAsync(command, ConstantString.DeleteConfirmationTitle, contentText, async () =>
+        {
+            await InvokeAsync(async () =>
             {
-                Name = SelectedItem.Name,
-                Description = SelectedItem?.Description
-            };
-        await ShowCreateDialog(command, L["Create a picklist"]);
+                await _table.ReloadServerData();
+                _selectedItems.Clear();
+            });
+        });
     }
 
+    private async Task OnDeleteChecked()
+    {
+        var command = new DeletePicklistSetCommand(_selectedItems.Select(x => x.Id).ToArray());
+        var contentText = string.Format(ConstantString.DeleteConfirmation, _selectedItems.Count);
+        await DialogServiceHelper.ShowDeleteConfirmationDialogAsync(command, ConstantString.DeleteConfirmationTitle, contentText, async () =>
+        {
+            await InvokeAsync(async () =>
+            {
+                await _table.ReloadServerData();
+                _selectedItems.Clear();
+            });
+        });
+    }
+
+    #endregion
+
+    #region Export & Import
+
     private async Task OnExport()
     {
         _exporting = true;
-        var request = new ExportPicklistSetsQuery
-            {
-                Keyword = _searchString
-            };
-        var result = await Mediator.Send(request);
-        var downloadResult = await BlazorDownloadFileService.DownloadFile($"{L["Picklist"]}.xlsx", result, "application/octet-stream");
-        Snackbar.Add($"{ConstantString.ExportSuccess}", Severity.Info);
-        _exporting = false;
+        try
+        {
+            var request = new ExportPicklistSetsQuery { Keyword = _searchString };
+            var result = await Mediator.Send(request);
+            await BlazorDownloadFileService.DownloadFile($"{L["Picklist"]}.xlsx", result, "application/octet-stream");
+            Snackbar.Add(ConstantString.ExportSuccess, Severity.Info);
+        }
+        finally
+        {
+            _exporting = false;
+        }
     }
 
     private async Task OnImportData(IBrowserFile file)
     {
         _uploading = true;
-        var stream = new MemoryStream();
-        await file.OpenReadStream(GlobalVariable.MaxAllowedSize).CopyToAsync(stream);
-        var command = new ImportPicklistSetsCommand(file.Name, stream.ToArray());
-        var result = await Mediator.Send(command);
-        if (result.Succeeded)
-        {
-            await OnRefresh();
-            Snackbar.Add($"{ConstantString.ImportSuccess}", Severity.Info);
-        }
-        else
+        try
         {
-            foreach (var msg in result.Errors)
+            using var stream = new MemoryStream();
+            await file.OpenReadStream(GlobalVariable.MaxAllowedSize).CopyToAsync(stream);
+            var command = new ImportPicklistSetsCommand(file.Name, stream.ToArray());
+            var result = await Mediator.Send(command);
+            if (result.Succeeded)
+            {
+                await OnRefresh();
+                Snackbar.Add(ConstantString.ImportSuccess, Severity.Info);
+            }
+            else
             {
-                Snackbar.Add($"{msg}", Severity.Error);
+                foreach (var msg in result.Errors)
+                {
+                    Snackbar.Add(msg, Severity.Error);
+                }
             }
         }
-
-        _uploading = false;
+        finally
+        {
+            _uploading = false;
+        }
     }
 
-}
\ No newline at end of file
+    #endregion
+}
diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj
index 49c6f3eac..bdd68f33e 100644
--- a/src/Server.UI/Server.UI.csproj
+++ b/src/Server.UI/Server.UI.csproj
@@ -20,7 +20,7 @@
         <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
-        <PackageReference Include="MudBlazor" Version="8.1.0" />
+        <PackageReference Include="MudBlazor" Version="8.2.0" />
         <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.0" />
         <PackageReference Include="Blazor-ApexCharts" Version="5.0.1" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
diff --git a/src/Server.UI/Services/DialogServiceHelper.cs b/src/Server.UI/Services/DialogServiceHelper.cs
index 526ee762c..90b842a8e 100644
--- a/src/Server.UI/Services/DialogServiceHelper.cs
+++ b/src/Server.UI/Services/DialogServiceHelper.cs
@@ -10,7 +10,6 @@ public class DialogServiceHelper
 {
     private readonly IDialogService _dialogService;
 
-
     /// <summary>
     /// Initializes a new instance of the <see cref="DialogServiceHelper"/> class.
     /// </summary>
@@ -29,24 +28,29 @@ public DialogServiceHelper(IDialogService dialogService)
     /// <param name="onConfirm">The action to perform on confirmation.</param>
     /// <param name="onCancel">The action to perform on cancellation (optional).</param>
     /// <returns>A task representing the asynchronous operation.</returns>
-    public async Task ShowDeleteConfirmationDialogAsync(IRequest<Result<int>> command, string title, string contentText, Func<Task> onConfirm, Func<Task>? onCancel = null)
+    public async Task ShowDeleteConfirmationDialogAsync(
+        IRequest<Result<int>> command,
+        string title,
+        string contentText,
+        Func<Task> onConfirm,
+        Func<Task>? onCancel = null)
     {
         var parameters = new DialogParameters
-            {
-                { nameof(DeleteConfirmation.ContentText), contentText },
-                { nameof(DeleteConfirmation.Command), command }
-            };
+        {
+            { nameof(DeleteConfirmation.ContentText), contentText },
+            { nameof(DeleteConfirmation.Command), command }
+        };
 
         var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall, FullWidth = true };
-        var dialog = await _dialogService.ShowAsync<DeleteConfirmation>(title, parameters, options).ConfigureAwait(false);
-        var result = await dialog.Result.ConfigureAwait(false);
+        var dialog = await _dialogService.ShowAsync<DeleteConfirmation>(title, parameters, options);
+        var result = await dialog.Result;
         if (result is not null && !result.Canceled)
         {
-            await onConfirm().ConfigureAwait(false);
+            await onConfirm();
         }
         else if (onCancel != null)
         {
-            await onCancel().ConfigureAwait(false);
+            await onCancel();
         }
     }
 
@@ -58,24 +62,27 @@ public async Task ShowDeleteConfirmationDialogAsync(IRequest<Result<int>> comman
     /// <param name="onConfirm">The action to perform on confirmation.</param>
     /// <param name="onCancel">The action to perform on cancellation (optional).</param>
     /// <returns>A task representing the asynchronous operation.</returns>
-    public async Task ShowConfirmationDialogAsync(string title, string contentText, Func<Task> onConfirm, Func<Task>? onCancel = null)
+    public async Task ShowConfirmationDialogAsync(
+        string title,
+        string contentText,
+        Func<Task> onConfirm,
+        Func<Task>? onCancel = null)
     {
         var parameters = new DialogParameters
-            {
-                { nameof(ConfirmationDialog.ContentText), contentText }
-            };
+        {
+            { nameof(ConfirmationDialog.ContentText), contentText }
+        };
 
         var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall, FullWidth = true };
-        var dialog = await _dialogService.ShowAsync<ConfirmationDialog>(title, parameters, options).ConfigureAwait(false);
-        var result = await dialog.Result.ConfigureAwait(false);
-
+        var dialog = await _dialogService.ShowAsync<ConfirmationDialog>(title, parameters, options);
+        var result = await dialog.Result;
         if (result is not null && !result.Canceled)
         {
-            await onConfirm().ConfigureAwait(false);
+            await onConfirm();
         }
         else if (onCancel != null)
         {
-            await onCancel().ConfigureAwait(false);
+            await onCancel();
         }
     }
 }

From 2f1ca27f6f9b5487314a4b0cce9473bbfa845b36 Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Sun, 2 Feb 2025 11:38:52 +0800
Subject: [PATCH 02/13] Update PicklistSets.razor

---
 .../Pages/PicklistSets/PicklistSets.razor     | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
index d5360bb06..b52e9eca7 100644
--- a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
+++ b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
@@ -52,50 +52,50 @@
                     </MudButton>
                     @if (_canCreate)
                     {
-                        <MudButton StartIcon="@Icons.Material.Outlined.Add"
-                                   OnClick="OnCreate">
+                            <MudButton StartIcon="@Icons.Material.Outlined.Add"
+                                       OnClick="OnCreate">
                             @ConstantString.New
-                        </MudButton>
+                            </MudButton>
                     }
                     <MudMenu TransformOrigin="Origin.BottomRight" AnchorOrigin="Origin.BottomRight" EndIcon="@Icons.Material.Filled.MoreVert" Label="@ConstantString.More">
                         @if (_canDelete)
                         {
-                            <MudMenuItem Disabled="@(_selectedItems.Count == 0)"
-                                         OnClick="OnDeleteChecked">
+                                <MudMenuItem Disabled="@(_selectedItems.Count == 0)"
+                                             OnClick="OnDeleteChecked">
                                 @ConstantString.Delete
-                            </MudMenuItem>
+                                </MudMenuItem>
                         }
                         @if (_canExport)
                         {
-                            <MudMenuItem Disabled="@_exporting"
-                                         OnClick="OnExport">
+                                <MudMenuItem Disabled="@_exporting"
+                                             OnClick="OnExport">
                                 @ConstantString.Export
-                            </MudMenuItem>
+                                </MudMenuItem>
                         }
                         @if (_canImport)
                         {
-                            <MudMenuItem>
-                                <MudFileUpload T="IBrowserFile" FilesChanged="OnImportData" Accept=".xlsx">
-                                    <ActivatorContent>
-                                        <MudButton Class="pa-0 ma-0"
-                                                   Style="font-weight:400;text-transform:none;"
-                                                   Variant="Variant.Text"
-                                                   Disabled="@_uploading">
+                                <MudMenuItem>
+                                    <MudFileUpload T="IBrowserFile" FilesChanged="OnImportData" Accept=".xlsx">
+                                        <ActivatorContent>
+                                            <MudButton Class="pa-0 ma-0"
+                                                       Style="font-weight:400;text-transform:none;"
+                                                       Variant="Variant.Text"
+                                                       Disabled="@_uploading">
                                             @ConstantString.Import
-                                        </MudButton>
-                                    </ActivatorContent>
-                                </MudFileUpload>
-                            </MudMenuItem>
+                                            </MudButton>
+                                        </ActivatorContent>
+                                    </MudFileUpload>
+                                </MudMenuItem>
                         }
                     </MudMenu>
                 </MudToolBar>
                 <MudStack Row Spacing="1">
                     @if (_canSearch)
                     {
-                        <MudEnumSelect TEnum="Picklist?" Placeholder="@L["Search by picklist"]" Value="@_searchPicklist" Clearable="true" 
-                                       ValueChanged="OnPicklistSearch" Style="width:160px" FullWidth="true" />
-                        <MudTextField T="string" Value="@Query.Keyword" ValueChanged="OnKeywordSearch" Placeholder="@ConstantString.Search" 
-                                      Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small" />
+                            <MudEnumSelect TEnum="Picklist?" Placeholder="@L["Search by picklist"]" Value="@_searchPicklist" Clearable="true" 
+                                           ValueChanged="OnPicklistSearch" Style="width:160px" FullWidth="true" />
+                            <MudTextField T="string" Value="@Query.Keyword" ValueChanged="OnKeywordSearch" Placeholder="@ConstantString.Search" 
+                                          Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small" />
                     }
                 </MudStack>
             </MudStack>
@@ -253,10 +253,10 @@
     private async Task OnCreate()
     {
         var command = new AddEditPicklistSetCommand
-        {
-            Name = SelectedItem.Name,
-            Description = SelectedItem?.Description
-        };
+            {
+                Name = SelectedItem.Name,
+                Description = SelectedItem?.Description
+            };
         await ShowCreateDialog(command, L["Create a picklist"]);
     }
 

From 96000f9f5faff3d561117435a6a96dff89209a47 Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Sun, 2 Feb 2025 19:47:40 +0800
Subject: [PATCH 03/13] commit

---
 .../Localization/LanguageSelector.razor       |   2 +-
 src/Server.UI/Pages/Dashboard/Dashboard.razor |  24 ++
 src/Server.UI/Pages/Public/Index.razor        |   1 +
 .../Services/Layout/LayoutService.cs          | 241 +++++++-----------
 .../UserPreferences/UserPreference.cs         | 169 ++++++++----
 src/Server.UI/Themes/Theme.cs                 |   7 +-
 src/Server.UI/wwwroot/css/app.css             |   1 -
 7 files changed, 254 insertions(+), 191 deletions(-)

diff --git a/src/Server.UI/Components/Localization/LanguageSelector.razor b/src/Server.UI/Components/Localization/LanguageSelector.razor
index cc3dfeb03..e848f9863 100644
--- a/src/Server.UI/Components/Localization/LanguageSelector.razor
+++ b/src/Server.UI/Components/Localization/LanguageSelector.razor
@@ -12,7 +12,7 @@
             {
                 if (language.Name == CurrentLanguage)
                 {
-                    <MudMenuItem style="background:var(--mud-palette-primary); color:white">@language.DisplayName</MudMenuItem>
+                    <MudMenuItem style="background:var(--mud-palette-primary); color:#FFF !important">@language.DisplayName</MudMenuItem>
                 }
                 else
                 {
diff --git a/src/Server.UI/Pages/Dashboard/Dashboard.razor b/src/Server.UI/Pages/Dashboard/Dashboard.razor
index b6ac400b7..a1bb3d9d6 100644
--- a/src/Server.UI/Pages/Dashboard/Dashboard.razor
+++ b/src/Server.UI/Pages/Dashboard/Dashboard.razor
@@ -280,6 +280,30 @@
         <MudText Typo="Typo.h3" Align="Align.Center" Class="mt-16 mb-8">“Never had such a good time making a site“</MudText>
          <Carousel />
     </LandingSection>
+
+    <MudText Typo="Typo.h1">H1 Title</MudText>
+    <MudText Typo="Typo.h2">H2 Title</MudText>
+    <MudText Typo="Typo.h3">H3 Title</MudText>
+    <MudText Typo="Typo.h4">H4 Title</MudText>
+    <MudText Typo="Typo.h5">H5 Title</MudText>
+    <MudText Typo="Typo.h6">H6 Title</MudText>
+
+    <MudText Typo="Typo.subtitle1"> Subtitle1 Blazor</MudText>
+    <MudText Typo="Typo.subtitle2"> Subtitle2 Blazor</MudText>
+    <MudText Typo="Typo.button">Button Text</MudText>
+
+    <MudText Typo="Typo.body1"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.body2"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.overline"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.caption"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+
+    <MudText Typo="Typo.body1" Class="mud-secondary-text"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.body1" Class="mud-primary-text"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.body1" Class="mud-error-text"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.body1" Class="mud-info-text"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.body1" Class="mud-warning-text"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.body1" Class="mud-dark-text"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
+    <MudText Typo="Typo.body1" Class="mud-tertiary-text"> Here we add each class to the divs to change the background color, text color and both background and text color with one class only. </MudText>
 </MudContainer>
 
 <style>
diff --git a/src/Server.UI/Pages/Public/Index.razor b/src/Server.UI/Pages/Public/Index.razor
index 2fcb7d6bc..2cc34bfdc 100644
--- a/src/Server.UI/Pages/Public/Index.razor
+++ b/src/Server.UI/Pages/Public/Index.razor
@@ -6,6 +6,7 @@
     This repository guides you through building robust and maintainable Blazor Server applications by embracing the principles of Clean Architecture. Experience a seamless development journey with the included, efficient code generator, empowering you to rapidly craft stunning web applications using the latest .NET Blazor technology.
 </p>
 
+
 @code {
     [Parameter] public string? Title { get; set; }
 }
\ No newline at end of file
diff --git a/src/Server.UI/Services/Layout/LayoutService.cs b/src/Server.UI/Services/Layout/LayoutService.cs
index dce1ba85d..e87e6adca 100644
--- a/src/Server.UI/Services/Layout/LayoutService.cs
+++ b/src/Server.UI/Services/Layout/LayoutService.cs
@@ -5,125 +5,142 @@ namespace CleanArchitecture.Blazor.Server.UI.Services.Layout;
 
 public class LayoutService
 {
-    private readonly IUserPreferencesService UserPreferencesService;
+    private readonly IUserPreferencesService _userPreferencesService;
     private bool _systemPreferences;
-    public DarkLightMode DarkModeToggle = DarkLightMode.System;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LayoutService"/> class.
-    /// </summary>
-    /// <param name="userPreferencesService">The user preferences service.</param>
+    public DarkLightMode DarkModeToggle { get; private set; } = DarkLightMode.System;
+
     public LayoutService(IUserPreferencesService userPreferencesService)
     {
-        UserPreferencesService = userPreferencesService;
+        _userPreferencesService = userPreferencesService;
     }
 
-    /// <summary>
-    /// Gets or sets the user preferences.
-    /// </summary>
     public UserPreferences.UserPreference UserPreferences { get; private set; } = new();
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the layout is right-to-left.
-    /// </summary>
     public bool IsRTL { get; private set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the layout is in dark mode.
-    /// </summary>
     public bool IsDarkMode { get; private set; }
-
-     
-
-    /// <summary>
-    /// Gets or sets the current theme.
-    /// </summary>
     public MudTheme CurrentTheme { get; private set; } = new();
 
     /// <summary>
-    /// Sets the dark mode.
+    /// Sets the dark mode flag in the user preferences.
     /// </summary>
-    /// <param name="value">The value indicating whether dark mode is enabled.</param>
     public void SetDarkMode(bool value)
     {
         UserPreferences.IsDarkMode = value;
     }
 
     /// <summary>
-    /// Applies the user preferences.
+    /// Loads and applies the user preferences.
+    /// The isDarkModeDefaultTheme parameter indicates whether dark mode is enabled by default when using system settings.
     /// </summary>
-    /// <param name="isDarkModeDefaultTheme">The value indicating whether dark mode is the default theme.</param>
     public async Task ApplyUserPreferences(bool isDarkModeDefaultTheme)
     {
-        UserPreferences = await UserPreferencesService.LoadUserPreferences().ConfigureAwait(false);
+        UserPreferences = await _userPreferencesService.LoadUserPreferences().ConfigureAwait(false);
+        UpdateLayoutSettings(isDarkModeDefaultTheme);
+        UpdateCurrentTheme();
+    }
+
+    /// <summary>
+    /// Updates the user preferences, saves them, and updates the theme accordingly.
+    /// </summary>
+    public async Task UpdateUserPreferences(UserPreference preferences)
+    {
+        UserPreferences = preferences;
+        UpdateLayoutSettings(_systemPreferences);
+        UpdateCurrentTheme();
+        await _userPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
+        OnMajorUpdateOccured();
+    }
 
+    /// <summary>
+    /// Updates layout settings (IsDarkMode and IsRTL) based on user preferences.
+    /// The isDarkModeDefault parameter indicates whether dark mode should be enabled when in system mode.
+    /// </summary>
+    private void UpdateLayoutSettings(bool isDarkModeDefault)
+    {
         IsDarkMode = UserPreferences.DarkLightTheme switch
         {
             DarkLightMode.Dark => true,
             DarkLightMode.Light => false,
-            DarkLightMode.System => isDarkModeDefaultTheme,
+            DarkLightMode.System => isDarkModeDefault,
             _ => IsDarkMode
         };
         IsRTL = UserPreferences.RightToLeft;
- 
+    }
+
+    /// <summary>
+    /// Updates the CurrentTheme properties including palette, layout, and typography.
+    /// </summary>
+    private void UpdateCurrentTheme()
+    {
+        // Update palette settings
         CurrentTheme.PaletteLight.Primary = UserPreferences.PrimaryColor;
         CurrentTheme.PaletteDark.Primary = UserPreferences.DarkPrimaryColor;
         CurrentTheme.PaletteLight.PrimaryDarken = UserPreferences.PrimaryDarken;
         CurrentTheme.PaletteLight.PrimaryLighten = UserPreferences.PrimaryLighten;
         CurrentTheme.PaletteDark.PrimaryDarken = UserPreferences.PrimaryDarken;
         CurrentTheme.PaletteDark.PrimaryLighten = UserPreferences.PrimaryLighten;
+
+        // Update layout properties
         CurrentTheme.LayoutProperties.DefaultBorderRadius = UserPreferences.BorderRadius + "px";
-        CurrentTheme.Typography.Default.FontSize =
-            UserPreferences.DefaultFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Subtitle1.FontSize =
-            UserPreferences.DefaultFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Button.FontSize =
-            UserPreferences.ButtonFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
+
+        // Update typography settings
+        string defaultFontSize = FormatFontSize(UserPreferences.DefaultFontSize);
+        CurrentTheme.Typography.Default.FontSize = defaultFontSize;
+        CurrentTheme.Typography.Subtitle1.FontSize = defaultFontSize;
+
+        CurrentTheme.Typography.Button.FontSize = FormatFontSize(UserPreferences.ButtonFontSize);
         CurrentTheme.Typography.Button.LineHeight = UserPreferences.ButtonLineHeight.ToString();
-        CurrentTheme.Typography.H5.FontSize =
-            UserPreferences.H5FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.H6.FontSize =
-            UserPreferences.H6FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Body1.FontSize =
-            UserPreferences.Body1FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
 
+        // Heading fonts
+        CurrentTheme.Typography.H1.FontSize = FormatFontSize(UserPreferences.H1FontSize);
+        CurrentTheme.Typography.H2.FontSize = FormatFontSize(UserPreferences.H2FontSize);
+        CurrentTheme.Typography.H3.FontSize = FormatFontSize(UserPreferences.H3FontSize);
+        CurrentTheme.Typography.H4.FontSize = FormatFontSize(UserPreferences.H4FontSize);
+        CurrentTheme.Typography.H5.FontSize = FormatFontSize(UserPreferences.H5FontSize);
+        CurrentTheme.Typography.H6.FontSize = FormatFontSize(UserPreferences.H6FontSize);
+
+        // Body text
+        CurrentTheme.Typography.Body1.FontSize = FormatFontSize(UserPreferences.Body1FontSize);
         CurrentTheme.Typography.Body1.LineHeight = UserPreferences.Body1LineHeight.ToString();
-        CurrentTheme.Typography.Body1.LetterSpacing = UserPreferences.Body1LetterSpacing.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Body2.FontSize =
-            UserPreferences.Body2FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
+        CurrentTheme.Typography.Body1.LetterSpacing = FormatFontSize(UserPreferences.Body1LetterSpacing);
+
+        CurrentTheme.Typography.Body2.FontSize = FormatFontSize(UserPreferences.Body2FontSize);
         CurrentTheme.Typography.Body2.LineHeight = UserPreferences.Body1LineHeight.ToString();
-        CurrentTheme.Typography.Body2.LetterSpacing = UserPreferences.Body1LetterSpacing.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
+        CurrentTheme.Typography.Body2.LetterSpacing = FormatFontSize(UserPreferences.Body1LetterSpacing);
 
-        CurrentTheme.Typography.Caption.FontSize =
-            UserPreferences.CaptionFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
+        // Caption and overline texts
+        CurrentTheme.Typography.Caption.FontSize = FormatFontSize(UserPreferences.CaptionFontSize);
         CurrentTheme.Typography.Caption.LineHeight = UserPreferences.CaptionLineHeight.ToString();
-        CurrentTheme.Typography.Overline.FontSize =
-            UserPreferences.OverlineFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
+
+        CurrentTheme.Typography.Overline.FontSize = FormatFontSize(UserPreferences.OverlineFontSize);
         CurrentTheme.Typography.Overline.LineHeight = UserPreferences.OverlineLineHeight.ToString();
-        CurrentTheme.Typography.Subtitle1.FontSize =
-            UserPreferences.Subtitle1FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Subtitle2.FontSize =
-            UserPreferences.Subtitle1FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
+
+        // Subtitles
+        string subtitleFontSize = FormatFontSize(UserPreferences.Subtitle1FontSize);
+        CurrentTheme.Typography.Subtitle1.FontSize = subtitleFontSize;
+        CurrentTheme.Typography.Subtitle2.FontSize = subtitleFontSize;
     }
 
     /// <summary>
-    /// Event that is raised when a major update occurs.
+    /// Formats a font size value as a string with the "rem" unit.
     /// </summary>
+    private string FormatFontSize(double size) =>
+        size.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
+
+    #region Events and System Preferences
+
     public event EventHandler? MajorUpdateOccured;
 
     /// <summary>
     /// Raises the MajorUpdateOccured event.
     /// </summary>
-    private void OnMajorUpdateOccured()
-    {
+    private void OnMajorUpdateOccured() =>
         MajorUpdateOccured?.Invoke(this, EventArgs.Empty);
-    }
 
     /// <summary>
-    /// Handles the system preference changed event.
+    /// Handles system preference changes (e.g., system dark mode).
+    /// Updates IsDarkMode based on the new value and notifies subscribers.
     /// </summary>
-    /// <param name="newValue">The new value of the system preference.</param>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public Task OnSystemPreferenceChanged(bool newValue)
     {
         _systemPreferences = newValue;
@@ -132,14 +149,17 @@ public Task OnSystemPreferenceChanged(bool newValue)
             IsDarkMode = newValue;
             OnMajorUpdateOccured();
         }
-
         return Task.CompletedTask;
     }
 
+    #endregion
+
+    #region Mode Switching and Other Settings
+
     /// <summary>
-    /// Toggles the dark mode.
+    /// Toggles dark mode between System, Light, and Dark modes.
+    /// Saves the updated user preference and notifies subscribers.
     /// </summary>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public async Task ToggleDarkMode()
     {
         switch (DarkModeToggle)
@@ -157,28 +177,26 @@ public async Task ToggleDarkMode()
                 IsDarkMode = _systemPreferences;
                 break;
         }
-
         UserPreferences.DarkLightTheme = DarkModeToggle;
-        await UserPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
+        await _userPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
         OnMajorUpdateOccured();
     }
 
     /// <summary>
-    /// Toggles the right-to-left layout.
+    /// Toggles the layout direction between right-to-left and left-to-right.
+    /// Saves the updated user preference and notifies subscribers.
     /// </summary>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public async Task ToggleRightToLeft()
     {
         IsRTL = !IsRTL;
         UserPreferences.RightToLeft = IsRTL;
-        await UserPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
+        await _userPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
         OnMajorUpdateOccured();
     }
 
     /// <summary>
-    /// Sets the layout to right-to-left.
+    /// Sets the layout to right-to-left if it is not already.
     /// </summary>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public async Task SetRightToLeft()
     {
         if (!IsRTL)
@@ -186,9 +204,8 @@ public async Task SetRightToLeft()
     }
 
     /// <summary>
-    /// Sets the layout to left-to-right.
+    /// Sets the layout to left-to-right if it is currently right-to-left.
     /// </summary>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public async Task SetLeftToRight()
     {
         if (IsRTL)
@@ -196,9 +213,8 @@ public async Task SetLeftToRight()
     }
 
     /// <summary>
-    /// Sets the base theme.
+    /// Sets the base theme and notifies subscribers.
     /// </summary>
-    /// <param name="theme">The theme to set.</param>
     public void SetBaseTheme(MudTheme theme)
     {
         CurrentTheme = theme;
@@ -206,88 +222,27 @@ public void SetBaseTheme(MudTheme theme)
     }
 
     /// <summary>
-    /// Sets the secondary color.
+    /// Sets the secondary color in the theme, saves the updated preference, and notifies subscribers.
     /// </summary>
-    /// <param name="color">The secondary color to set.</param>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public async Task SetSecondaryColor(string color)
     {
         CurrentTheme.PaletteLight.Secondary = color;
         CurrentTheme.PaletteDark.Secondary = color;
         UserPreferences.SecondaryColor = color;
-        await UserPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
+        await _userPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
         OnMajorUpdateOccured();
     }
 
     /// <summary>
-    /// Sets the border radius.
+    /// Sets the border radius in the theme, saves the updated preference, and notifies subscribers.
     /// </summary>
-    /// <param name="size">The size of the border radius.</param>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public async Task SetBorderRadius(double size)
     {
         CurrentTheme.LayoutProperties.DefaultBorderRadius = size + "px";
         UserPreferences.BorderRadius = size;
-        await UserPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
+        await _userPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
         OnMajorUpdateOccured();
     }
 
-    /// <summary>
-    /// Updates the user preferences.
-    /// </summary>
-    /// <param name="preferences">The updated user preferences.</param>
-    /// <returns>A task representing the asynchronous operation.</returns>
-    public async Task UpdateUserPreferences(UserPreference preferences)
-    {
-        UserPreferences = preferences;
-        IsDarkMode = UserPreferences.DarkLightTheme switch
-        {
-            DarkLightMode.Dark => true,
-            DarkLightMode.Light => false,
-            DarkLightMode.System => _systemPreferences = true,
-            _ => IsDarkMode
-        };
-        IsRTL = UserPreferences.RightToLeft;
-        CurrentTheme.PaletteLight.Primary = UserPreferences.PrimaryColor;
-        CurrentTheme.PaletteDark.Primary = UserPreferences.DarkPrimaryColor;
-        CurrentTheme.PaletteLight.PrimaryDarken = UserPreferences.PrimaryDarken;
-        CurrentTheme.PaletteLight.PrimaryLighten = UserPreferences.PrimaryLighten;
-        CurrentTheme.PaletteDark.PrimaryDarken = UserPreferences.PrimaryDarken;
-        CurrentTheme.PaletteDark.PrimaryLighten = UserPreferences.PrimaryLighten;
-        CurrentTheme.LayoutProperties.DefaultBorderRadius = UserPreferences.BorderRadius + "px";
-        CurrentTheme.Typography.Default.FontSize =
-            UserPreferences.DefaultFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Subtitle1.FontSize =
-            UserPreferences.DefaultFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Button.FontSize =
-            UserPreferences.ButtonFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Button.LineHeight = UserPreferences.ButtonLineHeight.ToString();
-        CurrentTheme.Typography.Body1.FontSize =
-            UserPreferences.Body1FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.H5.FontSize =
-            UserPreferences.H5FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.H6.FontSize =
-            UserPreferences.H6FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Body1.LineHeight = UserPreferences.Body1LineHeight.ToString();
-        CurrentTheme.Typography.Body1.LetterSpacing = UserPreferences.Body1LetterSpacing.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Body2.FontSize =
-            UserPreferences.Body2FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Body2.LineHeight = UserPreferences.Body1LineHeight.ToString();
-        CurrentTheme.Typography.Body2.LetterSpacing = UserPreferences.Body1LetterSpacing.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-
-        CurrentTheme.Typography.Caption.FontSize =
-            UserPreferences.CaptionFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Caption.LineHeight = UserPreferences.CaptionLineHeight.ToString();
-        CurrentTheme.Typography.Overline.FontSize =
-            UserPreferences.OverlineFontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Overline.LineHeight = UserPreferences.OverlineLineHeight.ToString();
-        CurrentTheme.Typography.Subtitle1.FontSize =
-            UserPreferences.Subtitle1FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-        CurrentTheme.Typography.Subtitle2.FontSize =
-            UserPreferences.Subtitle1FontSize.ToString("0.0000", CultureInfo.InvariantCulture) + "rem";
-
-
-        await UserPreferencesService.SaveUserPreferences(UserPreferences).ConfigureAwait(false);
-        OnMajorUpdateOccured();
-    }
-}
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Server.UI/Services/UserPreferences/UserPreference.cs b/src/Server.UI/Services/UserPreferences/UserPreference.cs
index addc06345..ec20eaf1c 100644
--- a/src/Server.UI/Services/UserPreferences/UserPreference.cs
+++ b/src/Server.UI/Services/UserPreferences/UserPreference.cs
@@ -3,106 +3,182 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Drawing;
+using Color = System.Drawing.Color;
 
 namespace CleanArchitecture.Blazor.Server.UI.Services.UserPreferences;
 
+
+
 public class UserPreference
 {
+    // List of available primary colors
     public static readonly List<string> PrimaryColors = new()
     {
-        "#2d4275", // 蓝色
-        "#7928ca", // 深紫色
-        "#4CAF50" , // 绿色
-        "#f7b955", // 橙色
-        "#f33f33", // 红色
-        "#ff0080" // 粉色
+        "#2d4275",
+        "#7928ca",
+        "#4CAF50",
+        "#f7b955",
+        "#f33f33",
+        "#ff0080"
     };
 
+    // List of available dark primary colors
     public static readonly List<string> DarkPrimaryColors = new()
     {
-        "#0170f3", // 蓝色的暗色调
-        "#7928ca", // 深紫色的暗色调
-        "#50e3c2",  // 绿色的暗色调
-        "#f33f33", // 红色的暗色调
-        "#ff0080", // 粉色的暗色调
-        "#666666", // 灰色的暗色调
+        "#0170f3",
+        "#7928ca",
+        "#50e3c2",
+        "#f33f33",
+        "#ff0080",
+        "#666666"
     };
-
     /// <summary>
-    ///     Set the direction layout of the docs to RTL or LTR. If true RTL is used
+    /// Indicates whether the dark mode is enabled.
+    /// </summary>
+    public bool IsDarkMode { get; set; }
+    /// <summary>
+    /// Indicates whether the layout is right-to-left.
     /// </summary>
     public bool RightToLeft { get; set; }
 
     /// <summary>
-    ///     If true DarkTheme is used. LightTheme otherwise
+    /// Scale factor used for typography.
     /// </summary>
-    public bool IsDarkMode { get; set; }
+    public const double ScaleFactor = 1.067;
 
+    /// <summary>
+    /// The primary color for light mode.
+    /// </summary>
     public string PrimaryColor { get; set; } = "#2d4275";
+
+    /// <summary>
+    /// The primary color for dark mode.
+    /// </summary>
     public string DarkPrimaryColor { get; set; } = "#8b9ac6";
+
+    /// <summary>
+    /// Returns a darker version of the primary color.
+    /// </summary>
     public string PrimaryDarken => AdjustBrightness(PrimaryColor, 0.8);
+
+    /// <summary>
+    /// Returns a lighter version of the primary color.
+    /// </summary>
     public string PrimaryLighten => AdjustBrightness(PrimaryColor, 0.7);
-    public string SecondaryColor { get; set; } = "#ff4081ff";
+
+    /// <summary>
+    /// The secondary color.
+    /// </summary>
+    public string SecondaryColor { get; set; } = "rgba(255, 255, 255, 0.7)";
+
+    /// <summary>
+    /// The border radius (in pixels) for UI elements.
+    /// </summary>
     public double BorderRadius { get; set; } = 4;
+
+    /// <summary>
+    /// The default font size (in rem).
+    /// </summary>
     public double DefaultFontSize { get; set; } = 0.8125;
+
+    /// <summary>
+    /// Calculates the line height based on the default font size.
+    /// </summary>
     public double LineHeight => Math.Min(1.7, Math.Max(1.3, 1.43 * (DefaultFontSize / 0.875)));
+
+    /// <summary>
+    /// Calculates the letter spacing based on the default font size.
+    /// </summary>
     public double LetterSpacing => 0.00938 * (DefaultFontSize / 0.875);
 
-    public double H6FontSize => DefaultFontSize + 0.185;
-    public double H5FontSize => DefaultFontSize + 0.435;
+    // Heading font sizes (calculated using the default font size and the scale factor)
+    public double H6FontSize => DefaultFontSize * 1.125 * ScaleFactor;
+    public double H5FontSize => DefaultFontSize * 1.25 * ScaleFactor;
+    public double H4FontSize => DefaultFontSize * 1.5 * ScaleFactor;
+    public double H3FontSize => DefaultFontSize * 1.875 * ScaleFactor;
+    public double H2FontSize => DefaultFontSize * 2.25 * ScaleFactor;
+    public double H1FontSize => DefaultFontSize * 3 * ScaleFactor;
+
+    // Body text properties
     public double Body1FontSize => DefaultFontSize;
     public double Body1LineHeight => LineHeight;
     public double Body1LetterSpacing => LetterSpacing;
     public double Body2FontSize => DefaultFontSize - 0.0625;
     public double Body2LineHeight => LineHeight;
     public double Body2LetterSpacing => LetterSpacing;
+
+    // Button text properties
     public double ButtonFontSize => DefaultFontSize;
     public double ButtonLineHeight => Math.Min(2.15, Math.Max(1.5, 1.75 * (DefaultFontSize / 0.875)));
+
+    // Caption text properties
     public double CaptionFontSize => DefaultFontSize - 0.1875;
     public double CaptionLineHeight => Math.Min(1.8, Math.Max(1.3, 1.4 * (DefaultFontSize / 0.625)));
+
+    // Overline text properties
     public double OverlineFontSize => DefaultFontSize - 0.1875;
     public double OverlineLineHeight => Math.Min(2.0, Math.Max(1.5, 1.6 * (DefaultFontSize / 0.625)));
+
+    // Subtitle text properties
     public double Subtitle1FontSize => DefaultFontSize + 0.125;
     public double Subtitle2FontSize => DefaultFontSize - 0.0625;
+
+    /// <summary>
+    /// The theme mode (System, Light, or Dark).
+    /// </summary>
     public DarkLightMode DarkLightTheme { get; set; }
 
+    /// <summary>
+    /// Adjusts the brightness of a hex color.
+    /// </summary>
+    /// <param name="hexColor">The hex color code.</param>
+    /// <param name="factor">
+    /// The factor by which to adjust brightness (values less than 1 darken the color,
+    /// values greater than 1 lighten the color).
+    /// </param>
+    /// <returns>The adjusted hex color code.</returns>
     private string AdjustBrightness(string hexColor, double factor)
     {
         if (string.IsNullOrWhiteSpace(hexColor))
             throw new ArgumentException("Color code cannot be null or empty.", nameof(hexColor));
 
-        // 使用 ColorTranslator 解析十六进制颜色
-        var color = ColorTranslator.FromHtml(hexColor);
+        // Parse the hex color using ColorTranslator
+        Color color = ColorTranslator.FromHtml(hexColor);
 
-        // 将 RGB 转换为 HSL
-        double h, s, l;
-        ColorToHsl(color, out h, out s, out l);
+        // Convert RGB to HSL
+        ColorToHsl(color, out double h, out double s, out double l);
 
-        // 调整亮度
+        // Adjust lightness
         l = Math.Clamp(l * factor, 0.0, 1.0);
 
-        // 将 HSL 转换回 Color
-        var adjustedColor = HslToColor(h, s, l);
+        // Convert HSL back to Color
+        Color adjustedColor = HslToColor(h, s, l);
 
-        // 返回十六进制表示
+        // Return the hex representation
         return ColorTranslator.ToHtml(adjustedColor);
     }
 
-    private void ColorToHsl(System.Drawing.Color color, out double h, out double s, out double l)
+    /// <summary>
+    /// Converts a System.Drawing.Color from RGB to HSL.
+    /// </summary>
+    /// <param name="color">The input color.</param>
+    /// <param name="h">Output hue component (0 to 1).</param>
+    /// <param name="s">Output saturation component (0 to 1).</param>
+    /// <param name="l">Output lightness component (0 to 1).</param>
+    private void ColorToHsl(Color color, out double h, out double s, out double l)
     {
-        // 归一化 RGB 值到 0-1
+        // Normalize RGB values to the 0-1 range.
         double r = color.R / 255.0;
         double g = color.G / 255.0;
         double b = color.B / 255.0;
 
         double max = Math.Max(r, Math.Max(g, b));
         double min = Math.Min(r, Math.Min(g, b));
-
-        h = s = l = (max + min) / 2.0;
+        l = (max + min) / 2.0;
 
         if (max == min)
         {
-            // 无色相
+            // Achromatic color (no hue)
             h = s = 0.0;
         }
         else
@@ -121,18 +197,25 @@ private void ColorToHsl(System.Drawing.Color color, out double h, out double s,
         }
     }
 
-    private System.Drawing.Color HslToColor(double h, double s, double l)
+    /// <summary>
+    /// Converts HSL values to a System.Drawing.Color.
+    /// </summary>
+    /// <param name="h">The hue component (0 to 1).</param>
+    /// <param name="s">The saturation component (0 to 1).</param>
+    /// <param name="l">The lightness component (0 to 1).</param>
+    /// <returns>The corresponding Color.</returns>
+    private Color HslToColor(double h, double s, double l)
     {
         double r, g, b;
 
         if (s == 0.0)
         {
-            // 灰色
+            // Achromatic color (gray)
             r = g = b = l;
         }
         else
         {
-            Func<double, double, double, double> hue2rgb = (p, q, t) =>
+            double HueToRgb(double p, double q, double t)
             {
                 if (t < 0.0) t += 1.0;
                 if (t > 1.0) t -= 1.0;
@@ -140,18 +223,18 @@ private System.Drawing.Color HslToColor(double h, double s, double l)
                 if (t < 1.0 / 2.0) return q;
                 if (t < 2.0 / 3.0) return p + (q - p) * (2.0 / 3.0 - t) * 6.0;
                 return p;
-            };
+            }
 
             double q = l < 0.5 ? l * (1.0 + s) : l + s - l * s;
             double p = 2.0 * l - q;
 
-            r = hue2rgb(p, q, h + 1.0 / 3.0);
-            g = hue2rgb(p, q, h);
-            b = hue2rgb(p, q, h - 1.0 / 3.0);
+            r = HueToRgb(p, q, h + 1.0 / 3.0);
+            g = HueToRgb(p, q, h);
+            b = HueToRgb(p, q, h - 1.0 / 3.0);
         }
 
-        // 将归一化的值转换回 0-255 并创建 Color 对象
-        return System.Drawing.Color.FromArgb(
+        // Convert normalized values back to 0-255 and return a Color.
+        return Color.FromArgb(
             (int)Math.Round(r * 255.0),
             (int)Math.Round(g * 255.0),
             (int)Math.Round(b * 255.0)
@@ -164,4 +247,4 @@ public enum DarkLightMode
     System = 0,
     Light = 1,
     Dark = 2
-}
\ No newline at end of file
+}
diff --git a/src/Server.UI/Themes/Theme.cs b/src/Server.UI/Themes/Theme.cs
index ea0dbb544..93278cde3 100644
--- a/src/Server.UI/Themes/Theme.cs
+++ b/src/Server.UI/Themes/Theme.cs
@@ -26,7 +26,7 @@ public static MudTheme ApplicationTheme()
                 Surface = "#ffffff", 
                 DrawerBackground = "#ffffff",
                 TextPrimary = "#2E2E2E", 
-                TextSecondary = "#6c757d", 
+                TextSecondary = "#111", 
                 SecondaryContrastText = "#F5F5F5", 
                 TextDisabled = "#B0B0B0", 
                 ActionDefault = "#80838b", 
@@ -61,7 +61,7 @@ public static MudTheme ApplicationTheme()
                 DrawerText = "rgba(255, 255, 255, 0.75)",
                 DrawerBackground = "#222222",
                 TextPrimary = "#DADADA", 
-                TextSecondary = "rgba(255, 255, 255, 0.6)",
+                TextSecondary = "rgba(255, 255, 255, 0.7)",
                 TextDisabled = "rgba(255, 255, 255, 0.38)",
                 ActionDefault = "#e8eaed", 
                 ActionDisabled = "rgba(255, 255, 255, 0.26)",
@@ -79,7 +79,8 @@ public static MudTheme ApplicationTheme()
             LayoutProperties = new LayoutProperties
             {
                 AppbarHeight = "80px",
-                DefaultBorderRadius = "6px"
+                DefaultBorderRadius = "6px",
+                DrawerWidthLeft = "256px",
             },
             Typography = new Typography
             {
diff --git a/src/Server.UI/wwwroot/css/app.css b/src/Server.UI/wwwroot/css/app.css
index 91ee5c6da..63ce4e40a 100644
--- a/src/Server.UI/wwwroot/css/app.css
+++ b/src/Server.UI/wwwroot/css/app.css
@@ -52,7 +52,6 @@
 
 .mud-typography-body2 {
     font-size: var(--mud-typography-body2-size);
-    color: var(--mud-palette-text-secondary);
 }
 
 .mud-button-outlined-size-small {

From 93465d6b0ced91c646e74f20e0ec48d9e9fe139d Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Mon, 3 Feb 2025 09:01:28 +0800
Subject: [PATCH 04/13] new formula

---
 .../UserPreferences/UserPreference.cs         | 28 ++++++++-----
 src/Server.UI/Themes/Theme.cs                 | 42 +++++++++----------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/Server.UI/Services/UserPreferences/UserPreference.cs b/src/Server.UI/Services/UserPreferences/UserPreference.cs
index ec20eaf1c..2a376c4e4 100644
--- a/src/Server.UI/Services/UserPreferences/UserPreference.cs
+++ b/src/Server.UI/Services/UserPreferences/UserPreference.cs
@@ -59,7 +59,7 @@ public class UserPreference
     /// <summary>
     /// Returns a darker version of the primary color.
     /// </summary>
-    public string PrimaryDarken => AdjustBrightness(PrimaryColor, 0.8);
+    public string PrimaryDarken => AdjustBrightness(PrimaryColor, 0.7);
 
     /// <summary>
     /// Returns a lighter version of the primary color.
@@ -84,7 +84,9 @@ public class UserPreference
     /// <summary>
     /// Calculates the line height based on the default font size.
     /// </summary>
-    public double LineHeight => Math.Min(1.7, Math.Max(1.3, 1.43 * (DefaultFontSize / 0.875)));
+    public double LineHeight => 1.12 * Math.Pow(DefaultFontSize, 2)
+                              - 1.16 * DefaultFontSize
+                              + 1.5875;
 
     /// <summary>
     /// Calculates the letter spacing based on the default font size.
@@ -92,12 +94,12 @@ public class UserPreference
     public double LetterSpacing => 0.00938 * (DefaultFontSize / 0.875);
 
     // Heading font sizes (calculated using the default font size and the scale factor)
-    public double H6FontSize => DefaultFontSize * 1.125 * ScaleFactor;
-    public double H5FontSize => DefaultFontSize * 1.25 * ScaleFactor;
-    public double H4FontSize => DefaultFontSize * 1.5 * ScaleFactor;
-    public double H3FontSize => DefaultFontSize * 1.875 * ScaleFactor;
-    public double H2FontSize => DefaultFontSize * 2.25 * ScaleFactor;
-    public double H1FontSize => DefaultFontSize * 3 * ScaleFactor;
+    public double H6FontSize => DefaultFontSize * 1.15385 * ScaleFactor; // ≈ 1.0rem
+    public double H5FontSize => DefaultFontSize * 1.297 * ScaleFactor;   // ≈ 1.125rem
+    public double H4FontSize => DefaultFontSize * 1.441 * ScaleFactor;   // ≈ 1.25rem
+    public double H3FontSize => DefaultFontSize * 1.73 * ScaleFactor;    // ≈ 1.5rem
+    public double H2FontSize => DefaultFontSize * 2.163 * ScaleFactor;   // ≈ 1.875rem
+    public double H1FontSize => DefaultFontSize * 2.594 * ScaleFactor;   // ≈ 2.25rem
 
     // Body text properties
     public double Body1FontSize => DefaultFontSize;
@@ -109,15 +111,19 @@ public class UserPreference
 
     // Button text properties
     public double ButtonFontSize => DefaultFontSize;
-    public double ButtonLineHeight => Math.Min(2.15, Math.Max(1.5, 1.75 * (DefaultFontSize / 0.875)));
+    public double ButtonLineHeight => 1.12 * Math.Pow(DefaultFontSize, 2)
+                             - 1.16 * DefaultFontSize
+                             + 1.9075;
 
     // Caption text properties
     public double CaptionFontSize => DefaultFontSize - 0.1875;
-    public double CaptionLineHeight => Math.Min(1.8, Math.Max(1.3, 1.4 * (DefaultFontSize / 0.625)));
+    public double CaptionLineHeight => 1.12 * Math.Pow(DefaultFontSize, 2)
+                             - 1.16 * DefaultFontSize
+                             + 1.9075;
 
     // Overline text properties
     public double OverlineFontSize => DefaultFontSize - 0.1875;
-    public double OverlineLineHeight => Math.Min(2.0, Math.Max(1.5, 1.6 * (DefaultFontSize / 0.625)));
+    public double OverlineLineHeight => LineHeight;
 
     // Subtitle text properties
     public double Subtitle1FontSize => DefaultFontSize + 0.125;
diff --git a/src/Server.UI/Themes/Theme.cs b/src/Server.UI/Themes/Theme.cs
index 93278cde3..fb1963f54 100644
--- a/src/Server.UI/Themes/Theme.cs
+++ b/src/Server.UI/Themes/Theme.cs
@@ -94,45 +94,45 @@ public static MudTheme ApplicationTheme()
                 },
                 H1 = new H1Typography
                 {
-                    FontSize = "2.2rem",
-                    FontWeight = "700",
-                    LineHeight = "2.8",
-                    LetterSpacing = "-.01562em"
+                    FontSize = "2.25rem",    
+                    FontWeight = "700",        
+                    LineHeight = "2.5",       
+                    LetterSpacing = "-0.02em"  
                 },
                 H2 = new H2Typography
                 {
-                    FontSize = "2rem",
-                    FontWeight = "600",
-                    LineHeight = "2.5",
-                    LetterSpacing = "-.00833em"
+                    FontSize = "1.875rem",     
+                    FontWeight = "700",
+                    LineHeight = "2.25",
+                    LetterSpacing = "0"
                 },
                 H3 = new H3Typography
                 {
-                    FontSize = "1.75rem",
-                    FontWeight = "600",
-                    LineHeight = "2.23",
+                    FontSize = "1.5rem",      
+                    FontWeight = "700",
+                    LineHeight = "2",
                     LetterSpacing = "0"
                 },
                 H4 = new H4Typography
                 {
-                    FontSize = "1.5rem",
-                    FontWeight = "500",
-                    LineHeight = "2",
-                    LetterSpacing = ".00735em"
+                    FontSize = "1.25rem",      
+                    FontWeight = "700",
+                    LineHeight = "1.75",
+                    LetterSpacing = "0"
                 },
                 H5 = new H5Typography
                 {
-                    FontSize = "1.25rem",
+                    FontSize = "1.125rem",     
                     FontWeight = "500",
-                    LineHeight = "1.8",
+                    LineHeight = "1.75",
                     LetterSpacing = "0"
                 },
                 H6 = new H6Typography
                 {
-                    FontSize = "1rem",
-                    FontWeight = "400",
-                    LineHeight = "1.6",
-                    LetterSpacing = ".0075em"
+                    FontSize = "1rem",        
+                    FontWeight = "500",
+                    LineHeight = "1.5",
+                    LetterSpacing = "0"
                 },
                 Button = new ButtonTypography
                 {

From 2cc68310c14b3ba0476f77bf260cee316235adb6 Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Mon, 3 Feb 2025 09:10:00 +0800
Subject: [PATCH 05/13] remove AuthorizationBehaviour

---
 .../ForbiddenAccessException.cs               | 13 ----
 .../Pipeline/AuthorizationBehaviour.cs        | 68 -------------------
 2 files changed, 81 deletions(-)
 delete mode 100644 src/Application/Common/ExceptionHandlers/ForbiddenAccessException.cs
 delete mode 100644 src/Application/Pipeline/AuthorizationBehaviour.cs

diff --git a/src/Application/Common/ExceptionHandlers/ForbiddenAccessException.cs b/src/Application/Common/ExceptionHandlers/ForbiddenAccessException.cs
deleted file mode 100644
index 98eb1e63f..000000000
--- a/src/Application/Common/ExceptionHandlers/ForbiddenAccessException.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Net;
-
-namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
-
-public class ForbiddenException : ServerException
-{
-    public ForbiddenException(string message) : base(message, HttpStatusCode.Forbidden)
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Application/Pipeline/AuthorizationBehaviour.cs b/src/Application/Pipeline/AuthorizationBehaviour.cs
deleted file mode 100644
index c199b9c79..000000000
--- a/src/Application/Pipeline/AuthorizationBehaviour.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
-
-namespace CleanArchitecture.Blazor.Application.Pipeline;
-
-public class AuthorizationBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
-{
-    private readonly ICurrentUserAccessor _currentUserAccessor;
-    private readonly IIdentityService _identityService;
-
-    public AuthorizationBehaviour(
-        ICurrentUserAccessor  currentUserAccessor,
-        IIdentityService identityService)
-    {
-        _currentUserAccessor = currentUserAccessor;
-        _identityService = identityService;
-    }
-
-    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next,
-        CancellationToken cancellationToken)
-    {
-        var authorizeAttributes = request.GetType().GetCustomAttributes<RequestAuthorizeAttribute>();
-        if (authorizeAttributes.Any())
-        {
-            // Must be authenticated user
-            var userId = _currentUserAccessor.SessionInfo?.UserId;
-            if (string.IsNullOrEmpty(userId)) throw new UnauthorizedAccessException();
-
-            // DefaultRole-based authorization
-            var authorizeAttributesWithRoles = authorizeAttributes.Where(a => !string.IsNullOrWhiteSpace(a.Roles));
-
-            if (authorizeAttributesWithRoles.Any())
-            {
-                var authorized = false;
-
-                foreach (var roles in authorizeAttributesWithRoles.Select(a => a.Roles.Split(',')))
-                foreach (var role in roles)
-                {
-                    var isInRole = await _identityService.IsInRoleAsync(userId, role.Trim());
-                    if (isInRole)
-                    {
-                        authorized = true;
-                        break;
-                    }
-                }
-
-                // Must be a member of at least one role in roles
-                if (!authorized) throw new ForbiddenException("You are not authorized to access this resource.");
-            }
-
-            // Policy-based authorization
-            var authorizeAttributesWithPolicies = authorizeAttributes.Where(a => !string.IsNullOrWhiteSpace(a.Policy));
-            if (authorizeAttributesWithPolicies.Any())
-                foreach (var policy in authorizeAttributesWithPolicies.Select(a => a.Policy))
-                {
-                    var authorized = await _identityService.AuthorizeAsync(userId, policy);
-
-                    if (!authorized) throw new ForbiddenException("You are not authorized to access this resource.");
-                }
-        }
-
-        // User is authorized / authorization not required
-        return await next().ConfigureAwait(false);
-    }
-}
\ No newline at end of file

From c5adf7fb07f397ea1fa4f5955ed31bdd502887ed Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Tue, 4 Feb 2025 10:35:39 +0800
Subject: [PATCH 06/13] add SetPermissionsAsync

---
 src/Server.UI/Pages/Contacts/Contacts.razor   | 30 +++++--
 .../Pages/Contacts/CreateContact.razor        |  2 +-
 .../Pages/Contacts/EditContact.razor          |  2 +-
 .../Pages/Contacts/ViewContact.razor          |  2 +-
 src/Server.UI/Pages/Documents/Documents.razor | 51 +++++++-----
 .../Pages/Identity/Roles/Roles.razor          | 78 ++++++++++++-------
 .../Pages/Identity/Users/Users.razor          | 60 ++++++++++----
 .../Pages/PicklistSets/PicklistSets.razor     | 30 +++++--
 src/Server.UI/Pages/Products/Products.razor   | 31 ++++++--
 src/Server.UI/Pages/Tenants/Tenants.razor     | 49 +++++++-----
 10 files changed, 235 insertions(+), 100 deletions(-)

diff --git a/src/Server.UI/Pages/Contacts/Contacts.razor b/src/Server.UI/Pages/Contacts/Contacts.razor
index 13ccdbe28..d5058f452 100644
--- a/src/Server.UI/Pages/Contacts/Contacts.razor
+++ b/src/Server.UI/Pages/Contacts/Contacts.razor
@@ -181,13 +181,31 @@
     protected override async Task OnInitializedAsync()
     {
         Title = L[_currentDto.GetClassDescription()];
+        await SetPermissionsAsync();
+    }
+    private async Task SetPermissionsAsync()
+    {
+        // Retrieve the current authentication state.
         var state = await AuthState;
-        _canCreate = (await AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Create)).Succeeded;
-        _canSearch = (await AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Search)).Succeeded;
-        _canEdit = (await AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Edit)).Succeeded;
-        _canDelete = (await AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Delete)).Succeeded;
-        _canImport = (await AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Import)).Succeeded;
-        _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Export)).Succeeded;
+
+        // Initiate permission checks concurrently.
+        var createTask = AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Create);
+        var searchTask = AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Search);
+        var editTask = AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Edit);
+        var deleteTask = AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Delete);
+        var importTask = AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Import);
+        var exportTask = AuthService.AuthorizeAsync(state.User, Permissions.Contacts.Export);
+
+        // Wait for all permission tasks to complete concurrently.
+        await Task.WhenAll(createTask, searchTask, editTask, deleteTask, importTask, exportTask);
+
+        // Assign the results of each permission check to the corresponding flags.
+        _canCreate = createTask.Result.Succeeded;
+        _canSearch = searchTask.Result.Succeeded;
+        _canEdit = editTask.Result.Succeeded;
+        _canDelete = deleteTask.Result.Succeeded;
+        _canImport = importTask.Result.Succeeded;
+        _canExport = exportTask.Result.Succeeded;
     }
     private async Task<GridData<ContactDto>> ServerReload(GridState<ContactDto> state)
     {
diff --git a/src/Server.UI/Pages/Contacts/CreateContact.razor b/src/Server.UI/Pages/Contacts/CreateContact.razor
index 19b72398f..84f5e4dc7 100644
--- a/src/Server.UI/Pages/Contacts/CreateContact.razor
+++ b/src/Server.UI/Pages/Contacts/CreateContact.razor
@@ -4,7 +4,7 @@
 @inherits MudComponentBase
 @inject IValidationService Validator
 @inject IStringLocalizer<Contacts> L
-
+@attribute [Authorize(Policy = Permissions.Contacts.Create)]
 <PageTitle>@Title</PageTitle>
 <Breadcrumbs OnSaveButtonClick="Submit" Saving="_saving" BreadcrumbItems="_breadcrumbItems"></Breadcrumbs>
 <MudContainer Class="mt-3" MaxWidth="MaxWidth.Small">
diff --git a/src/Server.UI/Pages/Contacts/EditContact.razor b/src/Server.UI/Pages/Contacts/EditContact.razor
index c86e421a3..6a52b1987 100644
--- a/src/Server.UI/Pages/Contacts/EditContact.razor
+++ b/src/Server.UI/Pages/Contacts/EditContact.razor
@@ -7,7 +7,7 @@
 @inherits MudComponentBase
 @inject IValidationService Validator
 @inject IStringLocalizer<Contacts> L
-
+@attribute [Authorize(Policy = Permissions.Contacts.Edit)]
 <PageTitle>@Title</PageTitle>
 <Breadcrumbs OnSaveButtonClick="Submit" Saving="_saving" BreadcrumbItems="_breadcrumbItems"></Breadcrumbs>
 <MudContainer Class="mt-3" MaxWidth="MaxWidth.Small">
diff --git a/src/Server.UI/Pages/Contacts/ViewContact.razor b/src/Server.UI/Pages/Contacts/ViewContact.razor
index 6ef7cd800..55acad593 100644
--- a/src/Server.UI/Pages/Contacts/ViewContact.razor
+++ b/src/Server.UI/Pages/Contacts/ViewContact.razor
@@ -4,7 +4,7 @@
 @using CleanArchitecture.Blazor.Application.Features.Contacts.Queries.GetById
 @inherits MudComponentBase
 @inject IStringLocalizer<Contacts> L
-
+@attribute [Authorize(Policy = Permissions.Contacts.View)]
 <PageTitle>@Title</PageTitle>
 <Breadcrumbs  OnGoEditClick="GoEdit" OnDeleteClick="Delete" BreadcrumbItems="_breadcrumbItems"></Breadcrumbs>
 <MudContainer Class="mt-3" MaxWidth="MaxWidth.Small">
diff --git a/src/Server.UI/Pages/Documents/Documents.razor b/src/Server.UI/Pages/Documents/Documents.razor
index 1fffe944e..a03ceca70 100644
--- a/src/Server.UI/Pages/Documents/Documents.razor
+++ b/src/Server.UI/Pages/Documents/Documents.razor
@@ -51,17 +51,17 @@
                     @if (_canCreate)
                     {
                         <MudButton 
-                                   StartIcon="@Icons.Material.Outlined.Camera"
-                                   OnClick="OnCreate">
+                        StartIcon="@Icons.Material.Outlined.Camera"
+                        OnClick="OnCreate">
                             @L["Upload Pictures"]
                         </MudButton>
                     }
                     @if (_canDelete)
                     {
                         <MudButton 
-                                   StartIcon="@Icons.Material.Outlined.Delete"
-                                   Disabled="@(!(_selectedItems.Count > 0))"
-                                   OnClick="OnDeleteChecked">
+                        StartIcon="@Icons.Material.Outlined.Delete"
+                        Disabled="@(!(_selectedItems.Count > 0))"
+                        OnClick="OnDeleteChecked">
                             @ConstantString.Delete
                         </MudButton>
                     }
@@ -70,7 +70,7 @@
                     @if (_canSearch)
                     {
                         <MudTextField T="string" ValueChanged="@(s => OnSearch(s))" Value="@Query.Keyword" Placeholder="@ConstantString.Search" Adornment="Adornment.End"
-                                      AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
+                        AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
                         </MudTextField>
                     }
                 </MudStack>
@@ -86,8 +86,8 @@
                 @if (_canEdit || _canDelete)
                 {
                     <MudMenu Icon="@Icons.Material.Filled.Edit" Variant="Variant.Filled" Size="Size.Small"
-                             Dense="true"
-                             EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
+                    Dense="true"
+                    EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
                         @if (_canEdit)
                         {
                             <MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
@@ -105,8 +105,8 @@
                 else
                 {
                     <MudButton Variant="Variant.Filled"
-                               StartIcon="@Icons.Material.Filled.DoNotTouch" IconColor="Color.Secondary" Size="Size.Small"
-                               Color="Color.Surface">
+                    StartIcon="@Icons.Material.Filled.DoNotTouch" IconColor="Color.Secondary" Size="Size.Small"
+                    Color="Color.Surface">
                         @ConstantString.NoAllowed
                     </MudButton>
                 }
@@ -218,20 +218,35 @@
     {
         await base.OnInitializedAsync();
         Title = L[_currentDto.GetClassDescription()];
-        var state = await AuthState;
-        _canCreate = (await AuthService.AuthorizeAsync(state.User, Permissions.Documents.Create)).Succeeded;
-        _canSearch = (await AuthService.AuthorizeAsync(state.User, Permissions.Documents.Search)).Succeeded;
-        _canEdit = (await AuthService.AuthorizeAsync(state.User, Permissions.Documents.Edit)).Succeeded;
-        _canDelete = (await AuthService.AuthorizeAsync(state.User, Permissions.Documents.Delete)).Succeeded;
-        _canImport = (await AuthService.AuthorizeAsync(state.User, Permissions.Documents.Import)).Succeeded;
-        _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.Documents.Export)).Succeeded;
-        _canDownload = (await AuthService.AuthorizeAsync(state.User, Permissions.Documents.Download)).Succeeded;
         Client.JobCompletedEvent += _client_JobCompleted;
         Client.JobStartedEvent += _client_JobStarted;
         await Client.StartAsync();
         Query = new DocumentsWithPaginationQuery { CurrentUser = UserProfile };
     }
+    private async Task SetPermissionsAsync()
+    {
+        var state = await AuthState;
+        // Initiate permission checks concurrently using the user from the authentication state.
+        var createTask = AuthService.AuthorizeAsync(state.User, Permissions.Documents.Create);
+        var searchTask = AuthService.AuthorizeAsync(state.User, Permissions.Documents.Search);
+        var editTask = AuthService.AuthorizeAsync(state.User, Permissions.Documents.Edit);
+        var deleteTask = AuthService.AuthorizeAsync(state.User, Permissions.Documents.Delete);
+        var importTask = AuthService.AuthorizeAsync(state.User, Permissions.Documents.Import);
+        var exportTask = AuthService.AuthorizeAsync(state.User, Permissions.Documents.Export);
+        var downloadTask = AuthService.AuthorizeAsync(state.User, Permissions.Documents.Download);
 
+        // Wait for all permission tasks to complete concurrently.
+        await Task.WhenAll(createTask, searchTask, editTask, deleteTask, importTask, exportTask, downloadTask);
+
+        // Assign the results of each permission check to the corresponding flags.
+        _canCreate = createTask.Result.Succeeded;
+        _canSearch = searchTask.Result.Succeeded;
+        _canEdit = editTask.Result.Succeeded;
+        _canDelete = deleteTask.Result.Succeeded;
+        _canImport = importTask.Result.Succeeded;
+        _canExport = exportTask.Result.Succeeded;
+        _canDownload = downloadTask.Result.Succeeded;
+    }
     private void _client_JobCompleted(object? sender, JobCompletedEventArgs e)
     {
         InvokeAsync(async () =>
diff --git a/src/Server.UI/Pages/Identity/Roles/Roles.razor b/src/Server.UI/Pages/Identity/Roles/Roles.razor
index 45d45bc62..c545c45d4 100644
--- a/src/Server.UI/Pages/Identity/Roles/Roles.razor
+++ b/src/Server.UI/Pages/Identity/Roles/Roles.razor
@@ -48,14 +48,14 @@
             <MudStack Spacing="0" AlignItems="AlignItems.End">
                 <MudToolBar Dense WrapContent="true" Class="py-1 px-0">
                     <MudButton Disabled="@_loading"
-                               OnClick="OnRefresh"
-                               StartIcon="@Icons.Material.Outlined.Refresh">
+                    OnClick="OnRefresh"
+                    StartIcon="@Icons.Material.Outlined.Refresh">
                         @ConstantString.Refresh
                     </MudButton>
                     @if (_canCreate)
                     {
                         <MudButton StartIcon="@Icons.Material.Outlined.Add"
-                                   OnClick="OnCreate">
+                        OnClick="OnCreate">
                             @ConstantString.New
                         </MudButton>
                     }
@@ -63,14 +63,14 @@
                         @if (_canDelete)
                         {
                             <MudMenuItem Disabled="@(_selectedItems.Count == 0)"
-                                         OnClick="OnDeleteChecked">
+                            OnClick="OnDeleteChecked">
                                 @ConstantString.Delete
                             </MudMenuItem>
                         }
                         @if (_canExport)
                         {
                             <MudMenuItem Disabled="@_exporting"
-                                         OnClick="OnExport">
+                            OnClick="OnExport">
                                 @ConstantString.Export
                             </MudMenuItem>
                         }
@@ -80,9 +80,9 @@
                                 <MudFileUpload T="IBrowserFile" FilesChanged="OnImportData" Accept=".xlsx">
                                     <ActivatorContent>
                                         <MudButton Class="pa-0 ma-0"
-                                                   Style="font-weight:400;text-transform:none;"
-                                                   Variant="Variant.Text"
-                                                   Disabled="@_uploading">
+                                        Style="font-weight:400;text-transform:none;"
+                                        Variant="Variant.Text"
+                                        Disabled="@_uploading">
                                             @ConstantString.Import
                                         </MudButton>
                                     </ActivatorContent>
@@ -94,8 +94,8 @@
                 @if (_canSearch)
                 {
                     <MudTextField T="string" Immediate="false" Value="_searchString" FullWidth="false" ValueChanged="OnSearch"
-                                  Placeholder="@(L["Search by role name"])" Adornment="Adornment.End"
-                                  AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
+                    Placeholder="@(L["Search by role name"])" Adornment="Adornment.End"
+                    AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
                     </MudTextField>
                 }
             </MudStack>
@@ -108,8 +108,8 @@
                 @if (_canEdit || _canDelete || _canManagePermissions)
                 {
                     <MudMenu Icon="@Icons.Material.Filled.Edit" Variant="Variant.Filled" Size="Size.Small"
-                             Dense="true"
-                             EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
+                    Dense="true"
+                    EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
                         @if (_canEdit)
                         {
                             <MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
@@ -127,8 +127,8 @@
                 else
                 {
                     <MudButton Variant="Variant.Filled"
-                               StartIcon="@Icons.Material.Filled.DoNotTouch" IconColor="Color.Secondary" Size="Size.Small"
-                               Color="Color.Surface">
+                    StartIcon="@Icons.Material.Filled.DoNotTouch" IconColor="Color.Secondary" Size="Size.Small"
+                    Color="Color.Surface">
                         @ConstantString.NoAllowed
                     </MudButton>
                 }
@@ -157,11 +157,11 @@
 </MudDataGrid>
 
 <PermissionsDrawer OnAssignAllChanged="OnAssignAllChangedHandler"
-                   Waiting="@_processing"
-                   OnOpenChanged="OnOpenChangedHandler"
-                   Open="_showPermissionsDrawer"
-                   Permissions="_permissions"
-                   OnAssignChanged="OnAssignChangedHandler">
+Waiting="@_processing"
+OnOpenChanged="OnOpenChangedHandler"
+Open="_showPermissionsDrawer"
+Permissions="_permissions"
+OnAssignChanged="OnAssignChangedHandler">
 </PermissionsDrawer>
 
 @code {
@@ -202,16 +202,40 @@
     {
         InitializeServices();
         Title = L[_currentDto.GetClassDescription()];
+        await SetPermissionsAsync();
+    }
+    private async Task SetPermissionsAsync()
+    {
         var state = await AuthState;
-        _canCreate = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Create)).Succeeded;
-        _canSearch = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Search)).Succeeded;
-        _canEdit = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Edit)).Succeeded;
-        _canDelete = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Delete)).Succeeded;
-        _canManagePermissions = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.ManagePermissions)).Succeeded;
-        _canImport = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Import)).Succeeded;
-        _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.Roles.Export)).Succeeded;
+        // Initiate permission checks concurrently for role management.
+        var createTask = AuthService.AuthorizeAsync(state.User, Permissions.Roles.Create);
+        var searchTask = AuthService.AuthorizeAsync(state.User, Permissions.Roles.Search);
+        var editTask = AuthService.AuthorizeAsync(state.User, Permissions.Roles.Edit);
+        var deleteTask = AuthService.AuthorizeAsync(state.User, Permissions.Roles.Delete);
+        var managePermissionsTask = AuthService.AuthorizeAsync(state.User, Permissions.Roles.ManagePermissions);
+        var importTask = AuthService.AuthorizeAsync(state.User, Permissions.Roles.Import);
+        var exportTask = AuthService.AuthorizeAsync(state.User, Permissions.Roles.Export);
+
+        // Wait for all permission checks to complete concurrently.
+        await Task.WhenAll(
+            createTask,
+            searchTask,
+            editTask,
+            deleteTask,
+            managePermissionsTask,
+            importTask,
+            exportTask
+        );
+
+        // Assign permission flags based on the authorization results.
+        _canCreate = createTask.Result.Succeeded;
+        _canSearch = searchTask.Result.Succeeded;
+        _canEdit = editTask.Result.Succeeded;
+        _canDelete = deleteTask.Result.Succeeded;
+        _canManagePermissions = managePermissionsTask.Result.Succeeded;
+        _canImport = importTask.Result.Succeeded;
+        _canExport = exportTask.Result.Succeeded;
     }
-
     private void InitializeServices()
     {
         RoleManager = ScopedServices.GetRequiredService<RoleManager<ApplicationRole>>();
diff --git a/src/Server.UI/Pages/Identity/Users/Users.razor b/src/Server.UI/Pages/Identity/Users/Users.razor
index 66bc96346..e02ff298e 100644
--- a/src/Server.UI/Pages/Identity/Users/Users.razor
+++ b/src/Server.UI/Pages/Identity/Users/Users.razor
@@ -287,8 +287,7 @@
     {
         Title = L[_currentDto.GetClassDescription()];
         InitializeServices();
-        var state = await AuthState;
-        await SetPermissionsAsync(state);
+        await SetPermissionsAsync();
         _roles = await RoleManager.Roles.Select(x => x.Name).ToListAsync();
     }
     private void InitializeServices()
@@ -297,19 +296,50 @@
         UserManager = ScopedServices.GetRequiredService<UserManager<ApplicationUser>>();
         PermissionHelper = ScopedServices.GetRequiredService<PermissionHelper>();
     }
-    private async Task SetPermissionsAsync(AuthenticationState state)
-    {
-        _canCreate = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.Create)).Succeeded;
-        _canSearch = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.Search)).Succeeded;
-        _canEdit = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.Edit)).Succeeded;
-        _canDelete = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.Delete)).Succeeded;
-        _canManageRoles = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.ManageRoles)).Succeeded;
-        _canRestPassword = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.RestPassword)).Succeeded;
-        _canSendRestPasswordMail = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.SendRestPasswordMail)).Succeeded;
-        _canManagePermissions = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.ManagePermissions)).Succeeded;
-        _canImport = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.Import)).Succeeded;
-        _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.Export)).Succeeded;
-        _canViewOnlineStatus = (await AuthService.AuthorizeAsync(state.User, Permissions.Users.ViewOnlineStatus)).Succeeded;
+
+    private async Task SetPermissionsAsync()
+    {
+        var state = await AuthState;
+        // Initiate permission checks concurrently.
+        var createTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.Create);
+        var searchTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.Search);
+        var editTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.Edit);
+        var deleteTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.Delete);
+        var manageRolesTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.ManageRoles);
+        var restPasswordTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.RestPassword);
+        var sendRestPasswordMailTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.SendRestPasswordMail);
+        var managePermissionsTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.ManagePermissions);
+        var importTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.Import);
+        var exportTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.Export);
+        var viewOnlineStatusTask = AuthService.AuthorizeAsync(state.User, Permissions.Users.ViewOnlineStatus);
+
+        // Wait for all permission checks to complete concurrently.
+        await Task.WhenAll(
+            createTask,
+            searchTask,
+            editTask,
+            deleteTask,
+            manageRolesTask,
+            restPasswordTask,
+            sendRestPasswordMailTask,
+            managePermissionsTask,
+            importTask,
+            exportTask,
+            viewOnlineStatusTask
+        );
+
+        // Assign the results from the authorization checks to the corresponding permission flags.
+        _canCreate = createTask.Result.Succeeded;
+        _canSearch = searchTask.Result.Succeeded;
+        _canEdit = editTask.Result.Succeeded;
+        _canDelete = deleteTask.Result.Succeeded;
+        _canManageRoles = manageRolesTask.Result.Succeeded;
+        _canRestPassword = restPasswordTask.Result.Succeeded;
+        _canSendRestPasswordMail = sendRestPasswordMailTask.Result.Succeeded;
+        _canManagePermissions = managePermissionsTask.Result.Succeeded;
+        _canImport = importTask.Result.Succeeded;
+        _canExport = exportTask.Result.Succeeded;
+        _canViewOnlineStatus = viewOnlineStatusTask.Result.Succeeded;
     }
     private async Task OnInvalidated(IComputed state)
     {
diff --git a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
index b52e9eca7..6ec988c5d 100644
--- a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
+++ b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
@@ -161,13 +161,31 @@
     protected override async Task OnInitializedAsync()
     {
         Title = L[SelectedItem.GetClassDescription()];
+        await SetPermissionsAsync();
+    }
+    private async Task SetPermissionsAsync()
+    {
+        // Retrieve the current authentication state.
         var state = await AuthState;
-        _canCreate = (await AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Create)).Succeeded;
-        _canSearch = (await AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Search)).Succeeded;
-        _canEdit = (await AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Edit)).Succeeded;
-        _canDelete = (await AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Delete)).Succeeded;
-        _canImport = (await AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Import)).Succeeded;
-        _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Export)).Succeeded;
+
+        // Initiate all permission checks concurrently.
+        var createTask = AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Create);
+        var searchTask = AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Search);
+        var editTask = AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Edit);
+        var deleteTask = AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Delete);
+        var importTask = AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Import);
+        var exportTask = AuthService.AuthorizeAsync(state.User, Permissions.PicklistSets.Export);
+
+        // Wait for all permission tasks to complete concurrently.
+        await Task.WhenAll(createTask, searchTask, editTask, deleteTask, importTask, exportTask);
+
+        // Assign the results of each permission check to the corresponding flags.
+        _canCreate = createTask.Result.Succeeded;
+        _canSearch = searchTask.Result.Succeeded;
+        _canEdit = editTask.Result.Succeeded;
+        _canDelete = deleteTask.Result.Succeeded;
+        _canImport = importTask.Result.Succeeded;
+        _canExport = exportTask.Result.Succeeded;
     }
 
     #endregion
diff --git a/src/Server.UI/Pages/Products/Products.razor b/src/Server.UI/Pages/Products/Products.razor
index bc1847737..94da987cc 100644
--- a/src/Server.UI/Pages/Products/Products.razor
+++ b/src/Server.UI/Pages/Products/Products.razor
@@ -205,15 +205,32 @@
     protected override async Task OnInitializedAsync()
     {
         Title = L[_currentDto.GetClassDescription()];
-        var state = await AuthState;
-        _canCreate = (await AuthService.AuthorizeAsync(state.User, Permissions.Products.Create)).Succeeded;
-        _canSearch = (await AuthService.AuthorizeAsync(state.User, Permissions.Products.Search)).Succeeded;
-        _canEdit = (await AuthService.AuthorizeAsync(state.User, Permissions.Products.Edit)).Succeeded;
-        _canDelete = (await AuthService.AuthorizeAsync(state.User, Permissions.Products.Delete)).Succeeded;
-        _canImport = (await AuthService.AuthorizeAsync(state.User, Permissions.Products.Import)).Succeeded;
-        _canExport = (await AuthService.AuthorizeAsync(state.User, Permissions.Products.Export)).Succeeded;
+        await SetPermissionsAsync();
     }
+    private async Task SetPermissionsAsync()
+    {
+        // Retrieve the current authentication state.
+        var state = await AuthState;
 
+        // Initiate permission checks concurrently.
+        var createTask = AuthService.AuthorizeAsync(state.User, Permissions.Products.Create);
+        var searchTask = AuthService.AuthorizeAsync(state.User, Permissions.Products.Search);
+        var editTask = AuthService.AuthorizeAsync(state.User, Permissions.Products.Edit);
+        var deleteTask = AuthService.AuthorizeAsync(state.User, Permissions.Products.Delete);
+        var importTask = AuthService.AuthorizeAsync(state.User, Permissions.Products.Import);
+        var exportTask = AuthService.AuthorizeAsync(state.User, Permissions.Products.Export);
+
+        // Wait for all permission tasks to complete concurrently.
+        await Task.WhenAll(createTask, searchTask, editTask, deleteTask, importTask, exportTask);
+
+        // Assign the results of each permission check to the corresponding flags.
+        _canCreate = createTask.Result.Succeeded;
+        _canSearch = searchTask.Result.Succeeded;
+        _canEdit = editTask.Result.Succeeded;
+        _canDelete = deleteTask.Result.Succeeded;
+        _canImport = importTask.Result.Succeeded;
+        _canExport = exportTask.Result.Succeeded;
+    }
     private async Task<GridData<ProductDto>> ServerReload(GridState<ProductDto> state)
     {
         try
diff --git a/src/Server.UI/Pages/Tenants/Tenants.razor b/src/Server.UI/Pages/Tenants/Tenants.razor
index db889cb2c..49c98246a 100644
--- a/src/Server.UI/Pages/Tenants/Tenants.razor
+++ b/src/Server.UI/Pages/Tenants/Tenants.razor
@@ -27,7 +27,7 @@
                 <MudIcon Icon="@Icons.Material.Filled.Domain" Size="Size.Large" />
                 <MudStack Spacing="0">
                     <MudText Typo="Typo.subtitle2" Class="mb-2">@Title</MudText>
-              
+
                 </MudStack>
             </MudStack>
             <MudStack Spacing="0" AlignItems="AlignItems.End">
@@ -41,17 +41,17 @@
                     @if (_canCreate)
                     {
                         <MudButton 
-                                   StartIcon="@Icons.Material.Outlined.Add"
-                                   OnClick="OnCreate">
+                        StartIcon="@Icons.Material.Outlined.Add"
+                        OnClick="OnCreate">
                             @ConstantString.New
                         </MudButton>
                     }
                     @if (_canDelete)
                     {
                         <MudButton 
-                                   StartIcon="@Icons.Material.Outlined.Delete"
-                                   Disabled="@(!(_selectedItems.Count > 0))"
-                                   OnClick="OnDeleteChecked">
+                        StartIcon="@Icons.Material.Outlined.Delete"
+                        Disabled="@(!(_selectedItems.Count > 0))"
+                        OnClick="OnDeleteChecked">
                             @ConstantString.Delete
                         </MudButton>
                     }
@@ -60,7 +60,7 @@
                     @if (_canSearch)
                     {
                         <MudTextField T="string" ValueChanged="@(s => OnSearch(s))" Value="@Query.Keyword" Placeholder="@ConstantString.Search" Adornment="Adornment.End"
-                                      AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
+                        AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small">
                         </MudTextField>
                     }
                 </MudStack>
@@ -74,8 +74,8 @@
                 @if (_canEdit || _canDelete)
                 {
                     <MudMenu Icon="@Icons.Material.Filled.Edit" Variant="Variant.Filled" Size="Size.Small"
-                             Dense="true"
-                             EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
+                    Dense="true"
+                    EndIcon="@Icons.Material.Filled.KeyboardArrowDown" IconColor="Color.Info" AnchorOrigin="Origin.CenterLeft">
                         @if (_canEdit)
                         {
                             <MudMenuItem OnClick="@(() => OnEdit(context.Item))">@ConstantString.Edit</MudMenuItem>
@@ -89,8 +89,8 @@
                 else
                 {
                     <MudButton Variant="Variant.Filled"
-                               StartIcon="@Icons.Material.Filled.DoNotTouch" IconColor="Color.Secondary" Size="Size.Small"
-                               Color="Color.Surface">
+                    StartIcon="@Icons.Material.Filled.DoNotTouch" IconColor="Color.Secondary" Size="Size.Small"
+                    Color="Color.Surface">
                         @ConstantString.NoAllowed
                     </MudButton>
                 }
@@ -136,21 +136,34 @@
     protected override async Task OnInitializedAsync()
     {
         Title = L[_currentDto.GetClassDescription()];
-        var state = await AuthState;
-        _canCreate = (await AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Create)).Succeeded;
-        _canSearch = (await AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Search)).Succeeded;
-        _canEdit = (await AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Edit)).Succeeded;
-        _canDelete = (await AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Delete)).Succeeded;
+        await SetPermissionsAsync();
     }
+    private async Task SetPermissionsAsync()
+    {
+        var state = await AuthState;
+        var createTask = AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Create);
+        var searchTask = AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Search);
+        var editTask = AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Edit);
+        var deleteTask = AuthService.AuthorizeAsync(state.User, Permissions.Tenants.Delete);
+
+        await Task.WhenAll(createTask, searchTask, editTask, deleteTask);
 
+        _canCreate = createTask.Result.Succeeded;
+        _canSearch = searchTask.Result.Succeeded;
+        _canEdit = editTask.Result.Succeeded;
+        _canDelete = deleteTask.Result.Succeeded;
+    }
     private async Task<GridData<TenantDto>> ServerReload(GridState<TenantDto> state)
     {
         try
         {
             _loading = true;
             Query.Keyword = _searchString;
-            Query.OrderBy = state.SortDefinitions.FirstOrDefault()?.SortBy ?? "Id";
-            Query.SortDirection = state.SortDefinitions.FirstOrDefault()?.Descending ?? true ? SortDirection.Descending.ToString() : SortDirection.Ascending.ToString();
+            var sortDefinition = state.SortDefinitions.FirstOrDefault();
+            Query.OrderBy = sortDefinition?.SortBy ?? "Id";
+            Query.SortDirection = (sortDefinition != null && sortDefinition.Descending)
+                                      ? SortDirection.Descending.ToString()
+                                      : SortDirection.Ascending.ToString();
             Query.PageNumber = state.Page + 1;
             Query.PageSize = state.PageSize;
             var result = await Mediator.Send(Query);

From 052ca6bf10437a5dfe0bd245f70cf6c51395f32b Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Tue, 4 Feb 2025 10:53:27 +0800
Subject: [PATCH 07/13] Update Contacts.razor

---
 src/Server.UI/Pages/Contacts/Contacts.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Server.UI/Pages/Contacts/Contacts.razor b/src/Server.UI/Pages/Contacts/Contacts.razor
index d5058f452..d824b5399 100644
--- a/src/Server.UI/Pages/Contacts/Contacts.razor
+++ b/src/Server.UI/Pages/Contacts/Contacts.razor
@@ -229,7 +229,7 @@
     }
     private async Task OnSearch(string text)
     {
-        _selectedItems = new();
+        _selectedItems.Clear();
         Query.Keyword = text;
         await _table.ReloadServerData();
     }
@@ -241,7 +241,7 @@
     private async Task OnRefresh()
     {
         ContactCacheKey.Refresh();
-        _selectedItems = new();
+        _selectedItems.Clear();
         Query.Keyword = string.Empty;
         await _table.ReloadServerData();
     }

From 38ad98e5c959083daac69d7722171b4032d82737 Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Tue, 4 Feb 2025 20:48:02 +0800
Subject: [PATCH 08/13] fixed

---
 .../Configurations/DocumentConfiguration.cs   |   1 +
 src/Server.UI/Pages/Documents/Documents.razor |   3 +-
 .../Pages/Documents/Documents.ca-ES.resx      | 163 ++++++++---------
 .../Pages/Documents/Documents.de-DE.resx      | 163 ++++++++---------
 .../Pages/Documents/Documents.en.resx         | 164 +++++++++---------
 .../Pages/Documents/Documents.es-ES.resx      | 163 ++++++++---------
 .../Pages/Documents/Documents.fr-FR.resx      | 163 ++++++++---------
 .../Pages/Documents/Documents.ja-JP.resx      | 163 ++++++++---------
 .../Pages/Documents/Documents.km-KH.resx      | 163 ++++++++---------
 .../Pages/Documents/Documents.ko-KR.resx      | 163 ++++++++---------
 .../Resources/Pages/Documents/Documents.resx  | 164 +++++++++---------
 .../Pages/Documents/Documents.ru.resx         | 163 ++++++++---------
 .../Pages/Documents/Documents.zh-CN.resx      | 163 ++++++++---------
 13 files changed, 926 insertions(+), 873 deletions(-)

diff --git a/src/Infrastructure/Persistence/Configurations/DocumentConfiguration.cs b/src/Infrastructure/Persistence/Configurations/DocumentConfiguration.cs
index 57edb204e..fdb3fd21f 100644
--- a/src/Infrastructure/Persistence/Configurations/DocumentConfiguration.cs
+++ b/src/Infrastructure/Persistence/Configurations/DocumentConfiguration.cs
@@ -23,5 +23,6 @@ public void Configure(EntityTypeBuilder<Document> builder)
             .OnDelete(DeleteBehavior.Restrict);
         builder.Navigation(e => e.CreatedByUser).AutoInclude();
         builder.Navigation(e => e.LastModifiedByUser).AutoInclude();
+        builder.Navigation(e => e.Tenant).AutoInclude();
     }
 }
\ No newline at end of file
diff --git a/src/Server.UI/Pages/Documents/Documents.razor b/src/Server.UI/Pages/Documents/Documents.razor
index a03ceca70..677f1e03b 100644
--- a/src/Server.UI/Pages/Documents/Documents.razor
+++ b/src/Server.UI/Pages/Documents/Documents.razor
@@ -173,7 +173,6 @@
             <CellTemplate>
                 <div class="d-flex flex-column">
                     <MudText Typo="Typo.body2">@context.Item.TenantName</MudText>
-                    <MudText Typo="Typo.body2" Class="mud-text-secondary">@context.Item.TenantId</MudText>
                 </div>
             </CellTemplate>
         </PropertyColumn>
@@ -216,7 +215,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        await base.OnInitializedAsync();
+        await SetPermissionsAsync();
         Title = L[_currentDto.GetClassDescription()];
         Client.JobCompletedEvent += _client_JobCompleted;
         Client.JobStartedEvent += _client_JobStarted;
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.ca-ES.resx b/src/Server.UI/Resources/Pages/Documents/Documents.ca-ES.resx
index dd3f112c9..7e86cb242 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.ca-ES.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.ca-ES.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>Adjunt</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>tipus de document</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>El tipus de document és obligatori!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>Documents</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>És Públic</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>Seleccioneu el tipus de document</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>Nom del llogater</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Títol</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>El títol és obligatori!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>Carrega</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>Carrega correctament</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>descarregar</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>Propietari</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} feina començada.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} reconeixement completat.</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>Carrega Imatges</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>Reconeix el resultat</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>Si us plau, feu clic al botó [Tria fitxers] per pujar la vostra foto.</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>Només es permeten fitxers .jpg i .png.</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>Trieu fitxers</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>Contingut</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>Estat</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>Creat per l'usuari</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.de-DE.resx b/src/Server.UI/Resources/Pages/Documents/Documents.de-DE.resx
index a2ecd9109..a58e26721 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.de-DE.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.de-DE.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>Anhang</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>Art des Dokuments</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>Dokumenttyp ist erforderlich!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>Unterlagen</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>Ist öffentlich</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>Wählen Sie den Dokumenttyp aus</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>Name des Mieters</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Titel</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>Titel ist erforderlich!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>Hochladen</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>Hochladen erfolgreich</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} Job gestartet.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} erkennen abgeschlossen.</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>Wähle Dateien</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>Inhalt</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>Es sind nur .jpg- und .png-Dateien zulässig.</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>Bitte klicken Sie auf die Schaltfläche [Dateien auswählen], um Ihr Foto hochzuladen.</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>Ergebnis erkennen</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>Lade Bilder hoch</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>Herunterladen</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>Eigentümer</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>Status</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>Erstellt von Benutzer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.en.resx b/src/Server.UI/Resources/Pages/Documents/Documents.en.resx
index 15fc5019f..e6197a24c 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.en.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.en.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
       Microsoft ResX Schema 
       
       Version 2.0
@@ -59,131 +59,135 @@
               : using a System.ComponentModel.TypeConverter
               : and then encoded with base64 encoding.
       -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root"
-                xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>Attachement</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>Document Type</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>Document type is required!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>Documents</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>Is Public</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>Select Document Type</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>Tenant Name</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Title</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>Title is required!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>Upload</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>Upload successfully</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} job started.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} recognize completed.</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>Choose files</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>Content</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>Only .jpg and .png files are allowed.</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>Please click [Choose Files] button to upload your photo.</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>Recognize result</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>Upload Pictures</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>Download</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>Owner</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>Status</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>Created By User</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.es-ES.resx b/src/Server.UI/Resources/Pages/Documents/Documents.es-ES.resx
index fdc2605a1..e3e7d52ea 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.es-ES.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.es-ES.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>Adjunto</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>Tipo de Documento</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>¡Se requiere tipo de documento!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>Documentos</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>es publico</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>Seleccionar tipo de documento</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>Nombre del inquilino</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Título</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>¡Se requiere título!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>Subir</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>Subir exitosamente</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} trabajo iniciado.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} reconocimiento completado.</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>Seleccionar archivos</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>Contenido</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>Sólo se permiten archivos .jpg y .png.</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>Haga clic en el botón [Elegir archivos] para cargar su foto.</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>Reconocer resultado</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>Subir fotos</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>Descargar</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>Dueño</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>Estado</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>Creado por el usuario</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.fr-FR.resx b/src/Server.UI/Resources/Pages/Documents/Documents.fr-FR.resx
index b9f80ac8a..d2e52acfd 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.fr-FR.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.fr-FR.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>Pièce jointe</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>Type de document</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>Le type de document est requis !</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>Documents</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>est public</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>Sélectionnez le type de document</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>Nom du locataire</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Titre</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>Le titre est obligatoire !</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>Télécharger</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>Téléchargez avec succès</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} tâche démarrée.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} reconnaissance terminée.</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>Choisir des fichiers</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>Contenu</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>Seuls les fichiers .jpg et .png sont autorisés.</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>Veuillez cliquer sur le bouton [Choisir les fichiers] pour télécharger votre photo.</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>Reconnaître le résultat</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>Télécharger des photos</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>Télécharger</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>Propriétaire</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>Statut</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>Créé par l'utilisateur</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.ja-JP.resx b/src/Server.UI/Resources/Pages/Documents/Documents.ja-JP.resx
index bec7d7332..9602ef149 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.ja-JP.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.ja-JP.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>添付ファイル</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>ドキュメントタイプ</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>書類の種類は必須です。</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>書類</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>公開されています</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>ドキュメントの種類を選択してください</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>テナント名</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>タイトル</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>タイトルは必須です！</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>アップロード</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>アップロードに成功しました</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} ジョブが開始されました。</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} の認識が完了しました。</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>ファイルの選択</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>コンテンツ</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>.jpg および .png ファイルのみが許可されます。</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>[ファイルを選択]ボタンをクリックして写真をアップロードしてください。</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>結果を認識する</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>写真をアップロードする</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>ダウンロード</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>所有者</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>ステータス</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>ユーザーによって作成</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.km-KH.resx b/src/Server.UI/Resources/Pages/Documents/Documents.km-KH.resx
index af7abb748..53f24fb32 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.km-KH.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.km-KH.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>ឯកសារភ្ជាប់</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>ប្រភេទ​ឯកសារ</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>ត្រូវការប្រភេទឯកសារ!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>ឯកសារ</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>ជាសាធារណៈ</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>ជ្រើសរើសប្រភេទឯកសារ</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>ឈ្មោះអ្នកជួល</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>ចំណងជើង</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>ត្រូវការចំណងជើង!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>ផ្ទុកឡើង</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>បង្ហោះដោយជោគជ័យ</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>ការងារ {0} បានចាប់ផ្តើម។</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} ទទួលស្គាល់ថាបានបញ្ចប់។</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>ជ្រើសរើសឯកសារ</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>មាតិកា</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>មានតែឯកសារ .jpg និង .png ត្រូវបានអនុញ្ញាត។</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>សូមចុចប៊ូតុង [ជ្រើសរើសឯកសារ] ដើម្បីបង្ហោះរូបថតរបស់អ្នក។</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>ទទួលស្គាល់លទ្ធផល</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>បង្ហោះរូបភាព</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>ទាញយក</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>ម្ចាស់</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>ស្ថានភាព</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>បង្កើតដោយអ្នកប្រើប្រាស់</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.ko-KR.resx b/src/Server.UI/Resources/Pages/Documents/Documents.ko-KR.resx
index 4a5299c1e..ec51be0a2 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.ko-KR.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.ko-KR.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
       Microsoft ResX Schema 
       
       Version 2.0
@@ -59,130 +59,135 @@
               : using a System.ComponentModel.TypeConverter
               : and then encoded with base64 encoding.
       -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
-                xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="{0} job started." xml:space="preserve">
+  </resheader>
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} 작업이 시작되었습니다.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} 인식이 완료되었습니다.</value>
   </data>
-    <data name="Attachement" xml:space="preserve">
+  <data name="Attachement" xml:space="preserve">
     <value>첨부파일</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>파일 선택</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>콘텐츠</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>문서 유형</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>문서 유형이 필요합니다!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>서류</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>다운로드</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>공개임</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>.jpg 및 .png 파일만 허용됩니다.</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>소유자</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>사진을 업로드하려면 [파일 선택] 버튼을 클릭하세요.</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>결과를 인식</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>문서 유형 선택</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>테넌트 이름</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>제목</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>제목은 필수입니다!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>업로드</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>사진 업로드</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>성공적으로 업로드</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>상태</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>사용자가 생성</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.resx b/src/Server.UI/Resources/Pages/Documents/Documents.resx
index 70d4db541..2e1f49e82 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
       Microsoft ResX Schema 
       
       Version 2.0
@@ -59,131 +59,135 @@
               : using a System.ComponentModel.TypeConverter
               : and then encoded with base64 encoding.
       -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root"
-                xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>Attachement</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>Choose files</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>Content</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>Document Type</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>Document type is required!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>Documents</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>Is Public</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>Only .jpg and .png files are allowed.</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>Please click [Choose Files] button to upload your photo.</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>Recognize result</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>Select Document Type</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>Tenant Name</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Title</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>Title is required!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>Upload</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>Upload Pictures</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>Upload successfully</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} job started.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} recognize completed.</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>Download</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>Owner</value>
   </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>Created By User</value>
+  </data>
+  <data name="Status" xml:space="preserve">
+    <value>Status</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.ru.resx b/src/Server.UI/Resources/Pages/Documents/Documents.ru.resx
index 9d59f75a1..67f406d62 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.ru.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.ru.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>Приложение</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>тип документа</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>Тип документа обязателен!</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>Документы</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>Является общедоступным</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>Выберите тип документа</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>Имя арендатора</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Заголовок</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>Название обязательно!</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>Загрузить</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>Загрузка успешно завершена</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>Задание {0} начато.</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0} признать завершенным.</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>Выберите файлы</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>Содержание</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>Разрешены только файлы .jpg и .png.</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>Пожалуйста, нажмите кнопку [Выбрать файлы], чтобы загрузить свою фотографию.</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>Признайте результат</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>Загрузить фотографии</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>Скачать</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>Владелец</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>Статус</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>Создано пользователем</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server.UI/Resources/Pages/Documents/Documents.zh-CN.resx b/src/Server.UI/Resources/Pages/Documents/Documents.zh-CN.resx
index 8065306a7..62a056fdb 100644
--- a/src/Server.UI/Resources/Pages/Documents/Documents.zh-CN.resx
+++ b/src/Server.UI/Resources/Pages/Documents/Documents.zh-CN.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
         Microsoft ResX Schema 
         
         Version 2.0
@@ -59,130 +59,135 @@
                 : using a System.ComponentModel.TypeConverter
                 : and then encoded with base64 encoding.
         -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                id="root" xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns="">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089
         </value>
-    </resheader>
-    <data name="Attachement" xml:space="preserve">
+  </resheader>
+  <data name="Attachement" xml:space="preserve">
     <value>附件</value>
   </data>
-    <data name="Document Type" xml:space="preserve">
+  <data name="Document Type" xml:space="preserve">
     <value>文件类型</value>
   </data>
-    <data name="Document type is required!" xml:space="preserve">
+  <data name="Document type is required!" xml:space="preserve">
     <value>文件类型为必填项！</value>
   </data>
-    <data name="Documents" xml:space="preserve">
+  <data name="Documents" xml:space="preserve">
     <value>文件</value>
   </data>
-    <data name="Is Public" xml:space="preserve">
+  <data name="Is Public" xml:space="preserve">
     <value>是公开的</value>
   </data>
-    <data name="Select Document Type" xml:space="preserve">
+  <data name="Select Document Type" xml:space="preserve">
     <value>选择文档类型</value>
   </data>
-    <data name="Tenant Name" xml:space="preserve">
+  <data name="Tenant Name" xml:space="preserve">
     <value>租户名称</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>标题</value>
   </data>
-    <data name="Title is required!" xml:space="preserve">
+  <data name="Title is required!" xml:space="preserve">
     <value>标题为必填项！</value>
   </data>
-    <data name="Upload" xml:space="preserve">
+  <data name="Upload" xml:space="preserve">
     <value>上传</value>
   </data>
-    <data name="Upload successfully" xml:space="preserve">
+  <data name="Upload successfully" xml:space="preserve">
     <value>上传成功</value>
   </data>
-    <data name="{0} job started." xml:space="preserve">
+  <data name="{0} job started." xml:space="preserve">
     <value>{0} 作业已开始。</value>
   </data>
-    <data name="{0} recognize completed." xml:space="preserve">
+  <data name="{0} recognize completed." xml:space="preserve">
     <value>{0}识别完成。</value>
   </data>
-    <data name="Choose files" xml:space="preserve">
+  <data name="Choose files" xml:space="preserve">
     <value>选择文件</value>
   </data>
-    <data name="Content" xml:space="preserve">
+  <data name="Content" xml:space="preserve">
     <value>内容</value>
   </data>
-    <data name="Only .jpg and .png files are allowed." xml:space="preserve">
+  <data name="Only .jpg and .png files are allowed." xml:space="preserve">
     <value>仅允许使用 .jpg 和 .png 文件。</value>
   </data>
-    <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
+  <data name="Please click [Choose Files] button to upload your photo." xml:space="preserve">
     <value>请点击[选择文件]按钮上传您的照片。</value>
   </data>
-    <data name="Recognize result" xml:space="preserve">
+  <data name="Recognize result" xml:space="preserve">
     <value>识别结果</value>
   </data>
-    <data name="Upload Pictures" xml:space="preserve">
+  <data name="Upload Pictures" xml:space="preserve">
     <value>上传图片</value>
   </data>
-    <data name="Download" xml:space="preserve">
+  <data name="Download" xml:space="preserve">
     <value>下载</value>
   </data>
-    <data name="Owner" xml:space="preserve">
+  <data name="Owner" xml:space="preserve">
     <value>所有者</value>
   </data>
+  <data name="Status" xml:space="preserve">
+    <value>状态</value>
+  </data>
+  <data name="Created By User" xml:space="preserve">
+    <value>创建人</value>
+  </data>
 </root>
\ No newline at end of file

From a190ac1820533f3e271010040e772744c411252d Mon Sep 17 00:00:00 2001
From: hualin <hualin1.zhu@voith.com>
Date: Sat, 8 Feb 2025 16:55:23 +0800
Subject: [PATCH 09/13] commit

---
 src/Application/Application.csproj            |   8 +-
 .../ExceptionHandlers/ConflictException.cs    |  11 -
 .../InternalServerException.cs                |   9 -
 .../UnauthorizedException.cs                  |  11 -
 .../ValidationExceptionHandler.cs             |   6 -
 .../Interfaces/Serialization/ISerializer.cs   |   9 -
 src/Application/Common/Models/Result.cs       | 192 ++++++++++++++----
 .../Commands/Import/ImportProductsCommand.cs  |   5 +-
 .../Queries/Export/ExportProductsQuery.cs     |   5 +-
 src/Infrastructure/DependencyInjection.cs     |  20 +-
 src/Infrastructure/Infrastructure.csproj      |   2 +-
 .../MultiTenant/MultiTenantUserManager.cs     |   6 +-
 .../MultiTenant/MultiTenantUserStore.cs       |  12 +-
 .../Services/PaddleOCR/DocumentOcrJob.cs      |   3 -
 .../Serialization/SystemTextJsonSerializer.cs |  27 ---
 .../Components/Breadcrumbs/Breadcrumbs.razor  |   4 +-
 .../Pages/Contacts/CreateContact.razor        |   2 +-
 .../Pages/Contacts/EditContact.razor          |   2 +-
 src/Server.UI/Server.UI.csproj                |   2 +-
 .../Application.IntegrationTests.csproj       |   4 +-
 .../Application.UnitTests.csproj              |   4 +-
 .../Domain.UnitTests/Domain.UnitTests.csproj  |   4 +-
 22 files changed, 185 insertions(+), 163 deletions(-)
 delete mode 100644 src/Application/Common/ExceptionHandlers/ConflictException.cs
 delete mode 100644 src/Application/Common/ExceptionHandlers/InternalServerException.cs
 delete mode 100644 src/Application/Common/ExceptionHandlers/UnauthorizedException.cs
 delete mode 100644 src/Application/Common/Interfaces/Serialization/ISerializer.cs
 delete mode 100644 src/Infrastructure/Services/Serialization/SystemTextJsonSerializer.cs

diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
index 116bfbfc9..527a98dbf 100644
--- a/src/Application/Application.csproj
+++ b/src/Application/Application.csproj
@@ -22,10 +22,10 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Riok.Mapperly" Version="4.2.0-next.0" />
         <PackageReference Include="Hangfire.Core" Version="1.8.17" />
-        <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.0.0" />
-           <PackageReference Include="ActualLab.Fusion" Version="9.8.17" />
-        <PackageReference Include="ActualLab.Fusion.Blazor" Version="9.8.17" />
-        <PackageReference Include="ActualLab.Generators" Version="9.8.17">
+        <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.1.0" />
+           <PackageReference Include="ActualLab.Fusion" Version="9.8.26" />
+        <PackageReference Include="ActualLab.Fusion.Blazor" Version="9.8.26" />
+        <PackageReference Include="ActualLab.Generators" Version="9.8.26">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Application/Common/ExceptionHandlers/ConflictException.cs b/src/Application/Common/ExceptionHandlers/ConflictException.cs
deleted file mode 100644
index 71477085c..000000000
--- a/src/Application/Common/ExceptionHandlers/ConflictException.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Net;
-
-namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
-
-public class ConflictException : ServerException
-{
-    public ConflictException(string message)
-        : base(message, HttpStatusCode.Conflict)
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Application/Common/ExceptionHandlers/InternalServerException.cs b/src/Application/Common/ExceptionHandlers/InternalServerException.cs
deleted file mode 100644
index c7fe6669b..000000000
--- a/src/Application/Common/ExceptionHandlers/InternalServerException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
-
-public class InternalServerException : ServerException
-{
-    public InternalServerException(string message)
-        : base(message)
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Application/Common/ExceptionHandlers/UnauthorizedException.cs b/src/Application/Common/ExceptionHandlers/UnauthorizedException.cs
deleted file mode 100644
index 21419e0bd..000000000
--- a/src/Application/Common/ExceptionHandlers/UnauthorizedException.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Net;
-
-namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
-
-public class UnauthorizedException : ServerException
-{
-    public UnauthorizedException(string message)
-        : base(message, HttpStatusCode.Unauthorized)
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Application/Common/ExceptionHandlers/ValidationExceptionHandler.cs b/src/Application/Common/ExceptionHandlers/ValidationExceptionHandler.cs
index 15cec28f7..365742be2 100644
--- a/src/Application/Common/ExceptionHandlers/ValidationExceptionHandler.cs
+++ b/src/Application/Common/ExceptionHandlers/ValidationExceptionHandler.cs
@@ -7,12 +7,6 @@ public class
     where TResponse : Result<int>
     where TException : ValidationException
 {
-    private readonly ILogger<ValidationExceptionHandler<TRequest, TResponse, TException>> _logger;
-
-    public ValidationExceptionHandler(ILogger<ValidationExceptionHandler<TRequest, TResponse, TException>> logger)
-    {
-        _logger = logger;
-    }
 
     public Task Handle(TRequest request, TException exception, RequestExceptionHandlerState<TResponse> state,
         CancellationToken cancellationToken)
diff --git a/src/Application/Common/Interfaces/Serialization/ISerializer.cs b/src/Application/Common/Interfaces/Serialization/ISerializer.cs
deleted file mode 100644
index 918132cf5..000000000
--- a/src/Application/Common/Interfaces/Serialization/ISerializer.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Serialization;
-
-public interface ISerializer
-{
-    string Serialize<T>(T value) where T : class;
-    T? Deserialize<T>(string value) where T : class;
-    byte[] SerializeBytes<T>(T value) where T : class;
-    T? DeserializeBytes<T>(byte[] value) where T : class;
-}
\ No newline at end of file
diff --git a/src/Application/Common/Models/Result.cs b/src/Application/Common/Models/Result.cs
index d95677079..dfcf18524 100644
--- a/src/Application/Common/Models/Result.cs
+++ b/src/Application/Common/Models/Result.cs
@@ -1,65 +1,171 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace CleanArchitecture.Blazor.Application.Common.Models;
+namespace CleanArchitecture.Blazor.Application.Common.Models;
 
+/// <summary>
+/// Represents the result of an operation.
+/// </summary>
 public class Result : IResult
 {
-    internal Result()
-    {
-        Errors = new string[] { };
-    }
-
-    internal Result(bool succeeded, IEnumerable<string> errors)
+    /// <summary>
+    /// Protected constructor to initialize the result.
+    /// </summary>
+    /// <param name="succeeded">Indicates whether the operation succeeded.</param>
+    /// <param name="errors">A collection of error messages.</param>
+    protected Result(bool succeeded, IEnumerable<string>? errors)
     {
         Succeeded = succeeded;
-        Errors = errors.ToArray();
+        Errors = errors?.ToArray() ?? Array.Empty<string>();
     }
 
-    public string ErrorMessage => string.Join(", ", Errors ?? new string[] { });
-
+    /// <summary>
+    /// Indicates whether the operation succeeded.
+    /// </summary>
     public bool Succeeded { get; init; }
 
+    /// <summary>
+    /// An array of error messages.
+    /// </summary>
     public string[] Errors { get; init; }
 
+    /// <summary>
+    /// Gets a concatenated string of error messages, separated by commas.
+    /// </summary>
+    public string ErrorMessage => string.Join(", ", Errors);
+
+    /// <summary>
+    /// Creates a successful <see cref="Result"/> instance.
+    /// </summary>
     public static Result Success() => new Result(true, Array.Empty<string>());
+
+    /// <summary>
+    /// Asynchronously creates a successful <see cref="Result"/> instance.
+    /// </summary>
     public static Task<Result> SuccessAsync() => Task.FromResult(Success());
-    public static  Result Failure(params string[] errors) => new Result(false, errors);
-    public static Task<Result> FailureAsync(params string[] errors) => Task.FromResult(Failure(errors));
 
-    // Functional extensions
-    public TResult Match<TResult>(Func<TResult> onSuccess, Func<string, TResult> onFailure) =>
-        Succeeded ? onSuccess() : onFailure(ErrorMessage);
+    /// <summary>
+    /// Creates a failed <see cref="Result"/> instance.
+    /// </summary>
+    /// <param name="errors">Error messages.</param>
+    public static Result Failure(params string[] errors) => new Result(false, errors);
+
+    /// <summary>
+    /// Asynchronously creates a failed <see cref="Result"/> instance.
+    /// </summary>
+    /// <param name="errors">Error messages.</param>
+    public static Task<Result> FailureAsync(params string[] errors) => Task.FromResult(Failure(errors));
 
-    public async Task<TResult> MatchAsync<TResult>(Func<Task<TResult>> onSuccess, Func<string, Task<TResult>> onFailure) =>
-        Succeeded ? await onSuccess() : await onFailure(ErrorMessage);
+    /// <summary>
+    /// Executes the appropriate function based on whether the operation succeeded.
+    /// </summary>
+    /// <typeparam name="TResult">The return type.</typeparam>
+    /// <param name="onSuccess">Function to execute if the operation succeeded.</param>
+    /// <param name="onFailure">Function to execute if the operation failed, with an error message.</param>
+    public TResult Match<TResult>(Func<TResult> onSuccess, Func<string, TResult> onFailure)
+        => Succeeded ? onSuccess() : onFailure(ErrorMessage);
+
+    /// <summary>
+    /// Asynchronously executes the appropriate function based on whether the operation succeeded.
+    /// </summary>
+    /// <typeparam name="TResult">The return type.</typeparam>
+    /// <param name="onSuccess">Asynchronous function to execute if the operation succeeded.</param>
+    /// <param name="onFailure">Asynchronous function to execute if the operation failed, with an error message.</param>
+    public Task<TResult> MatchAsync<TResult>(Func<Task<TResult>> onSuccess, Func<string, Task<TResult>> onFailure)
+        => Succeeded ? onSuccess() : onFailure(ErrorMessage);
 }
 
+/// <summary>
+/// Represents the result of an operation that includes data.
+/// </summary>
+/// <typeparam name="T">The type of the data.</typeparam>
 public class Result<T> : Result, IResult<T>
 {
-    public T? Data { get; set; }
-    public static Result<T> Success(T data) => new Result<T> { Succeeded= true, Data= data };
-    public static Task<Result<T>> SuccessAsync(T data) => Task.FromResult(Success(data));
-    public static new Result<T> Failure(params string[] errors) => new Result<T> { Succeeded = false, Errors = errors.ToArray() };
-    public static new Task<Result<T>> FailureAsync(params string[] errors) => Task.FromResult(new Result<T> { Succeeded = false, Errors = errors.ToArray() });
-
-    // Functional extensions
-    public TResult Match<TResult>(Func<T, TResult> onSuccess, Func<string, TResult> onFailure) =>
-        Succeeded ? onSuccess(Data!) : onFailure(ErrorMessage);
-
-    public async Task<TResult> MatchAsync<TResult>(Func<T, Task<TResult>> onSuccess, Func<string, Task<TResult>> onFailure) =>
-        Succeeded ? await onSuccess(Data!) : await onFailure(ErrorMessage);
-
-    public Result<TResult> Map<TResult>(Func<T, TResult> map) =>
-        Succeeded ? Result<TResult>.Success(map(Data!)) : Result<TResult>.Failure(Errors);
-
-    public async Task<Result<TResult>> MapAsync<TResult>(Func<T, Task<TResult>> map) =>
-    Succeeded ? Result<TResult>.Success(await map(Data!)) : await Result<TResult>.FailureAsync(Errors);
+    /// <summary>
+    /// The data contained in the result.
+    /// </summary>
+    public T? Data { get; init; }
+
+    /// <summary>
+    /// Protected constructor to initialize a result with data.
+    /// </summary>
+    /// <param name="succeeded">Indicates whether the operation succeeded.</param>
+    /// <param name="errors">A collection of error messages.</param>
+    /// <param name="data">The data returned from the operation.</param>
+    protected Result(bool succeeded, IEnumerable<string>? errors, T? data)
+        : base(succeeded, errors)
+    {
+        Data = data;
+    }
 
-    public Result<TResult> Bind<TResult>(Func<T, Result<TResult>> bind) =>
-        Succeeded ? bind(Data!) : Result<TResult>.Failure(Errors);
+    /// <summary>
+    /// Creates a successful <see cref="Result{T}"/> instance with the specified data.
+    /// </summary>
+    /// <param name="data">The data to include in the result.</param>
+    public static Result<T> Success(T data) => new Result<T>(true, Array.Empty<string>(), data);
 
-    public async Task<Result<TResult>> BindAsync<TResult>(Func<T, Task<Result<TResult>>> bind) =>
-    Succeeded ? await bind(Data!) : await Result<TResult>.FailureAsync(Errors);
+    /// <summary>
+    /// Asynchronously creates a successful <see cref="Result{T}"/> instance with the specified data.
+    /// </summary>
+    /// <param name="data">The data to include in the result.</param>
+    public static Task<Result<T>> SuccessAsync(T data) => Task.FromResult(Success(data));
 
-}
\ No newline at end of file
+    /// <summary>
+    /// Creates a failed <see cref="Result{T}"/> instance.
+    /// </summary>
+    /// <param name="errors">Error messages.</param>
+    public static new Result<T> Failure(params string[] errors) => new Result<T>(false, errors, default);
+
+    /// <summary>
+    /// Asynchronously creates a failed <see cref="Result{T}"/> instance.
+    /// </summary>
+    /// <param name="errors">Error messages.</param>
+    public static new Task<Result<T>> FailureAsync(params string[] errors) => Task.FromResult(Failure(errors));
+
+    /// <summary>
+    /// Executes the appropriate function based on whether the operation succeeded.
+    /// </summary>
+    /// <typeparam name="TResult">The return type.</typeparam>
+    /// <param name="onSuccess">Function to execute if the operation succeeded, with the data.</param>
+    /// <param name="onFailure">Function to execute if the operation failed, with an error message.</param>
+    public TResult Match<TResult>(Func<T, TResult> onSuccess, Func<string, TResult> onFailure)
+        => Succeeded ? onSuccess(Data!) : onFailure(ErrorMessage);
+
+    /// <summary>
+    /// Asynchronously executes the appropriate function based on whether the operation succeeded.
+    /// </summary>
+    /// <typeparam name="TResult">The return type.</typeparam>
+    /// <param name="onSuccess">Asynchronous function to execute if the operation succeeded, with the data.</param>
+    /// <param name="onFailure">Asynchronous function to execute if the operation failed, with an error message.</param>
+    public Task<TResult> MatchAsync<TResult>(Func<T, Task<TResult>> onSuccess, Func<string, Task<TResult>> onFailure)
+        => Succeeded ? onSuccess(Data!) : onFailure(ErrorMessage);
+
+    /// <summary>
+    /// Maps the data contained in the result to a new type.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the mapped data.</typeparam>
+    /// <param name="map">The mapping function.</param>
+    public Result<TResult> Map<TResult>(Func<T, TResult> map)
+        => Succeeded ? Result<TResult>.Success(map(Data!)) : Result<TResult>.Failure(Errors);
+
+    /// <summary>
+    /// Asynchronously maps the data contained in the result to a new type.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the mapped data.</typeparam>
+    /// <param name="map">The asynchronous mapping function.</param>
+    public async Task<Result<TResult>> MapAsync<TResult>(Func<T, Task<TResult>> map)
+        => Succeeded ? Result<TResult>.Success(await map(Data!)) : await Result<TResult>.FailureAsync(Errors);
+
+    /// <summary>
+    /// Binds the result to another result, allowing for chaining operations.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the data in the resulting result.</typeparam>
+    /// <param name="bind">The binding function that returns a new result.</param>
+    public Result<TResult> Bind<TResult>(Func<T, Result<TResult>> bind)
+        => Succeeded ? bind(Data!) : Result<TResult>.Failure(Errors);
+
+    /// <summary>
+    /// Asynchronously binds the result to another result, allowing for chaining operations.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the data in the resulting result.</typeparam>
+    /// <param name="bind">The asynchronous binding function that returns a new result.</param>
+    public async Task<Result<TResult>> BindAsync<TResult>(Func<T, Task<Result<TResult>>> bind)
+        => Succeeded ? await bind(Data!) : await Result<TResult>.FailureAsync(Errors);
+}
diff --git a/src/Application/Features/Products/Commands/Import/ImportProductsCommand.cs b/src/Application/Features/Products/Commands/Import/ImportProductsCommand.cs
index c0a66f431..09900cebe 100644
--- a/src/Application/Features/Products/Commands/Import/ImportProductsCommand.cs
+++ b/src/Application/Features/Products/Commands/Import/ImportProductsCommand.cs
@@ -34,19 +34,16 @@ public class ImportProductsCommandHandler :
     private readonly IApplicationDbContext _context;
     private readonly IExcelService _excelService;
     private readonly IStringLocalizer<ImportProductsCommandHandler> _localizer;
-    private readonly ISerializer _serializer;
 
     public ImportProductsCommandHandler(
         IApplicationDbContext context,
         IExcelService excelService,
-        ISerializer serializer,
         IStringLocalizer<ImportProductsCommandHandler> localizer
     )
     {
         _context = context;
         _localizer = localizer;
         _excelService = excelService;
-        _serializer = serializer;
     }
 
     public async Task<Result<byte[]>> Handle(CreateProductsTemplateCommand request, CancellationToken cancellationToken)
@@ -84,7 +81,7 @@ public async Task<Result<int>> Handle(ImportProductsCommand request, Cancellatio
                     _localizer["Pictures"],
                     (row, item) => item.Pictures = string.IsNullOrEmpty(row[_localizer["Pictures"]].ToString())
                         ? new List<ProductImage>()
-                        : _serializer.Deserialize<List<ProductImage>>(row[_localizer["Pictures"]].ToString())
+                        : JsonSerializer.Deserialize<List<ProductImage>>(row[_localizer["Pictures"]].ToString())
                 }
             }, _localizer["Products"]);
         if (!result.Succeeded) return await Result<int>.FailureAsync(result.Errors);
diff --git a/src/Application/Features/Products/Queries/Export/ExportProductsQuery.cs b/src/Application/Features/Products/Queries/Export/ExportProductsQuery.cs
index 0aed2d86a..3d84cb396 100644
--- a/src/Application/Features/Products/Queries/Export/ExportProductsQuery.cs
+++ b/src/Application/Features/Products/Queries/Export/ExportProductsQuery.cs
@@ -22,18 +22,15 @@ public class ExportProductsQueryHandler :
     private readonly IExcelService _excelService;
     private readonly IStringLocalizer<ExportProductsQueryHandler> _localizer;
     private readonly IPDFService _pdfService;
-    private readonly ISerializer _serializer;
 
     public ExportProductsQueryHandler(
         IApplicationDbContext context,
-        ISerializer serializer,
         IExcelService excelService,
         IPDFService pdfService,
         IStringLocalizer<ExportProductsQueryHandler> localizer
     )
     {
         _context = context;
-        _serializer = serializer;
         _excelService = excelService;
         _pdfService = pdfService;
         _localizer = localizer;
@@ -71,7 +68,7 @@ public async Task<Result<byte[]>> Handle(ExportProductsQuery request, Cancellati
                     { _localizer["Description"], item => item.Description },
                     { _localizer["Price of unit"], item => item.Price },
                     { _localizer["Unit"], item => item.Unit },
-                    { _localizer["Pictures"], item => _serializer.Serialize(item.Pictures) }
+                    { _localizer["Pictures"], item => JsonSerializer.Serialize(item.Pictures) }
                 };
                 result = await _excelService.ExportAsync(data, mappers, _localizer["Products"]);
                 break;
diff --git a/src/Infrastructure/DependencyInjection.cs b/src/Infrastructure/DependencyInjection.cs
index bdcaa92f9..a41efd351 100644
--- a/src/Infrastructure/DependencyInjection.cs
+++ b/src/Infrastructure/DependencyInjection.cs
@@ -5,7 +5,6 @@
 using ActualLab.Fusion;
 using CleanArchitecture.Blazor.Application.Common.Interfaces.MediatorWrapper;
 using CleanArchitecture.Blazor.Application.Common.Interfaces.MultiTenant;
-using CleanArchitecture.Blazor.Application.Common.Interfaces.Serialization;
 using CleanArchitecture.Blazor.Application.Features.Fusion;
 using CleanArchitecture.Blazor.Domain.Identity;
 using CleanArchitecture.Blazor.Infrastructure.Configurations;
@@ -18,7 +17,6 @@
 using CleanArchitecture.Blazor.Infrastructure.Services.MediatorWrapper;
 using CleanArchitecture.Blazor.Infrastructure.Services.MultiTenant;
 using CleanArchitecture.Blazor.Infrastructure.Services.PaddleOCR;
-using CleanArchitecture.Blazor.Infrastructure.Services.Serialization;
 using FluentEmail.MailKitSmtp;
 using Microsoft.AspNetCore.Components.Server.Circuits;
 using Microsoft.AspNetCore.DataProtection;
@@ -174,8 +172,14 @@ private static IServiceCollection AddServices(this IServiceCollection services)
                 service.Initialize();
                 return service;
             });
-
-        return services.AddSingleton<ISerializer, SystemTextJsonSerializer>()
+        services.AddSingleton<UserService>()
+            .AddSingleton<IUserService>(sp =>
+            {
+                var service = sp.GetRequiredService<UserService>();
+                service.Initialize();
+                return service;
+            });
+        return services
             .AddScoped<IValidationService, ValidationService>()
             .AddScoped<IDateTime, DateTimeService>()
             .AddScoped<IExcelService, ExcelService>()
@@ -302,13 +306,7 @@ private static IServiceCollection AddAuthenticationService(this IServiceCollecti
         });
         services.AddDataProtection().PersistKeysToDbContext<ApplicationDbContext>();
 
-        services.AddSingleton<UserService>()
-            .AddSingleton<IUserService>(sp =>
-            {
-                var service = sp.GetRequiredService<UserService>();
-                service.Initialize();
-                return service;
-            });
+        
 
         return services;
     }
diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
index 9a9d309bb..a7aee4fe5 100644
--- a/src/Infrastructure/Infrastructure.csproj
+++ b/src/Infrastructure/Infrastructure.csproj
@@ -11,7 +11,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.1" />
-        <PackageReference Include="QuestPDF" Version="2025.1.0-rc0" />
+        <PackageReference Include="QuestPDF" Version="2025.1.1" />
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="8.1.1-dev-00120" />
         <PackageReference Include="Serilog.Sinks.Postgresql.Alternative" Version="4.1.3" />
diff --git a/src/Infrastructure/Services/MultiTenant/MultiTenantUserManager.cs b/src/Infrastructure/Services/MultiTenant/MultiTenantUserManager.cs
index f540163a1..d36c9111b 100644
--- a/src/Infrastructure/Services/MultiTenant/MultiTenantUserManager.cs
+++ b/src/Infrastructure/Services/MultiTenant/MultiTenantUserManager.cs
@@ -98,7 +98,7 @@ public override async Task<IdentityResult> AddToRoleAsync(ApplicationUser user,
             });
         }
 
-        if (await IsInRoleAsync(user, role.Name))
+        if (await IsInRoleAsync(user, role.Name!))
         {
             return IdentityResult.Failed(new IdentityError
             {
@@ -108,7 +108,7 @@ public override async Task<IdentityResult> AddToRoleAsync(ApplicationUser user,
         }
 
         var userRoleStore = GetUserRoleStore();
-        await userRoleStore.AddToRoleAsync(user, role.NormalizedName, CancellationToken.None);
+        await userRoleStore.AddToRoleAsync(user, role.NormalizedName!, CancellationToken.None);
 
         return await UpdateUserAsync(user);
     }
@@ -153,5 +153,5 @@ private IUserRoleStore<ApplicationUser> GetUserRoleStore()
                ?? throw new NotSupportedException("The user store does not implement IUserRoleStore<ApplicationUser>.");
     }
 
-    private ApplicationDbContext Context => (Store as UserStore<ApplicationUser, ApplicationRole, ApplicationDbContext, string, ApplicationUserClaim, ApplicationUserRole, ApplicationUserLogin, ApplicationUserToken, ApplicationRoleClaim>)?.Context;
+    private ApplicationDbContext Context => (Store as UserStore<ApplicationUser, ApplicationRole, ApplicationDbContext, string, ApplicationUserClaim, ApplicationUserRole, ApplicationUserLogin, ApplicationUserToken, ApplicationRoleClaim>)?.Context ?? throw new InvalidOperationException("Context is not available.");
 }
diff --git a/src/Infrastructure/Services/MultiTenant/MultiTenantUserStore.cs b/src/Infrastructure/Services/MultiTenant/MultiTenantUserStore.cs
index 2e356da00..01c77b10b 100644
--- a/src/Infrastructure/Services/MultiTenant/MultiTenantUserStore.cs
+++ b/src/Infrastructure/Services/MultiTenant/MultiTenantUserStore.cs
@@ -115,20 +115,20 @@ public override async Task RemoveFromRoleAsync(ApplicationUser user, string norm
     }
 
     // Retrieve a role entity based on the normalized role name and tenant ID
-    private async Task<ApplicationRole> GetRoleAsync(string normalizedRoleName, string tenantId, CancellationToken cancellationToken)
+    private  Task<ApplicationRole?> GetRoleAsync(string normalizedRoleName, string tenantId, CancellationToken cancellationToken)
     {
-        return await Context.Roles.FirstOrDefaultAsync(r => r.NormalizedName == normalizedRoleName && r.TenantId == tenantId, cancellationToken);
+        return  Context.Roles.FirstOrDefaultAsync(r => r.NormalizedName == normalizedRoleName && r.TenantId == tenantId, cancellationToken);
     }
 
     // Retrieve a user-role relationship based on user ID and role ID
-    private async Task<ApplicationUserRole> GetUserRoleAsync(string userId, string roleId, CancellationToken cancellationToken)
+    private  Task<ApplicationUserRole?> GetUserRoleAsync(string userId, string roleId, CancellationToken cancellationToken)
     {
-        return await Context.UserRoles.FirstOrDefaultAsync(ur => ur.UserId == userId && ur.RoleId == roleId, cancellationToken);
+        return  Context.UserRoles.FirstOrDefaultAsync(ur => ur.UserId == userId && ur.RoleId == roleId, cancellationToken);
     }
 
     // Check if a user is in a given role
-    private async Task<bool> IsUserInRoleAsync(string userId, string roleId, CancellationToken cancellationToken)
+    private  Task<bool> IsUserInRoleAsync(string userId, string roleId, CancellationToken cancellationToken)
     {
-        return await Context.UserRoles.AnyAsync(ur => ur.UserId == userId && ur.RoleId == roleId, cancellationToken);
+        return  Context.UserRoles.AnyAsync(ur => ur.UserId == userId && ur.RoleId == roleId, cancellationToken);
     }
 }
diff --git a/src/Infrastructure/Services/PaddleOCR/DocumentOcrJob.cs b/src/Infrastructure/Services/PaddleOCR/DocumentOcrJob.cs
index 12b33e611..9db7fc3b2 100644
--- a/src/Infrastructure/Services/PaddleOCR/DocumentOcrJob.cs
+++ b/src/Infrastructure/Services/PaddleOCR/DocumentOcrJob.cs
@@ -16,20 +16,17 @@ public class DocumentOcrJob : IDocumentOcrJob
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly ILogger<DocumentOcrJob> _logger;
     private readonly IApplicationHubWrapper _notificationService;
-    private readonly ISerializer _serializer;
     private readonly Stopwatch _timer;
 
     public DocumentOcrJob(
         IApplicationHubWrapper appNotificationService,
         IApplicationDbContext context,
         IHttpClientFactory httpClientFactory,
-        ISerializer serializer,
         ILogger<DocumentOcrJob> logger)
     {
         _notificationService = appNotificationService;
         _context = context;
         _httpClientFactory = httpClientFactory;
-        _serializer = serializer;
         _logger = logger;
         _timer = new Stopwatch();
     }
diff --git a/src/Infrastructure/Services/Serialization/SystemTextJsonSerializer.cs b/src/Infrastructure/Services/Serialization/SystemTextJsonSerializer.cs
deleted file mode 100644
index 52786b1d3..000000000
--- a/src/Infrastructure/Services/Serialization/SystemTextJsonSerializer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Text.Json;
-using CleanArchitecture.Blazor.Application.Common.Interfaces.Serialization;
-
-namespace CleanArchitecture.Blazor.Infrastructure.Services.Serialization;
-
-internal sealed class SystemTextJsonSerializer : ISerializer
-{
-    public string Serialize<T>(T value) where T : class
-    {
-        return JsonSerializer.Serialize(value, DefaultJsonSerializerOptions.Options);
-    }
-
-    public T? Deserialize<T>(string value) where T : class
-    {
-        return JsonSerializer.Deserialize<T>(value, DefaultJsonSerializerOptions.Options);
-    }
-
-    public byte[] SerializeBytes<T>(T value) where T : class
-    {
-        return JsonSerializer.SerializeToUtf8Bytes(value, DefaultJsonSerializerOptions.Options);
-    }
-
-    public T? DeserializeBytes<T>(byte[] value) where T : class
-    {
-        return JsonSerializer.Deserialize<T>(value, DefaultJsonSerializerOptions.Options);
-    }
-}
\ No newline at end of file
diff --git a/src/Server.UI/Components/Breadcrumbs/Breadcrumbs.razor b/src/Server.UI/Components/Breadcrumbs/Breadcrumbs.razor
index 2938c944c..26eebd19b 100644
--- a/src/Server.UI/Components/Breadcrumbs/Breadcrumbs.razor
+++ b/src/Server.UI/Components/Breadcrumbs/Breadcrumbs.razor
@@ -8,11 +8,11 @@
 
         @if (OnSaveButtonClick.HasDelegate)
         {
-            <MudLoadingButton StartIcon="@Icons.Material.Filled.Save" Color="Color.Primary" DropShadow="false" Loading="@Saving"  OnClick="@Save">@ConstantString.Save</MudLoadingButton>
+            <MudLoadingButton Loading="@Saving"  OnClick="@Save">@ConstantString.Save</MudLoadingButton>
         }
         @if (OnGoEditClick.HasDelegate)
         {
-            <MudButton StartIcon="@Icons.Material.Filled.Edit" Color="Color.Primary" OnClick="@GoEdit">@ConstantString.Edit</MudButton>
+            <MudButton OnClick="@GoEdit">@ConstantString.Edit</MudButton>
         }
         @if (OnDeleteClick.HasDelegate || OnPrintClick.HasDelegate)
         {
diff --git a/src/Server.UI/Pages/Contacts/CreateContact.razor b/src/Server.UI/Pages/Contacts/CreateContact.razor
index 84f5e4dc7..70c6292c6 100644
--- a/src/Server.UI/Pages/Contacts/CreateContact.razor
+++ b/src/Server.UI/Pages/Contacts/CreateContact.razor
@@ -37,7 +37,7 @@
         </MudForm>
         </MudCardContent>
          <MudCardActions Class="d-flex justify-end gap-2">
-                    <MudLoadingButton Color="Color.Primary" DropShadow="false" Loading="@_saving" OnClick="Submit">@ConstantString.Save</MudLoadingButton>
+                    <MudLoadingButton  Loading="@_saving" OnClick="Submit">@ConstantString.Save</MudLoadingButton>
          </MudCardActions>
         </MudCard>
 </MudContainer>
diff --git a/src/Server.UI/Pages/Contacts/EditContact.razor b/src/Server.UI/Pages/Contacts/EditContact.razor
index 6a52b1987..4832ac2d2 100644
--- a/src/Server.UI/Pages/Contacts/EditContact.razor
+++ b/src/Server.UI/Pages/Contacts/EditContact.razor
@@ -43,7 +43,7 @@
         </MudForm>
         </MudCardContent>
         <MudCardActions Class="d-flex justify-end gap-2">
-                    <MudLoadingButton Color="Color.Primary" DropShadow="false" Loading="@_saving" OnClick="Submit">@ConstantString.Save</MudLoadingButton>
+                    <MudLoadingButton Loading="@_saving" OnClick="Submit">@ConstantString.Save</MudLoadingButton>
         </MudCardActions>
         </MudCard>
     }
diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj
index bdd68f33e..e236193f2 100644
--- a/src/Server.UI/Server.UI.csproj
+++ b/src/Server.UI/Server.UI.csproj
@@ -22,7 +22,7 @@
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
         <PackageReference Include="MudBlazor" Version="8.2.0" />
         <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.0" />
-        <PackageReference Include="Blazor-ApexCharts" Version="5.0.1" />
+        <PackageReference Include="Blazor-ApexCharts" Version="5.1.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj
index 99b09d905..c6912e725 100644
--- a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj
+++ b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj
@@ -23,11 +23,11 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="nunit" Version="4.3.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0-beta.5">
+        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="8.0.0-rc.2" />
+        <PackageReference Include="FluentAssertions" Version="8.0.1" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="Respawn" Version="6.2.1" />
     </ItemGroup>
diff --git a/tests/Application.UnitTests/Application.UnitTests.csproj b/tests/Application.UnitTests/Application.UnitTests.csproj
index 842c4d9b4..144e84672 100644
--- a/tests/Application.UnitTests/Application.UnitTests.csproj
+++ b/tests/Application.UnitTests/Application.UnitTests.csproj
@@ -13,11 +13,11 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="nunit" Version="4.3.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0-beta.5">
+        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="8.0.0-rc.2" />
+        <PackageReference Include="FluentAssertions" Version="8.0.1" />
         <PackageReference Include="Moq" Version="4.20.72" />
     </ItemGroup>
 
diff --git a/tests/Domain.UnitTests/Domain.UnitTests.csproj b/tests/Domain.UnitTests/Domain.UnitTests.csproj
index 2e8554d71..fd18a937f 100644
--- a/tests/Domain.UnitTests/Domain.UnitTests.csproj
+++ b/tests/Domain.UnitTests/Domain.UnitTests.csproj
@@ -14,11 +14,11 @@
 
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="nunit" Version="4.3.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0-beta.5">
+        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="8.0.0-rc.2" />
+        <PackageReference Include="FluentAssertions" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>

From 10c2bf7ccf788e873bd320d270eeae6d8e5750fb Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Sun, 9 Feb 2025 19:24:01 +0800
Subject: [PATCH 10/13] refactor UploadService

---
 src/Application/Application.csproj            |  2 +-
 .../Common/Interfaces/IUploadService.cs       |  4 +
 src/Infrastructure/Services/UploadService.cs  | 40 +++++++++
 .../Identity/Users/Components/UserForm.razor  | 44 ++++-----
 .../Pages/Identity/Users/Profile.razor        | 90 +++++++++----------
 .../Components/ProductFormDialog.razor        | 23 ++---
 src/Server.UI/Server.UI.csproj                |  1 -
 7 files changed, 108 insertions(+), 96 deletions(-)

diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
index 527a98dbf..d2118b662 100644
--- a/src/Application/Application.csproj
+++ b/src/Application/Application.csproj
@@ -8,7 +8,7 @@
         <LangVersion>default</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-   
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
         <PackageReference Include="Ardalis.Specification" Version="8.0.0" />
         <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0" />
         <PackageReference Include="ClosedXML" Version="0.105.0-rc" />
diff --git a/src/Application/Common/Interfaces/IUploadService.cs b/src/Application/Common/Interfaces/IUploadService.cs
index 0b8bc0584..7ca6e99f4 100644
--- a/src/Application/Common/Interfaces/IUploadService.cs
+++ b/src/Application/Common/Interfaces/IUploadService.cs
@@ -1,10 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using SixLabors.ImageSharp.Processing;
+
 namespace CleanArchitecture.Blazor.Application.Common.Interfaces;
 
 public interface IUploadService
 {
     Task<string> UploadAsync(UploadRequest request);
     void Remove(string filename);
+
+    Task<string> UploadImageAsync(Stream imageStream,  UploadType uploadType, ResizeOptions? resizeOptions = null, string? fileName=null);
 }
\ No newline at end of file
diff --git a/src/Infrastructure/Services/UploadService.cs b/src/Infrastructure/Services/UploadService.cs
index bce8d668b..27dadc1df 100644
--- a/src/Infrastructure/Services/UploadService.cs
+++ b/src/Infrastructure/Services/UploadService.cs
@@ -2,6 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using CleanArchitecture.Blazor.Application.Common.Extensions;
+using CleanArchitecture.Blazor.Domain.Common.Enums;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Processing;
 
 namespace CleanArchitecture.Blazor.Infrastructure.Services;
 
@@ -63,6 +67,42 @@ public void Remove(string filename)
         }
     }
     /// <summary>
+    /// Uploads and processes an image.
+    /// </summary>
+    /// <param name="imageStream">The image stream.</param>
+    /// <param name="fileName">The file name.</param>
+    /// <param name="uploadType">The upload type.</param>
+    /// <param name="resizeOptions">The resize options (optional).</param>
+    /// <returns>The path of the uploaded image.</returns>
+    public async Task<string> UploadImageAsync(Stream imageStream, UploadType uploadType, ResizeOptions? resizeOptions = null, string? fileName=null)
+    {
+        var attachStream = new MemoryStream();
+        await imageStream.CopyToAsync(attachStream);
+        attachStream.Position = 0;
+
+        using (var outStream = new MemoryStream())
+        {
+            using (var image = Image.Load(attachStream))
+            {
+                // Apply resize if resize options are provided
+                if (resizeOptions != null)
+                {
+                    image.Mutate(i => i.Resize(resizeOptions));
+                }
+
+                image.Save(outStream, PngFormat.Instance);
+                var result = await UploadAsync(new UploadRequest(
+                
+                    fileName: fileName ?? $"{Guid.NewGuid()}_{DateTime.UtcNow.Ticks}.png",
+                    uploadType: uploadType,
+                    data: outStream.ToArray(),
+                    overwrite: true
+                ));
+                return result;
+            }
+        }
+    }
+    /// <summary>
     /// Gets the next available filename based on the given path.
     /// </summary>
     /// <param name="path">The path to check for availability.</param>
diff --git a/src/Server.UI/Pages/Identity/Users/Components/UserForm.razor b/src/Server.UI/Pages/Identity/Users/Components/UserForm.razor
index 443e11313..e629a2467 100644
--- a/src/Server.UI/Pages/Identity/Users/Components/UserForm.razor
+++ b/src/Server.UI/Pages/Identity/Users/Components/UserForm.razor
@@ -17,7 +17,7 @@
 
 <MudForm Model="@Model" @ref="@_form" Validation="@(Validator.ValidateValue(Model))">
     <input For="@(() => Model.Id)" @bind-value="Model.Id" type="hidden" @bind-value:event="oninput" />
-    <input For="@(() => Model.ProfilePictureDataUrl)" @bind-value="Model.ProfilePictureDataUrl" type="hidden" @bind-value:event="oninput"/>
+    <input For="@(() => Model.ProfilePictureDataUrl)" @bind-value="Model.ProfilePictureDataUrl" type="hidden" @bind-value:event="oninput" />
 
     <MudGrid Spacing="2">
         <MudItem sm="12">
@@ -55,11 +55,11 @@
             </MultiTenantAutocomplete>
         </MudItem>
         <MudItem xs="12" sm="6">
-            <MudTextField For="@(() => Model.Provider)" @bind-Value="Model.Provider" Label="@L[Model.GetMemberDescription(x=>x.Provider)]"  ReadOnly="true"></MudTextField>
+            <MudTextField For="@(() => Model.Provider)" @bind-Value="Model.Provider" Label="@L[Model.GetMemberDescription(x=>x.Provider)]" ReadOnly="true"></MudTextField>
         </MudItem>
 
         <MudItem xs="12" sm="6">
-            <MudTextField For="@(() => Model.UserName)" @bind-Value="Model.UserName" Label="@L[Model.GetMemberDescription(x=>x.UserName)]"  Required="true"></MudTextField>
+            <MudTextField For="@(() => Model.UserName)" @bind-Value="Model.UserName" Label="@L[Model.GetMemberDescription(x=>x.UserName)]" Required="true"></MudTextField>
         </MudItem>
         <MudItem xs="12" sm="6">
             <div class="d-fex">
@@ -67,7 +67,7 @@
             </div>
         </MudItem>
         <MudItem xs="12" sm="6">
-            <MudTextField For="@(() => Model.DisplayName)" @bind-Value="Model.DisplayName" Label="@L[Model.GetMemberDescription(x=>x.DisplayName)]" ></MudTextField>
+            <MudTextField For="@(() => Model.DisplayName)" @bind-Value="Model.DisplayName" Label="@L[Model.GetMemberDescription(x=>x.DisplayName)]"></MudTextField>
         </MudItem>
         <MudItem xs="12" sm="6">
             <PickSuperiorIdAutocomplete For="@(() => Model.Superior)" T="ApplicationUserDto"
@@ -79,16 +79,16 @@
             </PickSuperiorIdAutocomplete>
         </MudItem>
         <MudItem xs="12" sm="6">
-            <MudTextField For="@(() => Model.Email)" @bind-Value="Model.Email" Label="@L[Model.GetMemberDescription(x=>x.Email)]"  Required="true"></MudTextField>
+            <MudTextField For="@(() => Model.Email)" @bind-Value="Model.Email" Label="@L[Model.GetMemberDescription(x=>x.Email)]" Required="true"></MudTextField>
         </MudItem>
         <MudItem xs="12" sm="6">
-            <MudTextField For="@(() => Model.PhoneNumber)" @bind-Value="Model.PhoneNumber" Label="@L[Model.GetMemberDescription(x=>x.PhoneNumber)]" ></MudTextField>
+            <MudTextField For="@(() => Model.PhoneNumber)" @bind-Value="Model.PhoneNumber" Label="@L[Model.GetMemberDescription(x=>x.PhoneNumber)]"></MudTextField>
         </MudItem>
         <MudItem sm="6" xs="12">
-            <TimeZoneAutocomplete T="string" For="@(() => Model.TimeZoneId)"  @bind-Value="Model.TimeZoneId" Label="@L[Model.GetMemberDescription(x=>x.TimeZoneId)]" ></TimeZoneAutocomplete>
+            <TimeZoneAutocomplete T="string" For="@(() => Model.TimeZoneId)" @bind-Value="Model.TimeZoneId" Label="@L[Model.GetMemberDescription(x=>x.TimeZoneId)]"></TimeZoneAutocomplete>
         </MudItem>
         <MudItem sm="6" xs="12">
-            <LanguageAutocomplete T="string" For="@(() => Model.LanguageCode)"  @bind-Value="Model.LanguageCode" Label="@L[Model.GetMemberDescription(x=>x.LanguageCode)]" ></LanguageAutocomplete>
+            <LanguageAutocomplete T="string" For="@(() => Model.LanguageCode)" @bind-Value="Model.LanguageCode" Label="@L[Model.GetMemberDescription(x=>x.LanguageCode)]"></LanguageAutocomplete>
         </MudItem>
 
 
@@ -114,16 +114,16 @@
             </MudGrid>
         </MudItem>
         <MudItem sm="6" xs="12">
-            <MudTextField For="@(() => Model.CreatedBy)" Disabled  Value="Model.CreatedByUser?.UserName" Label="@L[Model.GetMemberDescription(x=>x.CreatedBy)]" ></MudTextField>
+            <MudTextField For="@(() => Model.CreatedBy)" Disabled Value="Model.CreatedByUser?.UserName" Label="@L[Model.GetMemberDescription(x=>x.CreatedBy)]"></MudTextField>
         </MudItem>
         <MudItem sm="6" xs="12">
-            <MudTextField T="string" Disabled  Value="@(Model.Created.ToLocalTime(UserProfile?.LocalTimeOffset))" Label="@L[Model.GetMemberDescription(x=>x.Created)]" ></MudTextField>
+            <MudTextField T="string" Disabled Value="@(Model.Created.ToLocalTime(UserProfile?.LocalTimeOffset))" Label="@L[Model.GetMemberDescription(x=>x.Created)]"></MudTextField>
         </MudItem>
         <MudItem sm="6" xs="12">
-            <MudTextField For="@(() => Model.LastModifiedBy)" Disabled  Value="Model.LastModifiedByUser?.UserName" Label="@L[Model.GetMemberDescription(x=>x.LastModifiedBy)]" ></MudTextField>
+            <MudTextField For="@(() => Model.LastModifiedBy)" Disabled Value="Model.LastModifiedByUser?.UserName" Label="@L[Model.GetMemberDescription(x=>x.LastModifiedBy)]"></MudTextField>
         </MudItem>
         <MudItem sm="6" xs="12">
-            <MudTextField T="string" Disabled  Value="@(Model.LastModified.ToLocalTime(UserProfile?.LocalTimeOffset))" Label="@L[Model.GetMemberDescription(x=>x.LastModified)]" ></MudTextField>
+            <MudTextField T="string" Disabled Value="@(Model.LastModified.ToLocalTime(UserProfile?.LocalTimeOffset))" Label="@L[Model.GetMemberDescription(x=>x.LastModified)]"></MudTextField>
         </MudItem>
     </MudGrid>
 </MudForm>
@@ -178,23 +178,9 @@
         var imgStream = new MemoryStream();
         await filestream.CopyToAsync(imgStream);
         imgStream.Position = 0;
-        using (var outStream = new MemoryStream())
-        {
-            using (var image = Image.Load(imgStream))
-            {
-                image.Mutate(
-                    i => i.Resize(new ResizeOptions { Mode = ResizeMode.Crop, Size = new Size(128, 128) }));
-                image.Save(outStream, PngFormat.Instance);
-                var filename = file.Name;
-                var fi = new FileInfo(filename);
-                var ext = fi.Extension;
-                var result = await UploadService.UploadAsync(new UploadRequest($"{Model.Id}_{DateTime.UtcNow.Ticks}.png", UploadType.ProfilePicture, outStream.ToArray()));
-                Model.ProfilePictureDataUrl = result;
-
-                //Do your validations here
-                Snackbar.Add(ConstantString.UploadSuccess, Severity.Info);
-            }
-        }
+        var result = await UploadService.UploadImageAsync(imgStream, UploadType.ProfilePicture, new ResizeOptions { Mode = ResizeMode.Crop, Size = new Size(128, 128) });
+        Model.ProfilePictureDataUrl = result;
+        Snackbar.Add(ConstantString.UploadSuccess, Severity.Info);
     }
 
     public async Task Submit()
diff --git a/src/Server.UI/Pages/Identity/Users/Profile.razor b/src/Server.UI/Pages/Identity/Users/Profile.razor
index b38f6717d..4f8a91dcf 100644
--- a/src/Server.UI/Pages/Identity/Users/Profile.razor
+++ b/src/Server.UI/Pages/Identity/Users/Profile.razor
@@ -68,31 +68,31 @@ else
                         </div>
                     </MudItem>
                     <MudItem sm="6" xs="12">
-                        <MudTextField For="@(() => model.TenantName)"  @bind-Value="model.TenantName" Label="@L["Tenant Name"]"  ReadOnly="true"></MudTextField>
+                        <MudTextField For="@(() => model.TenantName)" @bind-Value="model.TenantName" Label="@L["Tenant Name"]" ReadOnly="true"></MudTextField>
                     </MudItem>
                     <MudItem xs="12" sm="6">
-                        <MudTextField For="@(() => model.SuperiorName)"  @bind-Value="model.SuperiorName" Label="@L["Superior Name"]"  ReadOnly="true"></MudTextField>
+                        <MudTextField For="@(() => model.SuperiorName)" @bind-Value="model.SuperiorName" Label="@L["Superior Name"]" ReadOnly="true"></MudTextField>
                     </MudItem>
                     <MudItem sm="6" xs="12">
-                        <MudTextField For="@(() => model.UserName)"  @bind-Value="model.UserName" Label="@L["User Name"]"  ReadOnly="true"></MudTextField>
+                        <MudTextField For="@(() => model.UserName)" @bind-Value="model.UserName" Label="@L["User Name"]" ReadOnly="true"></MudTextField>
                     </MudItem>
                     <MudItem sm="6" xs="12">
-                        <MudTextField For="@(() => model.Email)"  @bind-Value="model.Email" Label="@L["Email"]"  ReadOnly="true"></MudTextField>
+                        <MudTextField For="@(() => model.Email)" @bind-Value="model.Email" Label="@L["Email"]" ReadOnly="true"></MudTextField>
                     </MudItem>
                     <MudItem sm="6" xs="12">
-                        <MudTextField For="@(() => model.DisplayName)"  @bind-Value="model.DisplayName" Label="@L["Full Name"]" ></MudTextField>
+                        <MudTextField For="@(() => model.DisplayName)" @bind-Value="model.DisplayName" Label="@L["Full Name"]"></MudTextField>
                     </MudItem>
                     <MudItem sm="6" xs="12">
-                        <MudTextField For="@(() => model.PhoneNumber)"  @bind-Value="model.PhoneNumber" Label="@L["Phone Number"]" ></MudTextField>
+                        <MudTextField For="@(() => model.PhoneNumber)" @bind-Value="model.PhoneNumber" Label="@L["Phone Number"]"></MudTextField>
                     </MudItem>
                     <MudItem sm="6" xs="12">
-                        <TimeZoneAutocomplete T="string" For="@(() => model.TimeZoneId)"  @bind-Value="model.TimeZoneId" Label="@L["Time Zone"]" ></TimeZoneAutocomplete>
+                        <TimeZoneAutocomplete T="string" For="@(() => model.TimeZoneId)" @bind-Value="model.TimeZoneId" Label="@L["Time Zone"]"></TimeZoneAutocomplete>
                     </MudItem>
                     <MudItem sm="6" xs="12">
-                        <LanguageAutocomplete T="string" For="@(() => model.LanguageCode)"  @bind-Value="model.LanguageCode" Label="@L["Language"]" ></LanguageAutocomplete>
+                        <LanguageAutocomplete T="string" For="@(() => model.LanguageCode)" @bind-Value="model.LanguageCode" Label="@L["Language"]"></LanguageAutocomplete>
                     </MudItem>
                     <MudItem sm="12" xs="12" Class="d-flex justify-end">
-                        <MudButton ButtonType="ButtonType.Button" Disabled="@_submitting"  Color="Color.Primary" Class="ml-auto" OnClick="@(async () => await Submit())">
+                        <MudButton ButtonType="ButtonType.Button" Disabled="@_submitting" Color="Color.Primary" Class="ml-auto" OnClick="@(async () => await Submit())">
                             @if (_submitting)
                             {
                                 <MudProgressCircular Class="ms-n1" Size="MudBlazor.Size.Small" Indeterminate="true" />
@@ -113,29 +113,26 @@ else
                     <MudItem sm="12" xs="12">
                         <MudTextField InputType="InputType.Password"
                                       Label="@L["Current Password"]"
-                                          For="@(() => _changepassword.CurrentPassword)"
-                                          @bind-Value="_changepassword.CurrentPassword"
-                                          
-                                          Required="true" />
+                                      For="@(() => _changepassword.CurrentPassword)"
+                                      @bind-Value="_changepassword.CurrentPassword"
+                                      Required="true" />
                     </MudItem>
                     <MudItem xs="12">
                         <MudTextField InputType="InputType.Password"
-                                          Label="@L["New Password"]"
-                                          For="@(() => _changepassword.NewPassword)"
-                                          @bind-Value="_changepassword.NewPassword"
-                                          
-                                          Required="true" />
+                                      Label="@L["New Password"]"
+                                      For="@(() => _changepassword.NewPassword)"
+                                      @bind-Value="_changepassword.NewPassword"
+                                      Required="true" />
                     </MudItem>
                     <MudItem xs="12">
                         <MudTextField InputType="InputType.Password"
-                                          Label="@L["Confirm New Password"]"
-                                          For="@(() => _changepassword.ConfirmPassword)"
-                                          @bind-Value="_changepassword.ConfirmPassword"
-                                          
-                                          Required="true" />
+                                      Label="@L["Confirm New Password"]"
+                                      For="@(() => _changepassword.ConfirmPassword)"
+                                      @bind-Value="_changepassword.ConfirmPassword"
+                                      Required="true" />
                     </MudItem>
                     <MudItem sm="12" xs="12" Class="d-flex justify-end">
-                        <MudButton ButtonType="ButtonType.Button"  Color="Color.Primary" Class="ml-auto" OnClick="@(async () => await ChangePassword())">
+                        <MudButton ButtonType="ButtonType.Button" Color="Color.Primary" Class="ml-auto" OnClick="@(async () => await ChangePassword())">
                             @if (_submitting)
                             {
                                 <MudProgressCircular Class="ms-n1" Size="MudBlazor.Size.Small" Indeterminate="true" />
@@ -219,8 +216,8 @@ else
     {
         UserManager = Services.GetRequiredService<UserManager<ApplicationUser>>();
         var state = await AuthState;
-        _currentUserName = state.User.Identity?.Name??string.Empty;
-        await UserProfileStateService.InitializeAsync(state.User.Identity?.Name??string.Empty);
+        _currentUserName = state.User.Identity?.Name ?? string.Empty;
+        await UserProfileStateService.InitializeAsync(state.User.Identity?.Name ?? string.Empty);
         model = UserProfileMapper.ToChangeUserProfileModel(UserProfileStateService.UserProfile);
     }
 
@@ -237,25 +234,20 @@ else
         var imgstream = new MemoryStream();
         await filestream.CopyToAsync(imgstream);
         imgstream.Position = 0;
-        using (var outStream = new MemoryStream())
-        {
-            using (var image = Image.Load(imgstream))
-            {
-                var user = await UserManager.FindByNameAsync(model.UserName) ?? throw new NotFoundException($"The application user [{model.UserName}] was not found.");
-                image.Mutate(i => i.Resize(new ResizeOptions { Mode = ResizeMode.Crop, Size = new Size(128, 128) }));
-                image.Save(outStream, PngFormat.Instance);
-                var result = await UploadService.UploadAsync(new UploadRequest($"{user.Id}_{DateTime.UtcNow.Ticks}.png", UploadType.ProfilePicture, outStream.ToArray(), true));
-                model.ProfilePictureDataUrl = result;
-                user.ProfilePictureDataUrl = model.ProfilePictureDataUrl;
-                await UserManager.UpdateAsync(user);
-                Snackbar.Add(L["The avatar has been updated"], Severity.Info);
-                UserProfileStateService.UpdateUserProfile(user.UserName!,user.ProfilePictureDataUrl, user.DisplayName, user.PhoneNumber,user.TimeZoneId, user.LanguageCode);
-                await OnlineUserTracker.Update(user.Id,
-                                               user.UserName??"",
-                                               user.DisplayName ?? "",
-                                               user.ProfilePictureDataUrl);
-            }
-        }
+
+        var user = await UserManager.FindByNameAsync(model.UserName) ?? throw new NotFoundException($"The application user [{model.UserName}] was not found.");
+        var result = await UploadService.UploadImageAsync(imgstream, UploadType.ProfilePicture, new ResizeOptions { Mode = ResizeMode.Crop, Size = new Size(128, 128) });
+
+        model.ProfilePictureDataUrl = result;
+        user.ProfilePictureDataUrl = model.ProfilePictureDataUrl;
+        await UserManager.UpdateAsync(user);
+        Snackbar.Add(L["The avatar has been updated"], Severity.Info);
+        UserProfileStateService.UpdateUserProfile(user.UserName!, user.ProfilePictureDataUrl, user.DisplayName, user.PhoneNumber, user.TimeZoneId, user.LanguageCode);
+        await OnlineUserTracker.Update(user.Id,
+                                       user.UserName ?? "",
+                                       user.DisplayName ?? "",
+                                       user.ProfilePictureDataUrl);
+
     }
 
     private async Task Submit()
@@ -266,7 +258,7 @@ else
             await _form!.Validate();
             if (_form.IsValid)
             {
-           
+
                 var user = await UserManager.FindByNameAsync(_currentUserName) ?? throw new NotFoundException($"The application user [{_currentUserName}] was not found.");
                 user.PhoneNumber = model.PhoneNumber;
                 user.DisplayName = model.DisplayName;
@@ -274,13 +266,13 @@ else
                 user.LanguageCode = model.LanguageCode;
                 user.ProfilePictureDataUrl = model.ProfilePictureDataUrl;
                 await UserManager.UpdateAsync(user);
-                UserProfileStateService.UpdateUserProfile(user.UserName!,user.ProfilePictureDataUrl, user.DisplayName, user.PhoneNumber,user.TimeZoneId, user.LanguageCode);
+                UserProfileStateService.UpdateUserProfile(user.UserName!, user.ProfilePictureDataUrl, user.DisplayName, user.PhoneNumber, user.TimeZoneId, user.LanguageCode);
                 await OnlineUserTracker.Update(user.Id,
                                                user.UserName ?? "",
                                                user.DisplayName ?? "",
-                                               user.ProfilePictureDataUrl??"");
+                                               user.ProfilePictureDataUrl ?? "");
                 Snackbar.Add($"{ConstantString.SaveSuccess}", Severity.Info);
-              
+
             }
         }
         finally
diff --git a/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor b/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor
index 5a9f697df..f2e2ef257 100644
--- a/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor
+++ b/src/Server.UI/Pages/Products/Components/ProductFormDialog.razor
@@ -184,17 +184,8 @@
                     }
                     else
                     {
-                        using (var outStream = new MemoryStream())
-                        {
-                            using (var image = Image.Load(attachStream))
-                            {
-                                image.Mutate(
-                                    i => i.Resize(new ResizeOptions { Mode = ResizeMode.Crop, Size = new Size(640, 320) }));
-                                image.Save(outStream, PngFormat.Instance);
-                                var result = await UploadService.UploadAsync(new UploadRequest(Guid.NewGuid() + ext, UploadType.Product, outStream.ToArray()));
-                                list.Add(new ProductImage { Name = filename, Size = outStream.Length, Url = result });
-                            }
-                        }
+                        var result = await UploadService.UploadImageAsync(attachStream, UploadType.Product, new ResizeOptions { Mode = ResizeMode.Crop, Size = new Size(640, 320) });
+                        list.Add(new ProductImage { Name = filename, Size = attachStream.Length, Url = result });
                     }
                 }
                 catch (Exception ex)
@@ -228,13 +219,13 @@
 
             var result = await Mediator.Send(Model);
             result.Match(
-            data=>
+            data =>
             {
                 MudDialog.Close(DialogResult.Ok(true));
                 Snackbar.Add(ConstantString.SaveSuccess, Severity.Info);
                 return data;
             },
-            errors=>
+            errors =>
             {
                 Snackbar.Add(errors, Severity.Error);
                 return 0;
@@ -256,14 +247,14 @@
                 return;
             var result = await Mediator.Send(Model);
             result.Match(
-            data=>
+            data =>
             {
                 Snackbar.Add(ConstantString.SaveSuccess, Severity.Info);
                 Refresh?.Invoke();
                 Model = new AddEditProductCommand();
                 return data;
             },
-            errors=>
+            errors =>
             {
                 Snackbar.Add(result.ErrorMessage, Severity.Error);
                 return 0;
@@ -282,6 +273,6 @@
     private async Task OnDownloadFile(string? str)
     {
         var fileURL = str;
-        await new Fancybox(JS).Preview(str??string.Empty, []);
+        await new Fancybox(JS).Preview(str ?? string.Empty, []);
     }
 }
\ No newline at end of file
diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj
index e236193f2..2cda6b17f 100644
--- a/src/Server.UI/Server.UI.csproj
+++ b/src/Server.UI/Server.UI.csproj
@@ -18,7 +18,6 @@
         <PackageReference Include="Hangfire.AspNetCore" Version="1.8.17" />
         <PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
         <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
         <PackageReference Include="MudBlazor" Version="8.2.0" />
         <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.0" />

From 1dcabf93fd31652ab65c737dd624f35106206250 Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Sat, 15 Feb 2025 12:33:08 +0800
Subject: [PATCH 11/13] update nuget lib

---
 src/Application/Application.csproj             | 10 +++++-----
 src/Domain/Domain.csproj                       | 18 +++++++++---------
 src/Infrastructure/Infrastructure.csproj       |  8 ++++----
 src/Server.UI/DependencyInjection.cs           |  2 +-
 src/Server.UI/Server.UI.csproj                 |  4 ++--
 .../Application.IntegrationTests.csproj        |  2 +-
 .../Application.UnitTests.csproj               |  2 +-
 tests/Domain.UnitTests/Domain.UnitTests.csproj |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
index d2118b662..12fff8327 100644
--- a/src/Application/Application.csproj
+++ b/src/Application/Application.csproj
@@ -17,15 +17,15 @@
         <PackageReference Include="jcamp.FluentEmail.Razor" Version="3.8.0" />
         <PackageReference Include="FluentValidation" Version="12.0.0-preview1" />
         <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0-preview1" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Riok.Mapperly" Version="4.2.0-next.0" />
         <PackageReference Include="Hangfire.Core" Version="1.8.17" />
         <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.1.0" />
-           <PackageReference Include="ActualLab.Fusion" Version="9.8.26" />
-        <PackageReference Include="ActualLab.Fusion.Blazor" Version="9.8.26" />
-        <PackageReference Include="ActualLab.Generators" Version="9.8.26">
+           <PackageReference Include="ActualLab.Fusion" Version="9.8.35" />
+        <PackageReference Include="ActualLab.Fusion.Blazor" Version="9.8.35" />
+        <PackageReference Include="ActualLab.Generators" Version="9.8.35">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Domain/Domain.csproj b/src/Domain/Domain.csproj
index 8944a402c..cb37cdf35 100644
--- a/src/Domain/Domain.csproj
+++ b/src/Domain/Domain.csproj
@@ -11,23 +11,23 @@
 
     <ItemGroup>
         <PackageReference Include="MediatR" Version="12.4.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.2" />
         <PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="8.1.3" />
         <PackageReference Include="EntityFrameworkCore.Exceptions.Sqlite" Version="8.1.3" />
         <PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" Version="8.1.3" />
-        <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.2" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.2" />
         <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
+        <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
index a7aee4fe5..a0e536684 100644
--- a/src/Infrastructure/Infrastructure.csproj
+++ b/src/Infrastructure/Infrastructure.csproj
@@ -8,10 +8,10 @@
         <LangVersion>default</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.1" />
-        <PackageReference Include="QuestPDF" Version="2025.1.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.2" />
+        <PackageReference Include="QuestPDF" Version="2025.1.2" />
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="8.1.1-dev-00120" />
         <PackageReference Include="Serilog.Sinks.Postgresql.Alternative" Version="4.1.3" />
diff --git a/src/Server.UI/DependencyInjection.cs b/src/Server.UI/DependencyInjection.cs
index e2ecffd92..45ed80f90 100644
--- a/src/Server.UI/DependencyInjection.cs
+++ b/src/Server.UI/DependencyInjection.cs
@@ -92,7 +92,7 @@ public static IServiceCollection AddServerUI(this IServiceCollection services, I
 
         services.AddHttpClient("ocr", c =>
         {
-            c.BaseAddress = new Uri("http://10.33.1.150:8000/ocr/predict-by-file");
+            c.BaseAddress = new Uri("https://paddleocr.blazors.app:8443/ocr/predict-by-file");
             c.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
         });
         services.AddScoped<LocalTimeOffset>();
diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj
index 2cda6b17f..a78c197f5 100644
--- a/src/Server.UI/Server.UI.csproj
+++ b/src/Server.UI/Server.UI.csproj
@@ -18,11 +18,11 @@
         <PackageReference Include="Hangfire.AspNetCore" Version="1.8.17" />
         <PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
         <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.2" />
         <PackageReference Include="MudBlazor" Version="8.2.0" />
         <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.0" />
         <PackageReference Include="Blazor-ApexCharts" Version="5.1.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj
index c6912e725..8f7802294 100644
--- a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj
+++ b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj
@@ -21,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="nunit" Version="4.3.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Application.UnitTests/Application.UnitTests.csproj b/tests/Application.UnitTests/Application.UnitTests.csproj
index 144e84672..d8c1f5531 100644
--- a/tests/Application.UnitTests/Application.UnitTests.csproj
+++ b/tests/Application.UnitTests/Application.UnitTests.csproj
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="nunit" Version="4.3.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Domain.UnitTests/Domain.UnitTests.csproj b/tests/Domain.UnitTests/Domain.UnitTests.csproj
index fd18a937f..e3fe1fe7e 100644
--- a/tests/Domain.UnitTests/Domain.UnitTests.csproj
+++ b/tests/Domain.UnitTests/Domain.UnitTests.csproj
@@ -12,7 +12,7 @@
 
     <ItemGroup>
 
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="nunit" Version="4.3.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
             <PrivateAssets>all</PrivateAssets>

From 540140507fe48cd6b67a1f28110cbd4c77e0cefa Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Sat, 15 Feb 2025 19:16:50 +0800
Subject: [PATCH 12/13] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc376df3c..5efff6967 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ This repository hosts a Blazor Server application designed using Clean Architect
 ## Explore the Live Demo
 
 Experience the application in action in Blazor Server mode by visiting:
-
+- Home Server: [cleanserver.blazors.app:8443](https://cleanserver.blazors.app:8443/)
 - MS SQL Database: [architecture.blazorserver.com](https://architecture.blazorserver.com/)
 
 - PostgreSQL Database: [architecture.blazors.app](https://architecture.blazors.app/)

From 3da977f302bdc8deda1ac6d83c4de431bac4ec05 Mon Sep 17 00:00:00 2001
From: "hualin.zhu" <neo.js.cn@gmail.com>
Date: Wed, 19 Feb 2025 20:08:40 +0800
Subject: [PATCH 13/13] commit

---
 src/Application/Application.csproj | 8 ++++----
 src/Server.UI/Server.UI.csproj     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
index 12fff8327..76d6ba829 100644
--- a/src/Application/Application.csproj
+++ b/src/Application/Application.csproj
@@ -21,11 +21,11 @@
         <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Riok.Mapperly" Version="4.2.0-next.0" />
-        <PackageReference Include="Hangfire.Core" Version="1.8.17" />
+        <PackageReference Include="Hangfire.Core" Version="1.8.18" />
         <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.1.0" />
-           <PackageReference Include="ActualLab.Fusion" Version="9.8.35" />
-        <PackageReference Include="ActualLab.Fusion.Blazor" Version="9.8.35" />
-        <PackageReference Include="ActualLab.Generators" Version="9.8.35">
+           <PackageReference Include="ActualLab.Fusion" Version="9.8.37" />
+        <PackageReference Include="ActualLab.Fusion.Blazor" Version="9.8.37" />
+        <PackageReference Include="ActualLab.Generators" Version="9.8.37">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj
index a78c197f5..4e73f1d44 100644
--- a/src/Server.UI/Server.UI.csproj
+++ b/src/Server.UI/Server.UI.csproj
@@ -15,7 +15,7 @@
         <LangVersion>default</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.17" />
+        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
         <PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
         <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.2" />