Merge pull request #18835 from abpframework/auto-merge/rel-8-0/2441

Merge branch dev with rel-8.0

modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs

@@ -58,6 +58,11 @@ public class ProfileAppService : IdentityAppServiceBase, IProfileAppService
             }
         }
 
+        if (user.PhoneNumber.IsNullOrWhiteSpace() && input.PhoneNumber.IsNullOrWhiteSpace())
+        {
+            input.PhoneNumber = user.PhoneNumber;
+        }
+
         if (!string.Equals(user.PhoneNumber, input.PhoneNumber, StringComparison.InvariantCultureIgnoreCase))
         {
             (await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();

modules/account/test/Volo.Abp.Account.Application.Tests/Volo/Abp/Account/ProfileAppService_Tests.cs

@@ -73,6 +73,36 @@ public class ProfileAppService_Tests : AbpAccountApplicationTestBase
         result.Name.ShouldBe(input.Name);
     }
 
+    [Fact]
+    public async Task Should_Not_UpdatePhoneNumber_If_Input_PhoneNumber_IsNullOrWhiteSpace_Test()
+    {
+        //Arrange
+        _currentUser.Id.Returns(_testData.UserJohnId);
+        _currentUser.IsAuthenticated.Returns(true);
+
+        //Act
+        var result = await _profileAppService.UpdateAsync(new UpdateProfileDto
+        {
+            UserName = CreateRandomString(),
+            Email = CreateRandomEmail(),
+            PhoneNumber = ""
+        });
+
+        //Assert
+        result.PhoneNumber.ShouldBe(null);
+
+        //Act
+        result = await _profileAppService.UpdateAsync(new UpdateProfileDto
+        {
+            UserName = CreateRandomString(),
+            Email = CreateRandomEmail(),
+            PhoneNumber = "123"
+        });
+
+        //Assert
+        result.PhoneNumber.ShouldBe("123");
+    }
+
     [Fact]
     public async Task ChangePasswordAsync_FailsForSamePassword()
     {

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Nejsou zde dostupné žádné funkce.",
     "ManageHostFeatures": "Správa funkcí hostitele",
     "ManageHostFeaturesText": "Funkce na straně hostitele můžete spravovat kliknutím na následující tlačítko.",
-    "Permission:FeatureManagement": "Správa funkcí",
+    "Permission:FeatureManagement": "Správa Funkcí",
     "Permission:FeatureManagement.ManageHostFeatures": "Správa funkcí hostitele",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Hodnota funkce {0} není platná!",
     "Menu:FeatureManagement": "Správa Funkcí",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json

@@ -4,7 +4,7 @@
     "Features": "Features",
     "NoFeatureFoundMessage": "There isn't any available feature.",
     "ManageHostFeatures": "Manage Host features",
-    "Permission:FeatureManagement": "Feature management",
+    "Permission:FeatureManagement": "Feature Management",
     "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} feature value is not valid!",
     "Menu:FeatureManagement": "Feature Management",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "No hay ninguna característica disponible.",
     "ManageHostFeatures": "Administrar funciones de host",
     "ManageHostFeaturesText": "Puede administrar las funciones del lado del host haciendo clic en el siguiente botón.",
-    "Permission:FeatureManagement": "Gestión de características",
+    "Permission:FeatureManagement": "Gestión de Características",
     "Permission:FeatureManagement.ManageHostFeatures": "Gestionar características del Host",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} valor de característica no es valido!",
     "Menu:FeatureManagement": "Gestión de características",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Käytettävissä olevia ominaisuuksia ei löydy.",
     "ManageHostFeatures": "Hallinnoi isäntäominaisuuksia",
     "ManageHostFeaturesText": "Voit hallita isäntäpuolen ominaisuuksia napsauttamalla seuraavaa painiketta.",
-    "Permission:FeatureManagement": "Ominaisuuden hallinta",
+    "Permission:FeatureManagement": "Ominaisuuden Hallinta",
     "Permission:FeatureManagement.ManageHostFeatures": "Hallinnoi isäntäominaisuuksia",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Ominaisuuden {0} arvo ei kelpaa!",
     "Menu:FeatureManagement": "Ominaisuuden hallinta",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Il n'y a aucune fonctionnalité disponible.",
     "ManageHostFeatures": "Gérer les fonctionnalités de l’hôte",
     "ManageHostFeaturesText": "Vous pouvez gérer les fonctionnalités côté hôte en cliquant sur le bouton suivant.",
-    "Permission:FeatureManagement": "Gestion des fonctionnalités",
+    "Permission:FeatureManagement": "Gestion des Fonctionnalités",
     "Permission:FeatureManagement.ManageHostFeatures": "Gérer les fonctionnalités de l'hôte",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "La valeur de la fonctionnalité {0} n'est pas valide!",
     "Menu:FeatureManagement": "Gestion des fonctionnalités",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hr.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Ne postoji nijedna dostupna značajka.",
     "ManageHostFeatures": "Upravljanje značajkama domaćina",
     "ManageHostFeaturesText": "Možete upravljati značajkama strane domaćina klikom na sljedeći gumb.",
-    "Permission:FeatureManagement": "Upravljanje značajkama",
+    "Permission:FeatureManagement": "Upravljanje Značajkama",
     "Permission:FeatureManagement.ManageHostFeatures": "Upravljanje značajkama domaćina",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Vrijednost značajke {0} nije važeća!",
     "Menu:FeatureManagement": "Upravljanje značajkama",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Non ci sono funzioni disponibili.",
     "ManageHostFeatures": "Gestisci le funzionalità dell'host",
     "ManageHostFeaturesText": "È possibile gestire le funzionalità lato host facendo clic sul pulsante seguente.",
-    "Permission:FeatureManagement": "Gestione funzionalità",
+    "Permission:FeatureManagement": "Gestione Funzionalità",
     "Permission:FeatureManagement.ManageHostFeatures": "Gestisci le funzionalità dell'host",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Il valore dell'elemento {0} non è valido!",
     "Menu:FeatureManagement": "Gestione delle funzionalità",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Brak dostępnej funkcji.",
     "ManageHostFeatures": "Zarządzaj funkcjami hosta",
     "ManageHostFeaturesText": "Możesz zarządzać funkcjami po stronie hosta, klikając poniższy przycisk.",
-    "Permission:FeatureManagement": "Zarządzanie funkcjami",
+    "Permission:FeatureManagement": "Zarządzanie Funkcjami",
     "Permission:FeatureManagement.ManageHostFeatures": "Zarządzaj funkcjami hosta",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} wartość funkcji jest nieprawidłowa!",
     "Menu:FeatureManagement": "Zarządzanie funkcjami",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Não há nenhuma funcionalidade disponivel.",
     "ManageHostFeatures": "Gerenciar recursos do Host",
     "ManageHostFeaturesText": "Você pode gerenciar os recursos do host clicando no botão a seguir.",
