Merge remote-tracking branch 'origin/main' into fix/bug

masastack · May 9, 2024 · 0617fb4 · 0617fb4
2 parents eb17907 + 8fc7c24
commit 0617fb4
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 43 deletions.
diff --git a/src/Contracts/Masa.Auth.Contracts.Admin/Sso/Validator/AddUserClaimValidator.cs b/src/Contracts/Masa.Auth.Contracts.Admin/Sso/Validator/AddUserClaimValidator.cs
@@ -7,7 +7,7 @@ public class AddUserClaimValidator : AbstractValidator<AddUserClaimDto>
 {
     public AddUserClaimValidator()
     {
-        RuleFor(UserClaim => UserClaim.Name).Required().MinimumLength(2).MaximumLength(50);
+        RuleFor(UserClaim => UserClaim.Name).Required().MinimumLength(2).MaximumLength(100);
         RuleFor(UserClaim => UserClaim.Description).Required().MinimumLength(2).MaximumLength(255);
     }
 }

diff --git a/src/Contracts/Masa.Auth.Contracts.Admin/Sso/Validator/UpdateUserClaimValidator.cs b/src/Contracts/Masa.Auth.Contracts.Admin/Sso/Validator/UpdateUserClaimValidator.cs
@@ -7,7 +7,7 @@ public class UpdateUserClaimValidator : AbstractValidator<UpdateUserClaimDto>
 {
     public UpdateUserClaimValidator()
     {
-        RuleFor(UserClaim => UserClaim.Name).Required().MinimumLength(2).MaximumLength(50);
+        RuleFor(UserClaim => UserClaim.Name).Required().MinimumLength(2).MaximumLength(100);
         RuleFor(UserClaim => UserClaim.Description).Required().MinimumLength(2).MaximumLength(255);
     }
 }

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/Users/UserClaimsDialog.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/Users/UserClaimsDialog.razor
@@ -1,45 +1,62 @@
 @inherits AdminCompontentBase
-
-<SSimpleModal @bind-Value="_visible" Title="@T("Claim")" OnSave="Save" OnCancel="Cancel">
-    <MRow Class="py-4">
-        <MCol Md="6">
-            <SAutoComplete @bind-Value="@_claimKey" Required
-                     Label="@T("Type")"
-                     Items="@_claims"
-                     ItemText="u => u.Name"
-                     ItemValue="u => u.Name">
-            </SAutoComplete>
-        </MCol>
-        <MCol Md="6">
-            <STextField Label="@T("Value")" @bind-Value="@_claimValue" Required />
-        </MCol>
-        <MCol Md="12">
-            <SButton Block OnClick="AddClaim">
-                <SIcon Left>
-                    @IconConstants.Add
-                </SIcon>
-                @T("Add Claim")
-            </SButton>
-        </MCol>
-        @foreach (var _claimValue in _claimValues)
-        {
-            <MCol Md="12">
-                <STextField Value="@_claimValue.Value" ValueChanged="v=> ValueChanged(_claimValue.Key,v)" TValue="string" Class="claim-value">
-                    <PrependInnerContent>
-                        <span>
-                            @_claimValue.Key
-                        </span>
-                    </PrependInnerContent> 
-                    <AppendOuterContent>
-                        <MButton OnClick="()=>RemoveItem(_claimValue.Key)">
-                            <SIcon Color="error">@IconConstants.Remove</SIcon>
-                        </MButton>
-                    </AppendOuterContent>
-                </STextField>
-            </MCol>
-        }
-    </MRow>
-</SSimpleModal>
+<DefaultSheetDialog @bind-Value="_visible" Title="@T("Claim")">
+    <MForm>
+        <AutoHeight Overflow>
+            <AutoHeightContent>
+                <MRow Class="py-4">
+                    <MCol Md="6">
+                        <SAutoComplete @bind-Value="@_claimKey" Required
+                                       Label="@T("Type")"
+                                       Items="@_claims"
+                                       ItemText="@(u => $"{u.Name}({u.Description})")"
+                                       ItemValue="u => u.Name">
+                        </SAutoComplete>
+                    </MCol>
+                    <MCol Md="6">
+                        <STextField Label="@T("Value")" @bind-Value="@_claimValue" Required />
+                    </MCol>
+                    <MCol Md="12">
+                        <SButton Block OnClick="AddClaim">
+                            <SIcon Left>
+                                @IconConstants.Add
+                            </SIcon>
+                            @T("Add Claim")
+                        </SButton>
+                    </MCol>
+                    @foreach (var _claimValue in _claimValues)
+                    {
+                        <MCol Md="12">
+                            <STextField Value="@_claimValue.Value" ValueChanged="v=> ValueChanged(_claimValue.Key,v)" TValue="string" Class="claim-value">
+                                <PrependInnerContent>
+                                    <span>
+                                        @_claimValue.Key
+                                    </span>
+                                    @if (_claims.Any(x => x.Name == _claimValue.Key))
+                                    {
+                                        <span>
+                                            (@(_claims.Find(x => x.Name == _claimValue.Key)?.Description))
+                                        </span>
+                                    }
+                                </PrependInnerContent>
+                                <AppendOuterContent>
+                                    <MButton OnClick="()=>RemoveItem(_claimValue.Key)">
+                                        <SIcon Color="error">@IconConstants.Remove</SIcon>
+                                    </MButton>
+                                </AppendOuterContent>
+                            </STextField>
+                        </MCol>
+                    }
+                </MRow>
+            </AutoHeightContent>
+            <FooterContent>
+                <div class="d-flex mt-6">
+                    <MSpacer></MSpacer>
+                    <SButton Medium OnClick="Save">@T("Save")</SButton>
+                </div>
+            </FooterContent>
+        </AutoHeight>
+    </MForm>
+</DefaultSheetDialog>
 
 @code {