Add support mobile application title in predefined config

application/src/main/data/upgrade/basic/schema_update.sql

@@ -35,3 +35,5 @@ DROP INDEX IF EXISTS idx_customer_external_id;
 DROP INDEX IF EXISTS idx_widgets_bundle_external_id;
 
 -- DROP INDEXES THAT DUPLICATE UNIQUE CONSTRAINT END
+
+ALTER TABLE mobile_app ADD COLUMN IF NOT EXISTS pkg_title varchar(255);

common/data/src/main/java/org/thingsboard/server/common/data/mobile/app/MobileApp.java

@@ -43,6 +43,9 @@ public class MobileApp extends BaseData<MobileAppId> implements HasTenantId, Has
     @NotBlank
     @Length(fieldName = "pkgName")
     private String pkgName;
+    @Schema(description = "Application package title")
+    @Length(fieldName = "pkgTitle")
+    private String pkgTitle;
     @Schema(description = "Application secret. The length must be at least 16 characters", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty
     @Length(fieldName = "appSecret", min = 16, max = 2048, message = "must be at least 16 and max 2048 characters")
@@ -72,6 +75,7 @@ public class MobileApp extends BaseData<MobileAppId> implements HasTenantId, Has
         super(mobile);
         this.tenantId = mobile.tenantId;
         this.pkgName = mobile.pkgName;
+        this.pkgTitle = mobile.pkgTitle;
         this.appSecret = mobile.appSecret;
         this.platformType = mobile.platformType;
         this.status = mobile.status;

dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java

@@ -457,6 +457,7 @@ public class ModelConstants {
      */
     public static final String MOBILE_APP_TABLE_NAME = "mobile_app";
     public static final String MOBILE_APP_PKG_NAME_PROPERTY = "pkg_name";
+    public static final String MOBILE_APP_PKG_TITLE_PROPERTY = "pkg_title";
     public static final String MOBILE_APP_APP_SECRET_PROPERTY = "app_secret";
     public static final String MOBILE_APP_PLATFORM_TYPE_PROPERTY = "platform_type";
     public static final String MOBILE_APP_STATUS_PROPERTY = "status";

dao/src/main/java/org/thingsboard/server/dao/model/sql/MobileAppEntity.java

@@ -53,6 +53,9 @@ public class MobileAppEntity extends BaseSqlEntity<MobileApp> {
     @Column(name = ModelConstants.MOBILE_APP_PKG_NAME_PROPERTY)
     private String pkgName;
 
+    @Column(name = ModelConstants.MOBILE_APP_PKG_TITLE_PROPERTY)
+    private String pkgTitle;
+
     @Column(name = ModelConstants.MOBILE_APP_APP_SECRET_PROPERTY)
     private String appSecret;
 
@@ -82,6 +85,7 @@ public class MobileAppEntity extends BaseSqlEntity<MobileApp> {
             this.tenantId = mobile.getTenantId().getId();
         }
         this.pkgName = mobile.getPkgName();
+        this.pkgTitle = mobile.getPkgTitle();
         this.appSecret = mobile.getAppSecret();
         this.platformType = mobile.getPlatformType();
         this.status = mobile.getStatus();
@@ -98,6 +102,7 @@ public class MobileAppEntity extends BaseSqlEntity<MobileApp> {
         }
         mobile.setCreatedTime(createdTime);
         mobile.setPkgName(pkgName);
+        mobile.setPkgTitle(pkgTitle);
         mobile.setAppSecret(appSecret);
         mobile.setPlatformType(platformType);
         mobile.setStatus(status);

dao/src/main/resources/sql/schema-entities.sql

@@ -626,6 +626,7 @@ CREATE TABLE IF NOT EXISTS mobile_app (
     created_time bigint NOT NULL,
     tenant_id uuid,
     pkg_name varchar(255),
+    pkg_title varchar(255),
     app_secret varchar(2048),
     platform_type varchar(32),
     status varchar(32),

ui-ngx/src/app/modules/home/pages/mobile/applications/mobile-app-table-config.resolver.ts

@@ -83,6 +83,7 @@ export class MobileAppTableConfigResolver  {
           onAction: (_$event, entity) => entity.pkgName,
           type: CellActionDescriptorType.COPY_BUTTON
         }),
+      new EntityTableColumn<MobileApp>('pkgTitle', 'mobile.mobile-package-title', '20%'),
       new EntityTableColumn<MobileApp>('appSecret', 'mobile.application-secret', '15%',
         (entity) => this.truncatePipe.transform(entity.appSecret, true, 10, '…'), () => ({}),
         true, () => ({}), () => undefined, false,

ui-ngx/src/app/modules/home/pages/mobile/applications/mobile-app.component.html

@@ -38,6 +38,14 @@
       {{ 'mobile.mobile-package-pattern' | translate }}
     </mat-error>
   </mat-form-field>
+  <mat-form-field appearance="outline" subscriptSizing="dynamic">
+    <mat-label translate>mobile.mobile-package-title</mat-label>
+    <input matInput formControlName="pkgTitle">
+    <mat-hint></mat-hint>
+    <mat-error *ngIf="entityForm.get('pkgName').hasError('maxlength')">
+      {{ 'mobile.mobile-package-title-max-length' | translate }}
+    </mat-error>
+  </mat-form-field>
   <mat-form-field appearance="outline" class="flex">
     <mat-label translate>mobile.platform-type</mat-label>
     <mat-select formControlName="platformType">

ui-ngx/src/app/modules/home/pages/mobile/applications/mobile-app.component.ts

@@ -63,9 +63,10 @@ export class MobileAppComponent extends EntityComponent<MobileApp> {
 
   buildForm(entity: MobileApp): FormGroup {
     const form = this.fb.group({
-      pkgName: [entity?.pkgName ? entity.pkgName : '', [Validators.required, Validators.maxLength(255),
+      pkgName: [entity?.pkgName ?? '', [Validators.required, Validators.maxLength(255),
         Validators.pattern(/^[a-zA-Z][a-zA-Z\d_]*(?:\.[a-zA-Z][a-zA-Z\d_]*)+$/)]],
-      platformType: [entity?.platformType ? entity.platformType : PlatformType.ANDROID],
+      pkgTitle: [entity?.pkgTitle ?? '', [Validators.maxLength(255)]],
+      platformType: [entity?.platformType ?? PlatformType.ANDROID],
       appSecret: [entity?.appSecret ? entity.appSecret : btoa(randomAlphanumeric(64)), [Validators.required, this.base64Format]],
       status: [entity?.status ? entity.status : MobileAppStatus.DRAFT],
       versionInfo: this.fb.group({

ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-app-configuration-dialog.component.ts

@@ -28,6 +28,7 @@ export interface MobileAppConfigurationDialogData {
   afterAdd: boolean;
   androidApp: MobileApp;
   iosApp: MobileApp;
+  bundleTitle: string;
 }
 
 @Component({
@@ -37,13 +38,13 @@ export interface MobileAppConfigurationDialogData {
 })
 export class MobileAppConfigurationDialogComponent extends DialogComponent<MobileAppConfigurationDialogComponent> {
 
-  private fileName = 'configs.json';
+  private fileName = 'configs';
 
   notShowAgain = false;
   showDontShowAgain: boolean;
 
   gitRepositoryLink = 'git clone -b master https://github.com/thingsboard/flutter_thingsboard_app.git';
-  flutterRunCommand = `flutter run --dart-define-from-file ${this.fileName}`;
+  flutterRunCommand = `flutter run --dart-define-from-file ${this.fileName}.json`;
 
   constructor(protected store: Store<AppState>,
               protected router: Router,
@@ -74,11 +75,13 @@ export class MobileAppConfigurationDialogComponent extends DialogComponent<Mobil
     };
     if (!!this.data.androidApp) {
       settings.androidApplicationId = this.data.androidApp.pkgName;
+      settings.androidApplicationName = this.data.androidApp.pkgTitle ?? this.data.bundleTitle;
       settings.thingsboardOAuth2CallbackUrlScheme = this.data.androidApp.pkgName + '.auth';
       settings.thingsboardAndroidAppSecret = this.data.androidApp.appSecret;
     }
     if (!!this.data.iosApp) {
       settings.iosApplicationId = this.data.iosApp.pkgName;
+      settings.iosApplicationName = this.data.iosApp.pkgTitle ?? this.data.bundleTitle;
       settings.thingsboardIOSAppSecret = this.data.iosApp.appSecret;
     }
     this.importExportService.exportJson(settings, this.fileName);

ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-table-config.resolve.ts

@@ -182,7 +182,8 @@ export class MobileBundleTableConfigResolver {
         data: {
           afterAdd,
           androidApp: data.androidApp,
-          iosApp: data.iosApp
+          iosApp: data.iosApp,
+          bundleTitle: entity.title
         }
       }).afterClosed()
         .subscribe();

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

@@ -85,6 +85,7 @@ export interface StoreInfo {
 
 export interface MobileApp extends BaseData<MobileAppId>, HasTenantId {
   pkgName: string;
+  pkgTitle?: string;
   appSecret: string;
   platformType: PlatformType;
   status: MobileAppStatus;

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -3767,6 +3767,8 @@
         "mobile-package-max-length": "Application package should be less than 256",
         "mobile-package-required": "Application package is required.",
         "mobile-package-pattern": "Application package invalid format",
+        "mobile-package-title": "Application title",
+        "mobile-package-title-max-length": "Application title should be less than 256",
         "no-application": "No applications found",
         "no-bundles": "No bundles found",
         "platform-type": "Platform type",