Solved conflict

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>6.0.0</Version>
+    <Version>6.0.0-rc.1</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionFilter.cs

@@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 
 public class AbpExceptionFilter : IAsyncExceptionFilter, ITransientDependency
 {
-    public async Task OnExceptionAsync(ExceptionContext context)
+    public virtual async Task OnExceptionAsync(ExceptionContext context)
     {
         if (!ShouldHandleException(context))
         {

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs

@@ -25,7 +25,7 @@ public class AbpExceptionPageFilter : IAsyncPageFilter, ITransientDependency
         return Task.CompletedTask;
     }
 
-    public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+    public virtual async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
     {
         if (context.HandlerMethod == null || !ShouldHandleException(context))
         {

framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Volo.Abp.MultiLingualObjects;
 
@@ -10,4 +11,10 @@ public interface IMultiLingualObjectManager
         bool fallbackToParentCultures = true)
         where TMultiLingual : IMultiLingualObject<TTranslation>
         where TTranslation : class, IObjectTranslation;
+
+    Task<TTranslation> GetTranslationAsync<TTranslation>(
+       ICollection<TTranslation> translations,
+       string culture = null,
+       bool fallbackToParentCultures = true)
+       where TTranslation : class, IObjectTranslation;
 }

framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager.cs

@@ -19,22 +19,21 @@ public class MultiLingualObjectManager : IMultiLingualObjectManager, ITransientD
     {
         SettingProvider = settingProvider;
     }
-
+    public virtual async Task<TTranslation> GetTranslationAsync<TTranslation>(
-    public virtual async Task<TTranslation> GetTranslationAsync<TMultiLingual, TTranslation>(
+        ICollection<TTranslation> translations,
-        TMultiLingual multiLingual,
+        string culture,
-        string culture = null,
+        bool fallbackToParentCultures)
-        bool fallbackToParentCultures = true)
-        where TMultiLingual : IMultiLingualObject<TTranslation>
         where TTranslation : class, IObjectTranslation
+
     {
         culture ??= CultureInfo.CurrentUICulture.Name;
 
-        if (multiLingual.Translations.IsNullOrEmpty())
+        if (translations.IsNullOrEmpty())
         {
             return null;
         }
 
-        var translation = multiLingual.Translations.FirstOrDefault(pt => pt.Language == culture);
+        var translation = translations.FirstOrDefault(pt => pt.Language == culture);
         if (translation != null)
         {
             return translation;
@@ -44,7 +43,7 @@ public class MultiLingualObjectManager : IMultiLingualObjectManager, ITransientD
         {
             translation = GetTranslationBasedOnCulturalRecursive(
                 CultureInfo.CurrentUICulture.Parent,
-                multiLingual.Translations,
+                translations,
                 0
             );
 
@@ -56,16 +55,26 @@ public class MultiLingualObjectManager : IMultiLingualObjectManager, ITransientD
 
         var defaultLanguage = await SettingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage);
 
-        translation = multiLingual.Translations.FirstOrDefault(pt => pt.Language == defaultLanguage);
+        translation = translations.FirstOrDefault(pt => pt.Language == defaultLanguage);
         if (translation != null)
         {
             return translation;
         }
 
-        translation = multiLingual.Translations.FirstOrDefault();
+        translation = translations.FirstOrDefault();
         return translation;
     }
 
+    public virtual Task<TTranslation> GetTranslationAsync<TMultiLingual, TTranslation>(
+        TMultiLingual multiLingual,
+        string culture = null,
+        bool fallbackToParentCultures = true)
+        where TMultiLingual : IMultiLingualObject<TTranslation>
+        where TTranslation : class, IObjectTranslation
+    {
+        return GetTranslationAsync(multiLingual.Translations, culture: culture, fallbackToParentCultures: fallbackToParentCultures);
+    }
+
     protected virtual TTranslation GetTranslationBasedOnCulturalRecursive<TTranslation>(
         CultureInfo culture, ICollection<TTranslation> translations, int currentDepth)
         where TTranslation : class, IObjectTranslation

framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs

@@ -51,6 +51,17 @@ public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingual
         }
     }
 
+    [Fact]
+    public async Task GetTranslationFromListAsync()
+    {
+        using (CultureHelper.Use("en-us"))
+        {
+            var translation = await _multiLingualObjectManager.GetTranslationAsync(_book.Translations);
+
+            translation.Name.ShouldBe("C# in Depth");
+        }
+    }
+
     [Fact]
     public async Task Should_Get_Specified_Language()
     {

npm/ng-packs/apps/dev-app/src/environments/environment.ts

@@ -37,7 +37,7 @@ export const environment = {
     AbpIdentity: {
       rootNamespace: 'Volo.Abp',
     },
-    AbpSettingManagement: {
+    SettingManagement: {
       rootNamespace: 'Volo.Abp.SettingManagement',
     },
   },

npm/ng-packs/packages/core/src/lib/services/rest.service.ts

@@ -38,9 +38,9 @@ export class RestService {
     api = api || this.getApiFromStore(config.apiName);
     const { method, params, ...options } = request;
     const { observe = Rest.Observe.Body, skipHandleError } = config;
-
+    const url = this.removeDuplicateSlashes(api + request.url);
     return this.http
-      .request<R>(method, api + request.url, {
+      .request<R>(method, url, {
         observe,
         ...(params && {
           params: this.getParams(params, config.httpParamEncoder),
@@ -62,4 +62,8 @@ export class RestService {
       ? new HttpParams({ encoder, fromObject: filteredParams })
       : new HttpParams({ fromObject: filteredParams });
   }
+
+  private removeDuplicateSlashes(url: string): string {
+    return url.replace(/([^:]\/)\/+/g, '$1');
+  }
 }

npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts

@@ -120,4 +120,17 @@ describe('HttpClient testing', () => {
     const req = spectator.expectOne(api + '/test', HttpMethod.GET);
     spectator.flushAll([req], [throwError('Testing error')]);
   });
+
+  test('should remove the duplicate slashes', () => {
+    spectator.service
+      .request({ method: HttpMethod.GET, url: '//test', params: { id: 1 } })
+      .subscribe();
+    spectator.expectOne(api + '/test?id=1', HttpMethod.GET);
+  });
+  test('should remove the duplicate slashes multiple', () => {
+    spectator.service
+      .request({ method: HttpMethod.GET, url: '//test//my//endpoint', params: { id: 1 } })
+      .subscribe();
+    spectator.expectOne(api + '/test/my/endpoint?id=1', HttpMethod.GET);
+  });
 });

npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html → npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html

@@ -6,13 +6,13 @@
   <div class="mb-3 form-group">
     <label class="form-label">{{
       'AbpSettingManagement::DefaultFromDisplayName' | abpLocalization
-    }}</label>
+      }}</label>
     <input type="text" class="form-control" formControlName="defaultFromDisplayName" />
   </div>
   <div class="mb-3 form-group">
     <label class="form-label">{{
       'AbpSettingManagement::DefaultFromAddress' | abpLocalization
-    }}</label>
+      }}</label>
     <input type="text" class="form-control" formControlName="defaultFromAddress" />
   </div>
   <div class="mb-3 form-group">
@@ -25,34 +25,23 @@
   </div>
 
   <div class="form-check mb-2">
-    <input
+    <input type="checkbox" id="smtp-enable-ssl" class="form-check-input" formControlName="smtpEnableSsl" />
-      type="checkbox"
-      id="smtp-enable-ssl"
-      class="form-check-input"
-      formControlName="smtpEnableSsl"
-    />
     <label class="form-check-label" for="smtp-enable-ssl">{{
       'AbpSettingManagement::SmtpEnableSsl' | abpLocalization
-    }}</label>
+      }}</label>
   </div>
   <div class="form-check mb-2">
-    <input
+    <input type="checkbox" id="smtp-use-default-credentials" class="form-check-input"
-      type="checkbox"
+      formControlName="smtpUseDefaultCredentials" />
-      id="smtp-use-default-credentials"
-      class="form-check-input"
-      formControlName="smtpUseDefaultCredentials"
-    />
     <label class="form-check-label" for="smtp-use-default-credentials">{{
       'AbpSettingManagement::SmtpUseDefaultCredentials' | abpLocalization
-    }}</label>
+      }}</label>
   </div>
 