-    "Permission:FeatureManagement": "Gerenciamento de recursos",
+    "Permission:FeatureManagement": "Gerenciamento de Recursos",
     "Permission:FeatureManagement.ManageHostFeatures": "Gerenciar recursos do Host",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "O valor do recurso {0} não é válido!",
     "Menu:FeatureManagement": "Gerenciamento de recursos",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Nu există nicio caracteristică disponibilă.",
     "ManageHostFeatures": "Administraţi caracteristicile de host",
     "ManageHostFeaturesText": "Puteți gestiona funcțiile din partea gazdă făcând clic pe următorul buton.",
-    "Permission:FeatureManagement": "Administrare caracteristici",
+    "Permission:FeatureManagement": "Administrare Caracteristici",
     "Permission:FeatureManagement.ManageHostFeatures": "Gestionare caracteristici gazdă",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Valoarea {0} a caracteristicii nu este validă!",
     "Menu:FeatureManagement": "Managementul caracteristicilor",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Nie je k dispozícii žiadna funkcia.",
     "ManageHostFeatures": "Spravovať funkcie poskytovateľa",
     "ManageHostFeaturesText": "Funkcie na strane hostiteľa môžete spravovať kliknutím na nasledujúce tlačidlo.",
-    "Permission:FeatureManagement": "Správa funkcií",
+    "Permission:FeatureManagement": "Správa Funkcií",
     "Permission:FeatureManagement.ManageHostFeatures": "Správa funkcií poskytovateľa",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Hodnota funkcie {0} nie je platná!",
     "Menu:FeatureManagement": "Správa funkcií",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Na voljo ni nobene funkcionalnosti.",
     "ManageHostFeatures": "Upravljajte funkcije gostitelja",
     "ManageHostFeaturesText": "Funkcije gostiteljske strani lahko upravljate s klikom na naslednji gumb.",
