From e1b6609f8b18bdd860a6c18a17f6fba6883b5f1f Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 14 Jun 2021 11:41:57 +0300 Subject: [PATCH 1/3] Open the related document page after adding a module via CLI resolves https://github.com/abpframework/abp/issues/7870 --- .../Volo/Abp/Cli/ProjectModification/ModuleInfo.cs | 4 +++- .../Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs index d5e7a4e15a..7ffe7ffc48 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs @@ -10,8 +10,10 @@ namespace Volo.Abp.Cli.ProjectModification public string EfCoreConfigureMethodName { get; set; } + public string DocumentationLinks { get; set; } + public List NugetPackages { get; set; } public List NpmPackages { get; set; } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 9a30fd7fd3..fc454a9bae 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -131,6 +131,11 @@ namespace Volo.Abp.Cli.ProjectModification await RunBundleForBlazorAsync(projectFiles, module); ModifyDbContext(projectFiles, module, skipDbMigrations); + + if (!string.IsNullOrWhiteSpace(module.DocumentationLinks)) + { + CmdHelper.OpenWebPage(module.DocumentationLinks.Split(" ", StringSplitOptions.RemoveEmptyEntries)[0]); + } } private ModuleWithMastersInfo RemoveIncompatiblePackages(ModuleWithMastersInfo module, string version) From e92c0c5d88ab4f750e991b57e72fb263774931d2 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Tue, 15 Jun 2021 09:50:51 +0300 Subject: [PATCH 2/3] refactor document link --- .../Abp/Cli/ProjectModification/ModuleInfo.cs | 17 ++++++++++++++++- .../ProjectModification/SolutionModuleAdder.cs | 12 +++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs index 7ffe7ffc48..3f1e658525 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs @@ -1,4 +1,6 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq; namespace Volo.Abp.Cli.ProjectModification { @@ -15,5 +17,18 @@ namespace Volo.Abp.Cli.ProjectModification public List NugetPackages { get; set; } public List NpmPackages { get; set; } + + public string GetFirstDocumentationLinkOrNull() + { + if (string.IsNullOrWhiteSpace(DocumentationLinks)) + { + return null; + } + + var docs = DocumentationLinks.Split(" ", StringSplitOptions.RemoveEmptyEntries); + return docs.Any() ? + docs.First() : + null; + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index fc454a9bae..5d4606ed8c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -132,9 +132,11 @@ namespace Volo.Abp.Cli.ProjectModification ModifyDbContext(projectFiles, module, skipDbMigrations); - if (!string.IsNullOrWhiteSpace(module.DocumentationLinks)) + var documentationLink = module.GetFirstDocumentationLinkOrNull(); + if (documentationLink != null) { - CmdHelper.OpenWebPage(module.DocumentationLinks.Split(" ", StringSplitOptions.RemoveEmptyEntries)[0]); + + CmdHelper.OpenWebPage(documentationLink); } } @@ -214,7 +216,7 @@ namespace Volo.Abp.Cli.ProjectModification { projectsToRemove.AddRange(await FindProjectsToRemoveByTarget(module, NuGetPackageTarget.BlazorWebAssembly, isProjectTiered)); - webPackagesWillBeAddedToBlazorServerProject = module.NugetPackages.All(np=> np.Target != NuGetPackageTarget.BlazorServer && np.TieredTarget != NuGetPackageTarget.BlazorServer); + webPackagesWillBeAddedToBlazorServerProject = module.NugetPackages.All(np => np.Target != NuGetPackageTarget.BlazorServer && np.TieredTarget != NuGetPackageTarget.BlazorServer); } else { @@ -255,7 +257,7 @@ namespace Volo.Abp.Cli.ProjectModification private bool IsReferencedByAnotherModuleProject(string moduleDirectory, List projectsToRemove, string projectToRemove) { var moduleProjects = Directory.GetFiles(moduleDirectory, "*.csproj", SearchOption.AllDirectories); - var projectsToKeep = moduleProjects.Where(mp=> !projectsToRemove.Contains(Path.GetFileName(mp).RemovePostFix(".csproj"))).ToList(); + var projectsToKeep = moduleProjects.Where(mp => !projectsToRemove.Contains(Path.GetFileName(mp).RemovePostFix(".csproj"))).ToList(); return projectsToKeep.Select(File.ReadAllText).Any(content => content.Contains($"\"{projectToRemove}\"")); } @@ -283,7 +285,7 @@ namespace Volo.Abp.Cli.ProjectModification return projectsToRemove; } - private async Task> FindProjectsToRemoveByPostFix(string moduleDirectory, string targetFolder, + private async Task> FindProjectsToRemoveByPostFix(string moduleDirectory, string targetFolder, string postFix) { var projectsToRemove = new List(); From 73275a9040a27b3e2710c7d8ef885ea463ee2c63 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Tue, 15 Jun 2021 10:00:48 +0300 Subject: [PATCH 3/3] Update SolutionModuleAdder.cs --- .../Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 5d4606ed8c..273f011f41 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -135,7 +135,6 @@ namespace Volo.Abp.Cli.ProjectModification var documentationLink = module.GetFirstDocumentationLinkOrNull(); if (documentationLink != null) { - CmdHelper.OpenWebPage(documentationLink); } }