Merge branch 'develop/3.4' into feature/tb-services-refactoring

application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java

@@ -20,6 +20,8 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -68,7 +70,8 @@ public class DeviceProfileImportService extends BaseEntityImportService<DevicePr
         otaPackageStateService.update(savedDeviceProfile,
                 oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getFirmwareId(), savedDeviceProfile.getFirmwareId()),
                 oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getSoftwareId(), savedDeviceProfile.getSoftwareId()));
-        super.onEntitySaved(user, savedDeviceProfile, oldDeviceProfile);
+        entityNotificationService.notifyCreateOrUpdateOrDelete(savedDeviceProfile.getTenantId(), null,
+                savedDeviceProfile.getId(), savedDeviceProfile, user, oldDeviceProfile == null ? ActionType.ADDED : ActionType.UPDATED, true, null);
     }
 
     @Override

ui-ngx/src/app/shared/components/phone-input.component.html

@@ -19,7 +19,8 @@
 <form [formGroup]="phoneFormGroup">
   <div class="phone-input-container">
     <div class="flags-select-container" *ngIf="enableFlagsSelect">
-      <span class="flag-container">{{ flagIcon }}</span>
+      <span class="flag-container" *ngIf="!isLoad">{{ flagIcon }}</span>
+      <mat-spinner diameter="20" class="flag-loader" *ngIf="isLoad"></mat-spinner>
       <mat-select class="country-select" formControlName="country">
         <mat-option *ngFor="let country of allCountries" [value]="country.iso2">
           <span style="font-size: 20px;">{{country.flag}}</span>

ui-ngx/src/app/shared/components/phone-input.component.scss

