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

Merge with master

Browse Source
This commit is contained in:
Andrii Shvaika 2022-06-22 16:48:06 +03:00
commit 4b087cdcbd
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui-ngx/src/app/modules/home/models/widget-component.models.ts
View File

@ -50,7 +50,6 @@ import { WidgetTypeId } from '@shared/models/id/widget-type-id';
import { TenantId } from '@shared/models/id/tenant-id'; import { TenantId } from '@shared/models/id/tenant-id';
import { WidgetLayout } from '@shared/models/dashboard.models'; import { WidgetLayout } from '@shared/models/dashboard.models';
import { formatValue, isDefined } from '@core/utils'; import { formatValue, isDefined } from '@core/utils';
import { forkJoin, of } from 'rxjs';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { import {
@ -79,7 +78,8 @@ import { PageLink } from '@shared/models/page/page-link';
import { SortOrder } from '@shared/models/page/sort-order'; import { SortOrder } from '@shared/models/page/sort-order';
import { DomSanitizer } from '@angular/platform-browser'; import { DomSanitizer } from '@angular/platform-browser';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { catchError, map, mergeMap, switchMap } from 'rxjs/operators'; import * as RxJS from 'rxjs';
import * as RxJSOperators from 'rxjs/operators';
import { TbPopoverComponent } from '@shared/components/popover.component'; import { TbPopoverComponent } from '@shared/components/popover.component';
import { EntityId } from '@shared/models/id/entity-id'; import { EntityId } from '@shared/models/id/entity-id';
@ -203,7 +203,7 @@ export class WidgetContext {
if (this.defaultSubscription) { if (this.defaultSubscription) {
return this.defaultSubscription.sendOneWayCommand(method, params, timeout, persistent, retries, additionalInfo, requestUUID); return this.defaultSubscription.sendOneWayCommand(method, params, timeout, persistent, retries, additionalInfo, requestUUID);
} else { } else {
return of(null); return RxJS.of(null);
} }
}, },
sendTwoWayCommand: (method, params, timeout, persistent, sendTwoWayCommand: (method, params, timeout, persistent,
@ -211,14 +211,14 @@ export class WidgetContext {
if (this.defaultSubscription) { if (this.defaultSubscription) {
return this.defaultSubscription.sendTwoWayCommand(method, params, timeout, persistent, retries, additionalInfo, requestUUID); return this.defaultSubscription.sendTwoWayCommand(method, params, timeout, persistent, retries, additionalInfo, requestUUID);
} else { } else {
return of(null); return RxJS.of(null);
} }
}, },
completedCommand: () => { completedCommand: () => {
if (this.defaultSubscription) { if (this.defaultSubscription) {
return this.defaultSubscription.completedCommand(); return this.defaultSubscription.completedCommand();
} else { } else {
return of(null); return RxJS.of(null);
} }
} }
}; };
@ -266,12 +266,9 @@ export class WidgetContext {
private popoverComponents: TbPopoverComponent[] = []; private popoverComponents: TbPopoverComponent[] = [];
rxjs = { rxjs = {
forkJoin,
of, ...RxJS,
map, ...RxJSOperators
mergeMap,
switchMap,
catchError
}; };
registerPopoverComponent(popoverComponent: TbPopoverComponent) { registerPopoverComponent(popoverComponent: TbPopoverComponent) {