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

UI: Fixed double open dialog when edit mobile bundle

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-12-05 11:23:51 +02:00
parent c2f7e20d42
commit 143d5a95b3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,13 +24,13 @@ import {
EntityTableConfig EntityTableConfig
} from '@home/models/entity/entities-table-config.models'; } from '@home/models/entity/entities-table-config.models';
import { MobileAppBundleInfo } from '@shared/models/mobile-app.models'; import { MobileAppBundleInfo } from '@shared/models/mobile-app.models';
import { ActivatedRouteSnapshot } from '@angular/router'; import { ActivatedRouteSnapshot, Router } from '@angular/router';
import { EntityType, entityTypeResources, entityTypeTranslations } from '@shared/models/entity-type.models'; import { EntityType, entityTypeResources, entityTypeTranslations } from '@shared/models/entity-type.models';
import { Direction } from '@shared/models/page/sort-order'; import { Direction } from '@shared/models/page/sort-order';
import { MobileBundleTableHeaderComponent } from '@home/pages/mobile/bundes/mobile-bundle-table-header.component'; import { MobileBundleTableHeaderComponent } from '@home/pages/mobile/bundes/mobile-bundle-table-header.component';
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { MobileAppService } from '@core/http/mobile-app.service'; import { MobileAppService } from '@core/http/mobile-app.service';
import { map, take } from 'rxjs/operators'; import { finalize, map, skip, take, takeUntil } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { EntityAction } from '@home/models/entity/entity-component.models'; import { EntityAction } from '@home/models/entity/entity-component.models';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
@ -52,11 +52,14 @@ export class MobileBundleTableConfigResolver {
private readonly config: EntityTableConfig<MobileAppBundleInfo> = new EntityTableConfig<MobileAppBundleInfo>(); private readonly config: EntityTableConfig<MobileAppBundleInfo> = new EntityTableConfig<MobileAppBundleInfo>();
private openingEditDialog = false;
constructor( constructor(
private datePipe: DatePipe, private datePipe: DatePipe,
private mobileAppService: MobileAppService, private mobileAppService: MobileAppService,
private translate : TranslateService, private translate : TranslateService,
private dialog: MatDialog, private dialog: MatDialog,
private router: Router,
private store: Store<AppState> private store: Store<AppState>
) { ) {
this.config.selectionEnabled = false; this.config.selectionEnabled = false;
@ -108,9 +111,15 @@ export class MobileBundleTableConfigResolver {
this.config.handleRowClick = ($event, bundle) => { this.config.handleRowClick = ($event, bundle) => {
$event?.stopPropagation(); $event?.stopPropagation();
this.mobileAppService.getMobileAppBundleInfoById(bundle.id.id).subscribe(appBundleInfo => { if (!this.openingEditDialog) {
this.editBundle($event, appBundleInfo); this.openingEditDialog = true;
}) this.mobileAppService.getMobileAppBundleInfoById(bundle.id.id).pipe(
takeUntil(this.router.events.pipe(skip(1))),
finalize(() => {this.openingEditDialog = false;})
).subscribe(
appBundleInfo => this.editBundle($event, appBundleInfo)
);
}
return true; return true;
}; };