From c5db087f58e7d6aad62f2a6dab233ce1df852b5a Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 21 Apr 2022 15:40:03 +0300 Subject: [PATCH 1/6] Cli: Add license code to module source code downloads --- .../ModuleProjectBuildPipelineBuilder.cs | 2 ++ .../Steps/CreateAppSettingsSecretsStep.cs | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs index 35bcb71d53..2d28143921 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs @@ -14,6 +14,8 @@ public static class ModuleProjectBuildPipelineBuilder pipeline.Steps.Add(new ReplaceCommonPropsStep()); pipeline.Steps.Add(new MakeProxyJsonFileEmbeddedStep()); pipeline.Steps.Add(new ReplaceConfigureAwaitPropsStep()); + pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); + pipeline.Steps.Add(new LicenseCodeReplaceStep()); pipeline.Steps.Add(new UpdateNuGetConfigStep("/NuGet.Config")); pipeline.Steps.Add(new CreateProjectResultZipStep()); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs index 5a84bda994..7a5f792b15 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs @@ -40,7 +40,21 @@ public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep private static byte[] GetAppSettingsSecretJsonContent(ProjectBuildContext context) { - return context.Template.IsPro() + bool condition; + if (context.Template != null) + { + condition = context.Template.IsPro(); + } + else if (context.Module != null) + { + condition = context.Module.IsPro; + } + else + { + condition = false; + } + + return condition ? $"{{{Environment.NewLine} \"AbpLicenseCode\": \"{CliConsts.LicenseCodePlaceHolder}\" {Environment.NewLine}}}".GetBytes() : $"{{{Environment.NewLine}}}".GetBytes(); } From a1e284fa951c603118d0c754b4fc21d553292a04 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 21 Apr 2022 15:42:26 +0300 Subject: [PATCH 2/6] Update ModuleProjectBuildPipelineBuilder.cs --- .../Building/ModuleProjectBuildPipelineBuilder.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs index 2d28143921..9a5eecb4f6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleProjectBuildPipelineBuilder.cs @@ -14,8 +14,13 @@ public static class ModuleProjectBuildPipelineBuilder pipeline.Steps.Add(new ReplaceCommonPropsStep()); pipeline.Steps.Add(new MakeProxyJsonFileEmbeddedStep()); pipeline.Steps.Add(new ReplaceConfigureAwaitPropsStep()); - pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); - pipeline.Steps.Add(new LicenseCodeReplaceStep()); + + if (context.Module.IsPro) + { + pipeline.Steps.Add(new CreateAppSettingsSecretsStep()); + pipeline.Steps.Add(new LicenseCodeReplaceStep()); + } + pipeline.Steps.Add(new UpdateNuGetConfigStep("/NuGet.Config")); pipeline.Steps.Add(new CreateProjectResultZipStep()); From a1b924ddfc6d045b2be4e68aa4440720de7e2405 Mon Sep 17 00:00:00 2001 From: enisn Date: Fri, 22 Apr 2022 11:50:27 +0300 Subject: [PATCH 3/6] Make datagrids columns orderable --- .../Pages/Identity/RoleManagement.razor.cs | 4 +++- .../Pages/Identity/UserManagement.razor.cs | 5 ++++- .../Pages/TenantManagement/TenantManagement.razor.cs | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) 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 f14e5cef90..cf4d1c8ecd 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 @@ -81,11 +81,13 @@ public partial class RoleManagement new TableColumn { Title = L["Actions"], - Actions = EntityActions.Get() + Actions = EntityActions.Get(), + Sortable = true, }, new TableColumn { Title = L["RoleName"], + Sortable = true, Data = nameof(IdentityRoleDto.Name), Component = typeof(RoleNameComponent) }, 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 982f77882d..5919ed9ed3 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 @@ -171,22 +171,25 @@ public partial class UserManagement new TableColumn { Title = L["Actions"], - Actions = EntityActions.Get() + Actions = EntityActions.Get(), }, new TableColumn { Title = L["UserName"], Data = nameof(IdentityUserDto.UserName), + Sortable = true, }, new TableColumn { Title = L["Email"], Data = nameof(IdentityUserDto.Email), + Sortable = true, }, new TableColumn { Title = L["PhoneNumber"], Data = nameof(IdentityUserDto.PhoneNumber), + Sortable = true, } }); 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 134bbcd439..57987cf127 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 @@ -110,10 +110,12 @@ public partial class TenantManagement { Title = L["Actions"], Actions = EntityActions.Get() + Sortable = true, }, new TableColumn { Title = L["TenantName"], + Sortable = true, Data = nameof(TenantDto.Name), }, }); From 5b9fed9f80ddbf357f872f6a51b726053213c870 Mon Sep 17 00:00:00 2001 From: enisn Date: Fri, 22 Apr 2022 11:52:45 +0300 Subject: [PATCH 4/6] Add missing comma --- .../Pages/TenantManagement/TenantManagement.razor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 57987cf127..8e4b0efa97 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 @@ -109,7 +109,7 @@ public partial class TenantManagement new TableColumn { Title = L["Actions"], - Actions = EntityActions.Get() + Actions = EntityActions.Get(), Sortable = true, }, new TableColumn From 2877be99065c0818b6bd00e59422624ed80d4f63 Mon Sep 17 00:00:00 2001 From: enisn Date: Fri, 22 Apr 2022 16:42:44 +0300 Subject: [PATCH 5/6] Remove Sortable property from "Actions" column --- .../Pages/Identity/RoleManagement.razor.cs | 1 - 1 file changed, 1 deletion(-) 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 cf4d1c8ecd..cfb86b5007 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 @@ -82,7 +82,6 @@ public partial class RoleManagement { Title = L["Actions"], Actions = EntityActions.Get(), - Sortable = true, }, new TableColumn { From d02722790ddca5188a1099d57b7f6c6d5e497cdc Mon Sep 17 00:00:00 2001 From: enisn Date: Fri, 22 Apr 2022 16:46:59 +0300 Subject: [PATCH 6/6] Remove Sortable property from "Actions" column --- .../Pages/TenantManagement/TenantManagement.razor.cs | 1 - 1 file changed, 1 deletion(-) 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 8e4b0efa97..0f0e689f2f 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 @@ -110,7 +110,6 @@ public partial class TenantManagement { Title = L["Actions"], Actions = EntityActions.Get(), - Sortable = true, }, new TableColumn {