dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Fixed typo in mobile; Add app link constants

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2025-07-17 11:13:18 +03:00
parent 3a441567d9
commit d7d936af76
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ import { AppState } from '@core/core.state';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { ActionPreferencesPutUserSettings } from '@core/auth/auth.actions'; 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 { ImportExportService } from '@shared/import-export/import-export.service';
import { isNotEmptyStr } from '@core/utils'; import { isNotEmptyStr } from '@core/utils';
@ -29,7 +29,7 @@ export interface MobileAppConfigurationDialogData {
afterAdd: boolean; afterAdd: boolean;
androidApp: MobileApp; androidApp: MobileApp;
iosApp: MobileApp; iosApp: MobileApp;
bundleTitle: string; bundle: MobileAppBundleInfo;
} }
@Component({ @Component({
@ -72,18 +72,20 @@ export class MobileAppConfigurationDialogComponent extends DialogComponent<Mobil
downloadSettings(): void { downloadSettings(): void {
const settings: any = { 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) { if (!!this.data.androidApp) {
settings.androidApplicationId = this.data.androidApp.pkgName; 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.thingsboardOAuth2CallbackUrlScheme = this.data.androidApp.pkgName + '.auth';
settings.thingsboardAndroidAppSecret = this.data.androidApp.appSecret; settings.thingsboardAndroidAppSecret = this.data.androidApp.appSecret;
} }
if (!!this.data.iosApp) { if (!!this.data.iosApp) {
settings.iosApplicationId = this.data.iosApp.pkgName; settings.iosApplicationId = this.data.iosApp.pkgName;
settings.iosApplicationName = isNotEmptyStr(this.data.iosApp.title) ? this.data.iosApp.title : this.data.bundleTitle; settings.iosApplicationName = isNotEmptyStr(this.data.iosApp.title) ? this.data.iosApp.title : this.data.bundle.title;
settings.thingsboardIOSAppSecret = this.data.iosApp.appSecret; settings.thingsboardIosAppSecret = this.data.iosApp.appSecret;
} }
this.importExportService.exportJson(settings, this.fileName); this.importExportService.exportJson(settings, this.fileName);
} }

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

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