Browse Source
- New IotHubActionsService with openItemDetail, installItem, updateItem, deleteItem methods returning Observables for dialog results - Service handles all dialog opening, device install flow (fetch zip + dialog), and delete confirmation + API call - Registered as provider in IotHubComponentsModule - Refactored browse component: removed all dialog imports, uses service - Refactored home component: removed dialog imports, uses service - Refactored search component: removed dialog imports, uses service - Removed ~150 lines of duplicated dialog code across 3 componentspull/15508/head
Igor Kulikov
6 months ago
5 changed files with 137 additions and 227 deletions
@ -0,0 +1,103 @@ |
|||||
|
///
|
||||
|
/// Copyright © 2016-2026 The Thingsboard Authors
|
||||
|
///
|
||||
|
/// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
/// you may not use this file except in compliance with the License.
|
||||
|
/// You may obtain a copy of the License at
|
||||
|
///
|
||||
|
/// http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
///
|
||||
|
/// Unless required by applicable law or agreed to in writing, software
|
||||
|
/// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
|
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
|
/// See the License for the specific language governing permissions and
|
||||
|
/// limitations under the License.
|
||||
|
///
|
||||
|
|
||||
|
import { Injectable } from '@angular/core'; |
||||
|
import { MatDialog } from '@angular/material/dialog'; |
||||
|
import { Observable, of, EMPTY } from 'rxjs'; |
||||
|
import { filter, mergeMap } from 'rxjs/operators'; |
||||
|
import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; |
||||
|
import { ItemType } from '@shared/models/iot-hub/iot-hub-item.models'; |
||||
|
import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; |
||||
|
import { IotHubApiService } from '@core/http/iot-hub-api.service'; |
||||
|
import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData, IotHubItemDetailDialogMode } from './iot-hub-item-detail-dialog.component'; |
||||
|
import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; |
||||
|
import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; |
||||
|
import { TbIotHubDeleteDialogComponent, IotHubDeleteDialogData } from './iot-hub-delete-dialog.component'; |
||||
|
import { TbDeviceInstallDialogComponent, DeviceInstallDialogData } from './device-install-dialog/device-install-dialog.component'; |
||||
|
|
||||
|
@Injectable() |
||||
|
export class IotHubActionsService { |
||||
|
|
||||
|
constructor( |
||||
|
private dialog: MatDialog, |
||||
|
private iotHubApiService: IotHubApiService |
||||
|
) {} |
||||
|
|
||||
|
openItemDetail(item: MpItemVersionView, installedItem?: IotHubInstalledItem, mode?: IotHubItemDetailDialogMode): Observable<any> { |
||||
|
return this.dialog.open(TbIotHubItemDetailDialogComponent, { |
||||
|
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], |
||||
|
autoFocus: false, |
||||
|
data: { item, installedItem, mode } as IotHubItemDetailDialogData |
||||
|
}).afterClosed(); |
||||
|
} |
||||
|
|
||||
|
installItem(item: MpItemVersionView): Observable<string> { |
||||
|
if (item.type === ItemType.DEVICE) { |
||||
|
return this.installDevice(item); |
||||
|
} |
||||
|
return this.dialog.open(TbIotHubInstallDialogComponent, { |
||||
|
panelClass: ['tb-dialog'], |
||||
|
autoFocus: false, |
||||
|
data: { item } as IotHubInstallDialogData |
||||
|
}).afterClosed(); |
||||
|
} |
||||
|
|
||||
|
updateItem(item: MpItemVersionView, installedItem: IotHubInstalledItem): Observable<string> { |
||||
|
if (!installedItem) { |
||||
|
return EMPTY; |
||||
|
} |
||||
|
return this.dialog.open(TbIotHubUpdateDialogComponent, { |
||||
|
panelClass: ['tb-dialog'], |
||||
|
autoFocus: false, |
||||
|
data: { |
||||
|
installedItemId: installedItem.id.id, |
||||
|
itemName: item.name, |
||||
|
itemType: item.type, |
||||
|
version: item.version, |
||||
|
versionId: item.id |
||||
|
} as IotHubUpdateDialogData |
||||
|
}).afterClosed(); |
||||
|
} |
||||
|
|
||||
|
deleteItem(item: MpItemVersionView, installedItem: IotHubInstalledItem): Observable<boolean> { |
||||
|
if (!installedItem) { |
||||
|
return of(false); |
||||
|
} |
||||
|
return this.dialog.open(TbIotHubDeleteDialogComponent, { |
||||
|
panelClass: ['tb-dialog'], |
||||
|
autoFocus: false, |
||||
|
data: { itemName: item.name, itemType: item.type } as IotHubDeleteDialogData |
||||
|
}).afterClosed().pipe( |
||||
|
filter(confirmed => !!confirmed), |
||||
|
mergeMap(() => this.iotHubApiService.deleteInstalledItem(installedItem.id.id)), |
||||
|
mergeMap(() => of(true)) |
||||
|
); |
||||
|
} |
||||
|
|
||||
|
private installDevice(item: MpItemVersionView): Observable<string> { |
||||
|
return this.iotHubApiService.getVersionFileData(item.id as string, { ignoreLoading: true }).pipe( |
||||
|
mergeMap(async (blob: Blob) => { |
||||
|
const zipData = await blob.arrayBuffer(); |
||||
|
return this.dialog.open(TbDeviceInstallDialogComponent, { |
||||
|
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], |
||||
|
disableClose: true, |
||||
|
autoFocus: false, |
||||
|
data: { item, zipData } as DeviceInstallDialogData |
||||
|
}).afterClosed().toPromise(); |
||||
|
}) |
||||
|
); |
||||
|
} |
||||
|
} |
||||
Loading…
Reference in new issue