From 8ee18d6b449b2e3879eabe22295b2900be876cf5 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 29 Jun 2022 11:05:58 +0300
Subject: [PATCH] Fix: Cli fails to copy angular files when adding new module

resolves volosoft/volo#10857
---
 .../AngularSourceCodeAdder.cs                 | 13 ++++++++-
 .../SolutionModuleAdder.cs                    | 29 -------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs
index 9847a2b7a5..84e995f1fd 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs
@@ -246,6 +246,17 @@ public class AngularSourceCodeAdder : ITransientDependency
 
         foreach (var folder in angularPathsInDownloadedSourceCode)
         {
+            var nodeModulesFolder = Path.Combine(folder, "node_modules");
+            var vscodeFolder = Path.Combine(folder, ".vscode");
+            if (Directory.Exists(nodeModulesFolder))
+            {
+                Directory.Delete(nodeModulesFolder, true);
+            }
+            if (Directory.Exists(vscodeFolder))
+            {
+                Directory.Delete(vscodeFolder, true);
+            }
+            
             var projectsInFolder = Directory.GetDirectories(folder);
 
             if (projectsInFolder.Length == 1 && Path.GetFileName(projectsInFolder[0]) == "projects")
@@ -286,7 +297,7 @@ public class AngularSourceCodeAdder : ITransientDependency
                 Directory.Move(projectInFolder, destDirName);
             }
 
-            if (!Directory.GetFiles(folder).Any() && !Directory.GetDirectories(folder).Any())
+            if (!Directory.GetDirectories(folder).Any())
             {
                 Directory.Delete(folder, true);
             }
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 2bfcad2d32..f418d8b490 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
@@ -427,11 +427,6 @@ public class SolutionModuleAdder : ITransientDependency
 
         await PublishEventAsync(9, $"Adding angular source code");
 
-        if (newTemplate)
-        {
-            MoveAngularFolderInNewTemplate(modulesFolderInSolution, moduleName);
-        }
-
         await AngularSourceCodeAdder.AddFromModuleAsync(solutionFilePath, angularPath);
     }
 
@@ -449,30 +444,6 @@ public class SolutionModuleAdder : ITransientDependency
         }
     }
 
-    private static void MoveAngularFolderInNewTemplate(string modulesFolderInSolution, string moduleName)
-    {
-        var moduleAngularFolder = Path.Combine(modulesFolderInSolution, moduleName, "angular");
-
-        if (!Directory.Exists(moduleAngularFolder))
-        {
-            return;
-        }
-
-        var files = Directory.GetFiles(moduleAngularFolder);
-        var folders = Directory.GetDirectories(moduleAngularFolder);
-
-        Directory.CreateDirectory(Path.Combine(moduleAngularFolder, moduleName));
-
-        foreach (var file in files)
-        {
-            File.Move(file, Path.Combine(moduleAngularFolder, moduleName, Path.GetFileName(file)));
-        }
-        foreach (var folder in folders)
-        {
-            Directory.Move(folder, Path.Combine(moduleAngularFolder, moduleName, Path.GetFileName(folder)));
-        }
-    }
-
     private async Task DownloadSourceCodesToSolutionFolder(ModuleWithMastersInfo module,
         string modulesFolderInSolution, string version = null, bool newTemplate = false,
         bool newProTemplate = false)