-  <div
+  <div [@collapse]="{
-    [@collapse]="{
       value: form.get('smtpUseDefaultCredentials')?.value ? 'collapsed' : 'expanded',
       params: { time: '200ms', easing: 'linear' }
-    }"
+    }">
-  >
     <div class="mb-3 form-group">
       <label class="form-label">{{ 'AbpSettingManagement::SmtpDomain' | abpLocalization }}</label>
       <input type="text" class="form-control" formControlName="smtpDomain" />
@@ -74,4 +63,51 @@
   <button type="submit" class="btn btn-primary">
     {{ 'AbpSettingManagement::Save' | abpLocalization }}
   </button>
+  <button type="button" (click)="openSendEmailModal()" class="btn btn-primary mx-2" *abpPermission="emailingPolicy">
+    <i class="fa f-send"></i>
+    {{ 'AbpSettingManagement::SendTestEmail' | abpLocalization }}
+  </button>
 </form>
+
+<abp-modal [(visible)]="isEmailTestModalOpen" [options]="modalSize">
+  <ng-template #abpHeader>
+    <h3>{{"SendTestEmail" | abpLocalization}}</h3>
+  </ng-template>
+
+  <ng-template #abpBody>
+    <form [formGroup]="emailTestForm" id="emailTestForm" (ngSubmit)="emailTestFormSubmit()">
+
+      <div class="mb-3 form-group">
+        <label class="form-label">{{ 'AbpSettingManagement::SenderEmailAddress' | abpLocalization }}</label>
+        <input class="form-control" formControlName="senderEmailAddress" />
+      </div>
+
+      <div class="mb-3 form-group">
+        <label class="form-label">{{ 'AbpSettingManagement::TargetEmailAddress' | abpLocalization }}</label>
+        <input class="form-control" formControlName="targetEmailAddress" />
+      </div>
+
+
+      <div class="mb-3 form-group">
+        <label class="form-label">{{ 'AbpSettingManagement::Subject' | abpLocalization }}</label>
+        <input class="form-control" formControlName="subject" />
+      </div>
+
+
+      <div class="mb-3 form-group">
+        <label class="form-label">{{ 'AbpSettingManagement::Body' | abpLocalization }}</label>
+        <textarea class="form-control" formControlName="body"></textarea>
+      </div>
+    </form>
+  </ng-template>
+
+
+  <ng-template #abpFooter>
+    <abp-button buttonType="submit" iconClass="fa fa-send" formName="emailTestForm"
+      [disabled]="emailTestForm.invalid && emailTestForm.dirty">
+      <span>{{ 'AbpTenantManagement::Send' | abpLocalization }}</span>
+    </abp-button>
+
+    <button type="button" class="btn btn-secondary" abpClose>Close</button>
+  </ng-template>
+</abp-modal>

npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.ts → npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts

@@ -1,7 +1,9 @@
+import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap';
 import { collapse, ToasterService } from '@abp/ng.theme.shared';
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { finalize } from 'rxjs/operators';
+import { SettingManagementPolicyNames } from '../../enums/policy-names';
 import { EmailSettingsService } from '../../proxy/email-settings.service';
 import { EmailSettingsDto } from '../../proxy/models';
 
@@ -12,8 +14,11 @@ import { EmailSettingsDto } from '../../proxy/models';
 })
 export class EmailSettingGroupComponent implements OnInit {
   form!: FormGroup;
-
+  emailTestForm: FormGroup;
   saving = false;
+  emailingPolicy = SettingManagementPolicyNames.Emailing;
+  isEmailTestModalOpen = false;
+  modalSize:NgbModalOptions= { size:"lg"} 
 
   constructor(
     private emailSettingsService: EmailSettingsService,
@@ -57,4 +62,30 @@ export class EmailSettingGroupComponent implements OnInit {
         this.getData();
       });
   }
+  openSendEmailModal() {
+    this.buildEmailTestForm();
+    this.isEmailTestModalOpen = true;
+  }
+
+  buildEmailTestForm() {
+    this.emailTestForm = this.fb.group({
+      senderEmailAddress: ['', [Validators.required, Validators.email]],
+      targetEmailAddress: ['', [Validators.required, Validators.email]],
+      subject: ['', [Validators.required]],
+      body: [''],
+    });
+  }
+
+  emailTestFormSubmit() {
+
+    if(this.emailTestForm.invalid){
+      return;
+    }
+     this.emailSettingsService.sendTestEmail(this.emailTestForm.value).subscribe(res => {
+      this.toasterService.success('AbpSettingManagement::SuccessfullySent');
+      this.isEmailTestModalOpen = false;
+    })
+      
+  }
+
 }

npm/ng-packs/packages/setting-management/config/src/enums/index.ts → npm/ng-packs/packages/setting-management/config/src/lib/enums/index.ts

@@ -1,2 +1,3 @@
 export * from './route-names';
 export * from './setting-tab-names';
+export * from './policy-names';

npm/ng-packs/packages/setting-management/config/src/lib/enums/policy-names.ts

@@ -0,0 +1,4 @@
+export const enum SettingManagementPolicyNames {
+  Emailing = 'SettingManagement.Emailing',
+ }
+

npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts

