From f91d8467a4edc4bfb36554520fe15bc17a4d6143 Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Fri, 22 Mar 2024 03:55:31 +0300 Subject: [PATCH 1/5] add: ConfigureAngularLibraryAfterMicroserviceServiceCreatedAsync method and use in NewCommand.Execute method --- .../Volo/Abp/Cli/Commands/NewCommand.cs | 2 + .../Commands/ProjectCreationCommandBase.cs | 67 ++++++++++++++++--- 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 9745d3c23f..ce106626bf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -111,6 +111,8 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien await RunGraphBuildForMicroserviceServiceTemplate(projectArgs); await CreateInitialMigrationsAsync(projectArgs); + await ConfigureAngularLibraryAfterMicroserviceServiceCreatedAsync(projectArgs, template); + var skipInstallLibs = commandLineArgs.Options.ContainsKey(Options.SkipInstallingLibs.Long) || commandLineArgs.Options.ContainsKey(Options.SkipInstallingLibs.Short); if (!skipInstallLibs) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index b433926c67..00339bf7cf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -43,7 +43,7 @@ public abstract class ProjectCreationCommandBase public ThemePackageAdder ThemePackageAdder { get; } public AngularThemeConfigurer AngularThemeConfigurer { get; } - + public CliVersionService CliVersionService { get; } public ProjectCreationCommandBase( @@ -436,15 +436,15 @@ public abstract class ProjectCreationCommandBase var isModuleTemplate = ModuleTemplateBase.IsModuleTemplate(projectArgs.TemplateName); var isWebassembly = projectArgs.UiFramework == UiFramework.Blazor; - - var message = isWebassembly || isModuleTemplate - ? "Generating bundles for Blazor Wasm" + + var message = isWebassembly || isModuleTemplate + ? "Generating bundles for Blazor Wasm" : "Generating bundles for MAUI Blazor"; - + var projectType = isWebassembly || isModuleTemplate - ? BundlingConsts.WebAssembly + ? BundlingConsts.WebAssembly : BundlingConsts.MauiBlazor; - + Logger.LogInformation(message + "..."); await EventBus.PublishAsync(new ProjectCreationProgressEvent @@ -454,7 +454,7 @@ public abstract class ProjectCreationCommandBase var searchPattern = isWebassembly ? "*.Blazor.csproj" : "*.MauiBlazor.csproj"; var path = projectArgs.OutputFolder; - + if (isModuleTemplate) { path = Path.Combine(path, "host"); @@ -471,7 +471,7 @@ public abstract class ProjectCreationCommandBase await _bundlingService.BundleAsync(directory, true, projectType); } - + protected virtual bool ShouldRunBundleCommand(ProjectBuildArgs projectArgs) { if ((AppTemplateBase.IsAppTemplate(projectArgs.TemplateName) || AppNoLayersTemplateBase.IsAppNoLayersTemplate(projectArgs.TemplateName)) @@ -711,7 +711,7 @@ public abstract class ProjectCreationCommandBase protected virtual ThemeStyle? GetThemeStyleOrNull(CommandLineArgs commandLineArgs, Theme theme) { - if(theme != Theme.LeptonX) + if (theme != Theme.LeptonX) { return null; } @@ -749,6 +749,53 @@ public abstract class ProjectCreationCommandBase } } + protected virtual async Task ConfigureAngularLibraryAfterMicroserviceServiceCreatedAsync(ProjectBuildArgs projectArgs, string template) + { + if (!MicroserviceServiceTemplateBase.IsMicroserviceServiceTemplate(projectArgs.TemplateName)) + { + return; + } + + var projectRootpath = Directory.GetCurrentDirectory(); + var projectUiFramework = FindMicroserviceSolutionUiFramework(projectRootpath); + + if (projectUiFramework != UiFramework.Angular) + { + return; + } + + Logger.LogInformation("Setting up the angular library..."); + + var libraryName = projectArgs.SolutionName.ProjectName.ToKebabCase(); + + var hostAppPath = Path.Combine(projectRootpath, "apps", "angular"); + var angularLibraryPath = Path.Combine(hostAppPath, "projects", libraryName); + + await GenerateAngularLibraryForNewMicroserviceAsync(libraryName, hostAppPath); + + try + { + Directory.Delete(angularLibraryPath, true); + await MoveLibraryToHostAppAsync(projectArgs.OutputFolder, libraryName, angularLibraryPath); + } + catch (Exception e) + { + Logger.LogError(e.Message); + } + } + + protected virtual async Task GenerateAngularLibraryForNewMicroserviceAsync(string libraryName, string workingDirectory) + { + var result = CmdHelper.RunCmdAndGetOutput($"npx ng g library {libraryName}", workingDirectory); + return await Task.FromResult(result); + } + + protected virtual async Task MoveLibraryToHostAppAsync(string outputFolder, string libraryName, string angularLibraryPath) + { + var currentAngularLibPath = Path.Combine(outputFolder, "angular", libraryName); + Directory.Move(currentAngularLibPath, angularLibraryPath); + } + public static class Options { public static class Template From d6e9c6a003b9fab96588f643c99c0b5d4e89b426 Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Fri, 22 Mar 2024 04:03:13 +0300 Subject: [PATCH 2/5] Rename variables name --- .../Abp/Cli/Commands/ProjectCreationCommandBase.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 00339bf7cf..15556c8394 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -756,10 +756,10 @@ public abstract class ProjectCreationCommandBase return; } - var projectRootpath = Directory.GetCurrentDirectory(); - var projectUiFramework = FindMicroserviceSolutionUiFramework(projectRootpath); + var rootPath = Directory.GetCurrentDirectory(); + var uiFramework = FindMicroserviceSolutionUiFramework(rootPath); - if (projectUiFramework != UiFramework.Angular) + if (uiFramework != UiFramework.Angular) { return; } @@ -768,10 +768,10 @@ public abstract class ProjectCreationCommandBase var libraryName = projectArgs.SolutionName.ProjectName.ToKebabCase(); - var hostAppPath = Path.Combine(projectRootpath, "apps", "angular"); - var angularLibraryPath = Path.Combine(hostAppPath, "projects", libraryName); + var angularAppPath = Path.Combine(rootPath, "apps", "angular"); + var angularLibraryPath = Path.Combine(angularAppPath, "projects", libraryName); - await GenerateAngularLibraryForNewMicroserviceAsync(libraryName, hostAppPath); + await GenerateAngularLibraryForNewMicroserviceAsync(libraryName, angularAppPath); try { From 206d3f6722b53248508d8a7fe9b4cec558fe6694 Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Tue, 26 Mar 2024 01:16:17 +0300 Subject: [PATCH 3/5] Change library creation with @abp/ng.schematics:create-lib command --- .../Volo/Abp/Cli/Commands/NewCommand.cs | 2 +- .../Commands/ProjectCreationCommandBase.cs | 47 ++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index ce106626bf..a8c9994340 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -111,7 +111,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien await RunGraphBuildForMicroserviceServiceTemplate(projectArgs); await CreateInitialMigrationsAsync(projectArgs); - await ConfigureAngularLibraryAfterMicroserviceServiceCreatedAsync(projectArgs, template); + await ConfigureAngularAfterMicroserviceServiceCreatedAsync(projectArgs, template); var skipInstallLibs = commandLineArgs.Options.ContainsKey(Options.SkipInstallingLibs.Long) || commandLineArgs.Options.ContainsKey(Options.SkipInstallingLibs.Short); if (!skipInstallLibs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 15556c8394..cd4c80ac23 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -1,13 +1,12 @@ using System; using System.IO; +using System.Text; using System.Linq; using System.Threading.Tasks; using ICSharpCode.SharpZipLib.Core; using ICSharpCode.SharpZipLib.Zip; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using NuGet.Versioning; -using NUglify.Helpers; using Volo.Abp.Cli.ProjectModification; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Bundling; @@ -749,7 +748,7 @@ public abstract class ProjectCreationCommandBase } } - protected virtual async Task ConfigureAngularLibraryAfterMicroserviceServiceCreatedAsync(ProjectBuildArgs projectArgs, string template) + protected virtual async Task ConfigureAngularAfterMicroserviceServiceCreatedAsync(ProjectBuildArgs projectArgs, string template) { if (!MicroserviceServiceTemplateBase.IsMicroserviceServiceTemplate(projectArgs.TemplateName)) { @@ -767,33 +766,39 @@ public abstract class ProjectCreationCommandBase Logger.LogInformation("Setting up the angular library..."); var libraryName = projectArgs.SolutionName.ProjectName.ToKebabCase(); - var angularAppPath = Path.Combine(rootPath, "apps", "angular"); - var angularLibraryPath = Path.Combine(angularAppPath, "projects", libraryName); - await GenerateAngularLibraryForNewMicroserviceAsync(libraryName, angularAppPath); + var result = await CreateAngularLibraryAsync(libraryName, angularAppPath); + + Logger.LogInformation(result); + } - try + protected virtual async Task CreateAngularLibraryAsync( + string libraryName, + string workingDirectory, + bool isSecondaryEndpoint = false, + bool isModuleTemplate = true, + bool isOverride = true) + { + //TODO: Can we improve this validations ? + if (string.IsNullOrWhiteSpace(libraryName)) { - Directory.Delete(angularLibraryPath, true); - await MoveLibraryToHostAppAsync(projectArgs.OutputFolder, libraryName, angularLibraryPath); + throw new CliUsageException("Angular library name can not be empty"); } - catch (Exception e) + + if (string.IsNullOrWhiteSpace(workingDirectory)) { - Logger.LogError(e.Message); + throw new CliUsageException("Angular project path can not be empty"); } - } - protected virtual async Task GenerateAngularLibraryForNewMicroserviceAsync(string libraryName, string workingDirectory) - { - var result = CmdHelper.RunCmdAndGetOutput($"npx ng g library {libraryName}", workingDirectory); - return await Task.FromResult(result); - } + var commandBuilder = new StringBuilder($"npx ng g @abp/ng.schematics:create-lib --package-name {libraryName}"); - protected virtual async Task MoveLibraryToHostAppAsync(string outputFolder, string libraryName, string angularLibraryPath) - { - var currentAngularLibPath = Path.Combine(outputFolder, "angular", libraryName); - Directory.Move(currentAngularLibPath, angularLibraryPath); + commandBuilder.Append($" --is-secondary-entrypoint {(isSecondaryEndpoint ? "true" : "false")} "); + commandBuilder.Append($" --is-module-template {(isModuleTemplate ? "true" : "false")} "); + commandBuilder.Append($" --override {(isOverride ? "true" : "false")} "); + + var result = CmdHelper.RunCmdAndGetOutput(commandBuilder.ToString(), workingDirectory); + return await Task.FromResult(result); } public static class Options From c4692d9afa04dd1cbc97e9b2cc6765c1e14d7fb6 Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Tue, 26 Mar 2024 01:53:27 +0300 Subject: [PATCH 4/5] Refactor commandBuilder to use boolean values instead of string comparison --- .../Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index cd4c80ac23..db3710b257 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -793,9 +793,9 @@ public abstract class ProjectCreationCommandBase var commandBuilder = new StringBuilder($"npx ng g @abp/ng.schematics:create-lib --package-name {libraryName}"); - commandBuilder.Append($" --is-secondary-entrypoint {(isSecondaryEndpoint ? "true" : "false")} "); - commandBuilder.Append($" --is-module-template {(isModuleTemplate ? "true" : "false")} "); - commandBuilder.Append($" --override {(isOverride ? "true" : "false")} "); + commandBuilder.Append($" --is-secondary-entrypoint {isSecondaryEndpoint.ToString().ToLower()}"); + commandBuilder.Append($" --is-module-template {isModuleTemplate.ToString().ToLower()}"); + commandBuilder.Append($" --override {isOverride.ToString().ToLower()}"); var result = CmdHelper.RunCmdAndGetOutput(commandBuilder.ToString(), workingDirectory); return await Task.FromResult(result); From d4d838d253abb2c1c8cd690d453c0efdce3acd3c Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Tue, 26 Mar 2024 18:25:41 +0300 Subject: [PATCH 5/5] update creat-lib command's template --- .../src/lib/__libraryName@kebab__-routing.module.ts.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template index 4b9517b211..8c9afe6aa2 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; -import { DynamicLayoutComponent } from '@abp/ng.core'; +import { RouterOutletComponent } from '@abp/ng.core'; import { Routes, RouterModule } from '@angular/router'; const routes: Routes = [ { path: '', pathMatch: 'full', - component: DynamicLayoutComponent, + component: RouterOutletComponent, children: [], }, ];