From 1c5501a34f3bf970749be903d5abe5b74ffa8997 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Mon, 29 Aug 2022 16:08:40 +0300 Subject: [PATCH 1/4] Add breadcrumbs to Identity --- .../Pages/Identity/RoleManagement.razor.cs | 7 +++++++ .../Pages/Identity/UserManagement.razor.cs | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs index 801b77c21d..a960c051ae 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs @@ -39,6 +39,13 @@ public partial class RoleManagement ManagePermissionsPolicyName = IdentityPermissions.Roles.ManagePermissions; } + protected override ValueTask SetBreadcrumbItemsAsync() + { + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value)); + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Roles"].Value)); + return base.SetBreadcrumbItemsAsync(); + } + protected override ValueTask SetEntityActionsAsync() { EntityActions diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index f4b416a786..b8ec5cf228 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -66,6 +66,13 @@ public partial class UserManagement } } + protected override ValueTask SetBreadcrumbItemsAsync() + { + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value)); + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Users"].Value)); + return base.SetBreadcrumbItemsAsync(); + } + protected virtual async Task OnSearchTextChanged(string value) { GetListInput.Filter = value; From 8da77e94cfe3b4350cb766f99c62cbd602c1418d Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Mon, 29 Aug 2022 16:15:01 +0300 Subject: [PATCH 2/4] Add breadcrumb to SettingManagement --- .../Pages/SettingManagement/SettingManagement.razor.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs index fcde862fbd..1422d67873 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs @@ -31,6 +31,8 @@ public partial class SettingManagement protected async override Task OnInitializedAsync() { + BreadcrumbItems.Add(new BreadcrumbItem(@L["Settings"])); + SettingComponentCreationContext = new SettingComponentCreationContext(ServiceProvider); foreach (var contributor in Options.Contributors) From 81c3b32a45e96ac98576c5f004805743e98f8465 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Mon, 29 Aug 2022 16:16:52 +0300 Subject: [PATCH 3/4] Add breadcrumbs to TenantManagement --- .../Pages/TenantManagement/TenantManagement.razor.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs index 0f0e689f2f..11daa3fb4a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs @@ -40,6 +40,13 @@ public partial class TenantManagement ManageFeaturesPolicyName = TenantManagementPermissions.Tenants.ManageFeatures; } + protected override ValueTask SetBreadcrumbItemsAsync() + { + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:TenantManagement"])); + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Tenants"])); + return base.SetBreadcrumbItemsAsync(); + } + protected override async Task SetPermissionsAsync() { await base.SetPermissionsAsync(); From d6955af552d92dab9fd124eb029a9af3f166ba25 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 29 Aug 2022 16:36:45 +0300 Subject: [PATCH 4/4] Cli: Add LeptonX To Commercial Package List --- .../Volo/Abp/Cli/NuGet/CommercialPackages.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs index 97003287bb..096fe9f314 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs @@ -14,6 +14,16 @@ internal static class CommercialPackages public static bool IsCommercial(string packageId) { - return Packages.Contains(packageId.ToLowerInvariant()); + return Packages.Contains(packageId.ToLowerInvariant()) || IsLeptonXPackage(packageId); + } + + private static bool IsLeptonXPackage(string packageId) + { + return !IsLeptonXLitePackage(packageId) && packageId.Contains("LeptonX"); + } + + private static bool IsLeptonXLitePackage(string packageId) + { + return packageId.Contains("LeptonXLite"); } }