-    "Permission:FeatureManagement": "Upravljanje funkcij",
+    "Permission:FeatureManagement": "Upravljanje Funkcij",
     "Permission:FeatureManagement.ManageHostFeatures": "Upravljajte funkcije gostitelja",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Vrednost funkcije {0} ni veljavna!",
     "Menu:FeatureManagement": "Upravljanje funkcij",

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json

@@ -5,7 +5,7 @@
     "NoFeatureFoundMessage": "Hiç özellik yok.",
     "ManageHostFeatures": "Host özelliklerini yönetin",
     "ManageHostFeaturesText": "Aşağıdaki butona tıklayarak host özelliklerini yönetebilirsiniz.",
-    "Permission:FeatureManagement": "Özellik yönetimi",
+    "Permission:FeatureManagement": "Özellik Yönetimi",
     "Permission:FeatureManagement.ManageHostFeatures": "Host özelliklerini düzenle",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} özellik değeri geçerli değil!",
     "Menu:FeatureManagement": "Özellik Yönetimi",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Úspěšně odesláno",
     "Send": "Poslat",
     "Menu:Emailing": "Zasílání e-mailem",
-    "Menu:TimeZone": "Časové pásmo",
+    "Menu:TimeZone": "Časové Pásmo",
     "DisplayName:Timezone": "Časové pásmo",
     "TimezoneHelpText": "Toto nastavení se používá pro celou aplikaci nebo pro klienty.",
     "SmtpHost": "Hostitel",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Successfully sent",
     "Send": "Send",
     "Menu:Emailing": "Emailing",
-    "Menu:TimeZone": "Time zone",
+    "Menu:TimeZone": "Time Zone",
     "DisplayName:Timezone": "Time zone",
     "TimezoneHelpText": "This setting is used for application-wide or tenant-based.",
     "SmtpHost": "Host",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Enviado exitosamente",
     "Send": "Enviar",
     "Menu:Emailing": "Configuración",
-    "Menu:TimeZone": "Zona horaria",
+    "Menu:TimeZone": "Zona Horaria",
     "DisplayName:Timezone": "Zona horaria",
     "TimezoneHelpText": "Esta configuración se utiliza para toda la aplicación o basada en inquilinos.",
     "SmtpHost": "Host",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Envoyé avec succès",
     "Send": "Envoyer",
     "Menu:Emailing": "Envoi par e-mail",
-    "Menu:TimeZone": "Fuseau horaire",
+    "Menu:TimeZone": "Fuseau Horaire",
     "DisplayName:Timezone": "Fuseau horaire",
     "TimezoneHelpText": "Ce paramètre est utilisé à l’échelle de l’application ou basé sur le client.",
     "SmtpHost": "Hôte",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hr.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Uspješno poslano",
     "Send": "Poslati",
     "Menu:Emailing": "Slanje e-poštom",
-    "Menu:TimeZone": "Vremenska zona",
+    "Menu:TimeZone": "Vremenska Zona",
     "DisplayName:Timezone": "Vremenska zona",
     "TimezoneHelpText": "Ova se postavka koristi za cijelu aplikaciju ili zakupce.",
     "SmtpHost": "Domaćin",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Inviato con successo",
     "Send": "Inviare",
     "Menu:Emailing": "Invio di e-mail",