@@ -0,0 +1,35 @@
+import type { EmailSettingsDto, SendTestEmailInput, UpdateEmailSettingsDto } from './models';
+import { RestService } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class EmailSettingsService {
+  apiName = 'SettingManagement';
+
+  get = () =>
+    this.restService.request<any, EmailSettingsDto>({
+      method: 'GET',
+      url: '/api/setting-management/emailing',
+    },
+    { apiName: this.apiName });
+
+  sendTestEmail = (input: SendTestEmailInput) =>
+    this.restService.request<any, void>({
+      method: 'POST',
+      url: '/api/setting-management/emailing/send-test-email',
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  update = (input: UpdateEmailSettingsDto) =>
+    this.restService.request<any, void>({
+      method: 'POST',
+      url: '/api/setting-management/emailing',
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  constructor(private restService: RestService) {}
+}

npm/ng-packs/packages/setting-management/config/src/proxy/models.ts → npm/ng-packs/packages/setting-management/config/src/lib/proxy/models.ts

@@ -1,3 +1,4 @@
+
 export interface EmailSettingsDto {
   smtpHost?: string;
   smtpPort: number;
@@ -10,6 +11,13 @@ export interface EmailSettingsDto {
   defaultFromDisplayName?: string;
 }
 
+export interface SendTestEmailInput {
+  senderEmailAddress: string;
+  targetEmailAddress: string;
+  subject: string;
+  body?: string;
+}
+
 export interface UpdateEmailSettingsDto {
   smtpHost?: string;
   smtpPort: number;

npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts → npm/ng-packs/packages/setting-management/config/src/lib/setting-management-config.module.ts

@@ -1,3 +1,4 @@
+import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CoreModule } from '@abp/ng.core';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
@@ -8,7 +9,7 @@ import { SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS } from './providers/setting-ta
 import { EmailSettingGroupComponent } from './components/email-setting-group/email-setting-group.component';
 
 @NgModule({
-  imports: [CoreModule, NgxValidateCoreModule],
+  imports: [CoreModule,ThemeSharedModule,NgxValidateCoreModule],
   declarations: [EmailSettingGroupComponent],
   exports: [EmailSettingGroupComponent],
 })

npm/ng-packs/packages/setting-management/config/src/proxy/email-settings.service.ts

@@ -1,31 +0,0 @@
-import type { EmailSettingsDto, UpdateEmailSettingsDto } from './models';
-import { RestService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmailSettingsService {
-  apiName = 'SettingManagement';
-
-  get = () =>
-    this.restService.request<any, EmailSettingsDto>(
-      {
-        method: 'GET',
-        url: '/api/setting-management/emailing',
-      },
-      { apiName: this.apiName },
-    );
-
-  update = (input: UpdateEmailSettingsDto) =>
-    this.restService.request<any, void>(
-      {
-        method: 'POST',
-        url: '/api/setting-management/emailing',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

npm/ng-packs/packages/setting-management/config/src/public-api.ts

@@ -1,6 +1,6 @@
-export * from './components/email-setting-group/email-setting-group.component';
+export * from './lib/components/email-setting-group/email-setting-group.component';
-export * from './enums';
+export * from './lib/enums';
-export * from './providers';
+export * from './lib/providers';
-export * from './proxy';
+export * from './lib/proxy';
-export * from './services';
+export * from './lib/services';
-export * from './setting-management-config.module';
+export * from './lib/setting-management-config.module';

npm/ng-packs/scripts/copy-packages-to-templates.ts

@@ -1,8 +1,10 @@
 import execa from 'execa';
 import fse from 'fs-extra';
 import fs from 'fs';
+import program from 'commander';
 
-const templates = ['app', 'app-nolayers', 'module'];
+const defaultTemplates = ['app', 'app-nolayers', 'module'];
+const defaultTemplatePath = '../../../templates';
 const packageMap = {
   account: 'ng.account',
   'account-core': 'ng.account.core',
@@ -16,7 +18,11 @@ const packageMap = {
   'theme-basic': 'ng.theme.basic',
   'theme-shared': 'ng.theme.shared',
 };
-
+program.option('-t, --templates  <templates>', 'template dirs', false);
+program.option('-p, --template-path <templatePath>', 'root template path', false);
+program.parse(process.argv);
+const templates = program.templates ? program.templates.split(',') : defaultTemplates;
+const templateRootPath = program.templatePath ? program.templatePath : defaultTemplatePath;
 (async () => {
   await execa('yarn', ['build'], {
     stdout: 'inherit',
@@ -33,7 +39,7 @@ async function runEachTemplate(
   handler: (template: string, templatePath?: string) => void | Promise<any>,
 ) {
   for (var template of templates) {
-    const templatePath = `../../../templates/${template}/angular`;
+    const templatePath = `${templateRootPath}/${template}/angular`;
     const result = handler(template, templatePath);
     result instanceof Promise ? await result : result;
   }