@@ -15,6 +15,13 @@
  */
 :host ::ng-deep {
 
+  .flag-loader {
+    position: absolute;
+    top: 50%;
+    left: 0;
+    transform: translate(0, -50%);
+  }
+
   .phone-input-container {
     display: flex;
     align-items: center;

ui-ngx/src/app/shared/components/phone-input.component.ts

@@ -30,7 +30,6 @@ import {
 import { TranslateService } from '@ngx-translate/core';
 import { Country, CountryData } from '@shared/models/country.models';
 import examples from 'libphonenumber-js/examples.mobile.json';
-import { CountryCode, getExampleNumber, parsePhoneNumberFromString } from 'libphonenumber-js';
 import { phoneNumberPattern } from '@shared/models/settings.models';
 import { Subscription } from 'rxjs';
 import { FloatLabelType, MatFormFieldAppearance } from '@angular/material/form-field/form-field';
@@ -59,7 +58,7 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
   disabled: boolean;
 
   @Input()
-  defaultCountry: CountryCode = 'US';
+  defaultCountry = 'US';
 
   @Input()
   enableFlagsSelect = true;
@@ -80,13 +79,29 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
   label = 'phone-input.phone-input-label';
 
   allCountries: Array<Country> = this.countryCodeData.allCountries;
-  phonePlaceholder: string;
+  phonePlaceholder = '+12015550123';
   flagIcon: string;
   phoneFormGroup: FormGroup;
   phoneNumberPattern = phoneNumberPattern;
 
+  private isLoading = true;
+  get isLoad(): boolean {
+    return this.isLoading;
+  }
+
+  set isLoad(value) {
+    if (this.isLoading) {
+      this.isLoading = value;
+      if (this.phoneFormGroup) {
+        this.defineCountryFromNumber(this.phoneFormGroup.get('phoneNumber').value);
+      }
+    }
+  }
+
+  private getExampleNumber;
+  private parsePhoneNumberFromString;
   private baseCode = 127397;
-  private countryCallingCode: string;
+  private countryCallingCode = '+';
   private modelValue: string;
   private valueChange$: Subscription = null;
   private propagateChange = (v: any) => { };
@@ -94,6 +109,10 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
   constructor(private translate: TranslateService,
               private fb: FormBuilder,
               private countryCodeData: CountryData) {
+    import('libphonenumber-js/max').then((libphonenubmer) => {
+      this.parsePhoneNumberFromString = libphonenubmer.parsePhoneNumberFromString;
+      this.getExampleNumber = libphonenubmer.getExampleNumber;
+    }).then(() => this.isLoad = false);
   }
 
   ngOnInit(): void {
@@ -108,13 +127,7 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
 
     this.valueChange$ = this.phoneFormGroup.get('phoneNumber').valueChanges.subscribe(value => {
       this.updateModel();
-      if (value) {
+      this.defineCountryFromNumber(value);
-        const parsedPhoneNumber = parsePhoneNumberFromString(value);
-        const country = this.phoneFormGroup.get('country').value;
-        if (parsedPhoneNumber?.country && parsedPhoneNumber?.country !== country) {
-          this.phoneFormGroup.get('country').patchValue(parsedPhoneNumber.country, {emitEvent: true});
-        }
-      }
     });
 
     this.phoneFormGroup.get('country').valueChanges.subscribe(value => {
@@ -155,9 +168,11 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
   }
 
   private getPhoneNumberData(country): void {
-    const phoneData = getExampleNumber(country, examples);
+    if (this.getExampleNumber) {
-    this.phonePlaceholder = phoneData.number;
+      const phoneData = this.getExampleNumber(country, examples);
-    this.countryCallingCode = '+' + phoneData.countryCallingCode;
+      this.phonePlaceholder = phoneData.number;
+      this.countryCallingCode = `+${this.enableFlagsSelect ? phoneData.countryCallingCode : ''}`;
+    }
   }
 
   private getFlagIcon(countryCode) {
@@ -167,8 +182,8 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
   validatePhoneNumber(): ValidatorFn {
     return (c: FormControl) => {
       const phoneNumber = c.value;
-      if (phoneNumber) {
+      if (phoneNumber && this.parsePhoneNumberFromString) {
-        const parsedPhoneNumber = parsePhoneNumberFromString(phoneNumber);
+        const parsedPhoneNumber = this.parsePhoneNumberFromString(phoneNumber);
         if (!parsedPhoneNumber?.isValid() || !parsedPhoneNumber?.isPossible()) {
           return {
             invalidPhoneNumber: {
@@ -181,6 +196,16 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
     };
   }
 
+  private defineCountryFromNumber(phoneNumber) {
+    if (phoneNumber && this.parsePhoneNumberFromString) {
+      const parsedPhoneNumber = this.parsePhoneNumberFromString(phoneNumber);
+      const country = this.phoneFormGroup.get('country').value;
+      if (parsedPhoneNumber?.country && parsedPhoneNumber?.country !== country) {
+        this.phoneFormGroup.get('country').patchValue(parsedPhoneNumber.country, {emitEvent: true});
+      }
+    }
+  }
+
   validate(): ValidationErrors | null {
     return this.phoneFormGroup.get('phoneNumber').valid ? null : {
       phoneFormGroup: false
@@ -205,8 +230,11 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
 
   writeValue(phoneNumber): void {
     this.modelValue = phoneNumber;
-    const country = phoneNumber ? parsePhoneNumberFromString(phoneNumber)?.country : this.defaultCountry;
+    let country = this.defaultCountry;
-    this.getFlagAndPhoneNumberData(country);
+    if (this.parsePhoneNumberFromString) {
+      country = phoneNumber ? this.parsePhoneNumberFromString(phoneNumber)?.country : this.defaultCountry;
+      this.getFlagAndPhoneNumberData(country);
+    }
     this.phoneFormGroup.patchValue({phoneNumber, country}, {emitEvent: !phoneNumber});
   }
 
@@ -215,7 +243,7 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
     if (phoneNumber.valid && phoneNumber.value) {
       this.modelValue = phoneNumber.value;
       this.propagateChange(this.modelValue);
-    } else {
+    } else if (phoneNumber.invalid && phoneNumber.value) {
       this.propagateChange(null);
     }
   }

ui-ngx/src/app/shared/models/country.models.ts

@@ -357,7 +357,7 @@ export class CountryData {
     {name: 'Gibraltar', iso2: CountryISO.Gibraltar, dialCode: '350', flag: '🇬🇮'},
     {name: 'Greece', iso2: CountryISO.Greece, dialCode: '30', flag: '🇬🇷'},
     {name: 'Greenland', iso2: CountryISO.Greenland, dialCode: '299', flag: '🇬🇱'},
-    {name: 'Grenada', iso2: CountryISO.Grenada, dialCode: '1473', flag: '🇬🇩'},
+    {name: 'Grenada', iso2: CountryISO.Grenada, dialCode: '1', flag: '🇬🇩'},
     {name: 'Guadeloupe', iso2: CountryISO.Guadeloupe, dialCode: '590', flag: '🇬🇵'},
     {name: 'Guam', iso2: CountryISO.Guam, dialCode: '1', flag: '🇬🇺'},
     {name: 'Guatemala', iso2: CountryISO.Guatemala, dialCode: '502', flag: '🇬🇹'},
@@ -432,7 +432,7 @@ export class CountryData {
     {name: 'Niue', iso2: CountryISO.Niue, dialCode: '683', flag: '🇳🇺'},
     {name: 'Norfolk Island', iso2: CountryISO.NorfolkIsland, dialCode: '672', flag: '🇳🇫'},
     {name: 'North Korea', iso2: CountryISO.NorthKorea, dialCode: '850', flag: '🇰🇵'},
-    {name: 'Northern Mariana Islands', iso2: CountryISO.NorthernMarianaIslands, dialCode: '1670', flag: '🇲🇵'},
+    {name: 'Northern Mariana Islands', iso2: CountryISO.NorthernMarianaIslands, dialCode: '1', flag: '🇲🇵'},
     {name: 'Norway', iso2: CountryISO.Norway, dialCode: '47', flag: '🇳🇴'},
     {name: 'Oman', iso2: CountryISO.Oman, dialCode: '968', flag: '🇴🇲'},
     {name: 'Pakistan', iso2: CountryISO.Pakistan, dialCode: '92', flag: '🇵🇰'},
@@ -453,7 +453,7 @@ export class CountryData {
     {name: 'Rwanda', iso2: CountryISO.Rwanda, dialCode: '250', flag: '🇷🇼'},
     {name: 'Saint Barthélemy', iso2: CountryISO.SaintBarthélemy, dialCode: '590', flag: '🇧🇱'},
     {name: 'Saint Helena', iso2: CountryISO.SaintHelena, dialCode: '290', flag: '🇸🇭'},
-    {name: 'Saint Kitts and Nevis', iso2: CountryISO.SaintKittsAndNevis, dialCode: '1869', flag: '🇰🇳'},
+    {name: 'Saint Kitts and Nevis', iso2: CountryISO.SaintKittsAndNevis, dialCode: '1', flag: '🇰🇳'},
     {name: 'Saint Lucia', iso2: CountryISO.SaintLucia, dialCode: '1', flag: '🇱🇨'},
     {name: 'Saint Martin', iso2: CountryISO.SaintMartin, dialCode: '590', flag: '🇲🇫'},
     {name: 'Saint Pierre and Miquelon', iso2: CountryISO.SaintPierreAndMiquelon, dialCode: '508', flag: '🇵🇲'},
@@ -496,7 +496,7 @@ export class CountryData {
     {name: 'Tunisia', iso2: CountryISO.Tunisia, dialCode: '216', flag: '🇹🇳'},
     {name: 'Turkey', iso2: CountryISO.Turkey, dialCode: '90', flag: '🇹🇷'},
     {name: 'Turkmenistan', iso2: CountryISO.Turkmenistan, dialCode: '993', flag: '🇹🇲'},
-    {name: 'Turks and Caicos Islands', iso2: CountryISO.TurksAndCaicosIslands, dialCode: '1649', flag: '🇹🇨'},
+    {name: 'Turks and Caicos Islands', iso2: CountryISO.TurksAndCaicosIslands, dialCode: '1', flag: '🇹🇨'},
     {name: 'Tuvalu', iso2: CountryISO.Tuvalu, dialCode: '688', flag: '🇹🇻'},
     {name: 'U.S. Virgin Islands', iso2: CountryISO.USVirginIslands, dialCode: '1', flag: '🇻🇮'},
     {name: 'Uganda', iso2: CountryISO.Uganda, dialCode: '256', flag: '🇺🇬'},