From ae628d736c419e4b83dcde0d903e786f16a7e55d Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 7 Dec 2022 11:49:52 +0300
Subject: [PATCH] Set default value for service-type on Abp cli

---
 .../Angular/AngularServiceProxyGenerator.cs               | 8 +++-----
 npm/ng-packs/scripts/copy-packages-to-templates.ts        | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs
index 0376828fc2..d17545f4cc 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs
@@ -76,11 +76,9 @@ public class AngularServiceProxyGenerator : ServiceProxyGeneratorBase<AngularSer
             commandBuilder.Append($" --url {url}");
         }
 
-        var serviceType = GetServiceType(args);
-        if (args.ServiceType != null)
-        {
-            commandBuilder.Append($" --service-type {serviceType.ToString().ToLower()}");
-        }
+        var serviceType = GetServiceType(args) ?? Volo.Abp.Cli.ServiceProxying.ServiceType.Application;
+        commandBuilder.Append($" --service-type {serviceType.ToString().ToLower()}");
+
 
         _cmdhelper.RunCmd(commandBuilder.ToString());
     }
diff --git a/npm/ng-packs/scripts/copy-packages-to-templates.ts b/npm/ng-packs/scripts/copy-packages-to-templates.ts
index 42aa7e5eff..e71dacbcc0 100644
--- a/npm/ng-packs/scripts/copy-packages-to-templates.ts
+++ b/npm/ng-packs/scripts/copy-packages-to-templates.ts
@@ -17,6 +17,7 @@ const packageMap = {
   'tenant-management': 'ng.tenant-management',
   'theme-basic': 'ng.theme.basic',
   'theme-shared': 'ng.theme.shared',
+  'schematics':'ng.schematics'
 };
 program.option('-t, --templates  <templates>', 'template dirs', false);
 program.option('-p, --template-path <templatePath>', 'root template path', false);