-    "Menu:TimeZone": "Fuso orario",
+    "Menu:TimeZone": "Fuso Orario",
     "DisplayName:Timezone": "Fuso orario",
     "TimezoneHelpText": "Questa impostazione viene utilizzata per l'intera applicazione o in base al tenant.",
     "SmtpHost": "Host",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Pomyślnie wysłane",
     "Send": "Wysłać",
     "Menu:Emailing": "Wysyłanie e-maili",
-    "Menu:TimeZone": "Strefa czasowa",
+    "Menu:TimeZone": "Strefa Czasowa",
     "DisplayName:Timezone": "Strefa czasowa",
     "TimezoneHelpText": "To ustawienie jest używane w przypadku całej aplikacji lub opartej na dzierżawie.",
     "SmtpHost": "Gospodarz",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Enviado com sucesso",
     "Send": "Enviar",
     "Menu:Emailing": "Enviando por e-mail",
-    "Menu:TimeZone": "Fuso horário",
+    "Menu:TimeZone": "Fuso Horário",
     "DisplayName:Timezone": "Fuso horário",
     "TimezoneHelpText": "Essa configuração é usada para todo o aplicativo ou com base em locatário.",
     "SmtpHost": "Hospedeiro",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Trimis cu succes",
     "Send": "Trimite",
     "Menu:Emailing": "Emailing",
-    "Menu:TimeZone": "Fus orar",
+    "Menu:TimeZone": "Fus Orar",
     "DisplayName:Timezone": "Fus orar",
     "TimezoneHelpText": "Această setare este utilizată pentru aplicație sau pentru chiriași.",
     "SmtpHost": "Host",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Úspešne odoslané",
     "Send": "Odoslať",
     "Menu:Emailing": "Posielanie emailov",
-    "Menu:TimeZone": "Časové pásmo",
+    "Menu:TimeZone": "Časové Pásmo",
     "DisplayName:Timezone": "Časové pásmo",
     "TimezoneHelpText": "Toto nastavenie sa používa pre celú aplikáciu alebo pre nájomníkov.",
     "SmtpHost": "Host",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Uspešno poslano",
     "Send": "Pošlji",
     "Menu:Emailing": "Pošiljanje po e-pošti",
-    "Menu:TimeZone": "Časovni pas",
+    "Menu:TimeZone": "Časovni Pas",
     "DisplayName:Timezone": "Časovni pas",
     "TimezoneHelpText": "Ta nastavitev se uporablja za celotno aplikacijo ali za najemnika.",
     "SmtpHost": "Gostitelj",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Başarıyla gönderildi",
     "Send": "Gönder",
     "Menu:Emailing": "Email",
-    "Menu:TimeZone": "Zaman dilimi",
+    "Menu:TimeZone": "Zaman Dilimi",
     "DisplayName:Timezone": "Zaman dilimi",
     "TimezoneHelpText": "Bu ayar uygulama genelinde veya kiracı tabanlı olarak kullanılır.",
     "SmtpHost": "Sunucu",

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json

@@ -17,7 +17,7 @@
     "SuccessfullySent": "Đã gửi thành công",
     "Send": "Gửi",
     "Menu:Emailing": "Gửi email",
-    "Menu:TimeZone": "Múi giờ",
+    "Menu:TimeZone": "Múi Giờ",
     "DisplayName:Timezone": "Múi giờ",
     "TimezoneHelpText": "Cài đặt này được sử dụng cho toàn bộ ứng dụng hoặc dựa trên đối tượng thuê.",
     "SmtpHost": "Tổ chức",

npm/ng-packs/packages/components/tree/src/lib/components/tree.component.scss

@@ -43,8 +43,4 @@ abp-tree .ant-tree {
     top: 1px;
     cursor: pointer;
   }
-
-  .ant-tree-checkbox-inner{
-    background-color: transparent;
-  }
 }