UI: Fixed typo in mobile; Add app link constants
This commit is contained in:
		
							parent
							
								
									3a441567d9
								
							
						
					
					
						commit
						d7d936af76
					
				@ -21,7 +21,7 @@ import { AppState } from '@core/core.state';
 | 
			
		||||
import { Router } from '@angular/router';
 | 
			
		||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 | 
			
		||||
import { ActionPreferencesPutUserSettings } from '@core/auth/auth.actions';
 | 
			
		||||
import { MobileApp } from '@shared/models/mobile-app.models';
 | 
			
		||||
import { MobileApp, MobileAppBundleInfo } from '@shared/models/mobile-app.models';
 | 
			
		||||
import { ImportExportService } from '@shared/import-export/import-export.service';
 | 
			
		||||
import { isNotEmptyStr } from '@core/utils';
 | 
			
		||||
 | 
			
		||||
@ -29,7 +29,7 @@ export interface MobileAppConfigurationDialogData {
 | 
			
		||||
  afterAdd: boolean;
 | 
			
		||||
  androidApp: MobileApp;
 | 
			
		||||
  iosApp: MobileApp;
 | 
			
		||||
  bundleTitle: string;
 | 
			
		||||
  bundle: MobileAppBundleInfo;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
@ -72,18 +72,20 @@ export class MobileAppConfigurationDialogComponent extends DialogComponent<Mobil
 | 
			
		||||
 | 
			
		||||
  downloadSettings(): void {
 | 
			
		||||
    const settings: any = {
 | 
			
		||||
      thingsBoardApiEndpoint: window.location.origin
 | 
			
		||||
      thingsboardApiEndpoint: window.location.origin,
 | 
			
		||||
      appLinksUrlHost: window.location.host,
 | 
			
		||||
      appLinksUrlScheme: window.location.protocol.slice(0, -1),
 | 
			
		||||
    };
 | 
			
		||||
    if (!!this.data.androidApp) {
 | 
			
		||||
      settings.androidApplicationId = this.data.androidApp.pkgName;
 | 
			
		||||
      settings.androidApplicationName = isNotEmptyStr(this.data.androidApp.title) ? this.data.androidApp.title : this.data.bundleTitle;
 | 
			
		||||
      settings.androidApplicationName = isNotEmptyStr(this.data.androidApp.title) ? this.data.androidApp.title : this.data.bundle.title;
 | 
			
		||||
      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 = isNotEmptyStr(this.data.iosApp.title) ? this.data.iosApp.title : this.data.bundleTitle;
 | 
			
		||||
      settings.thingsboardIOSAppSecret = this.data.iosApp.appSecret;
 | 
			
		||||
      settings.iosApplicationName = isNotEmptyStr(this.data.iosApp.title) ? this.data.iosApp.title : this.data.bundle.title;
 | 
			
		||||
      settings.thingsboardIosAppSecret = this.data.iosApp.appSecret;
 | 
			
		||||
    }
 | 
			
		||||
    this.importExportService.exportJson(settings, this.fileName);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@ -183,7 +183,7 @@ export class MobileBundleTableConfigResolver {
 | 
			
		||||
          afterAdd,
 | 
			
		||||
          androidApp: data.androidApp,
 | 
			
		||||
          iosApp: data.iosApp,
 | 
			
		||||
          bundleTitle: entity.title
 | 
			
		||||
          bundle: entity
 | 
			
		||||
        }
 | 
			
		||||
      }).afterClosed()
 | 
			
		||||
        .subscribe();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user