diff --git a/ui-ngx/src/app/app-routing.module.ts b/ui-ngx/src/app/app-routing.module.ts index e0f573095d..3e784284d4 100644 --- a/ui-ngx/src/app/app-routing.module.ts +++ b/ui-ngx/src/app/app-routing.module.ts @@ -15,7 +15,7 @@ /// import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { path: '', diff --git a/ui-ngx/src/app/core/api/data-aggregator.ts b/ui-ngx/src/app/core/api/data-aggregator.ts index a5a1b65bf0..69ffecbdaf 100644 --- a/ui-ngx/src/app/core/api/data-aggregator.ts +++ b/ui-ngx/src/app/core/api/data-aggregator.ts @@ -14,11 +14,11 @@ /// limitations under the License. /// -import { SubscriptionData, SubscriptionUpdateMsg, SubscriptionDataHolder } from '@app/shared/models/telemetry/telemetry.models'; +import { SubscriptionData, SubscriptionDataHolder } from '@app/shared/models/telemetry/telemetry.models'; import { AggregationType } from '@shared/models/time/time.models'; import { UtilsService } from '@core/services/utils.service'; -import Timeout = NodeJS.Timeout; import { deepClone } from '@core/utils'; +import Timeout = NodeJS.Timeout; export declare type onAggregatedData = (data: SubscriptionData, detectChanges: boolean) => void; diff --git a/ui-ngx/src/app/core/api/datasource-subcription.ts b/ui-ngx/src/app/core/api/datasource-subcription.ts index 0c4edfd349..dc118b4491 100644 --- a/ui-ngx/src/app/core/api/datasource-subcription.ts +++ b/ui-ngx/src/app/core/api/datasource-subcription.ts @@ -28,7 +28,7 @@ import { } from '@shared/models/telemetry/telemetry.models'; import { DatasourceListener } from './datasource.service'; import { AggregationType, SubscriptionTimewindow, YEAR } from '@shared/models/time/time.models'; -import { deepClone, isDefined, isObject, isDefinedAndNotNull } from '@core/utils'; +import { deepClone, isDefinedAndNotNull, isObject } from '@core/utils'; import { UtilsService } from '@core/services/utils.service'; import { EntityType } from '@shared/models/entity-type.models'; import { DataAggregator } from '@core/api/data-aggregator'; diff --git a/ui-ngx/src/app/core/api/widget-api.models.ts b/ui-ngx/src/app/core/api/widget-api.models.ts index 0eeb2af080..9a7d855d6e 100644 --- a/ui-ngx/src/app/core/api/widget-api.models.ts +++ b/ui-ngx/src/app/core/api/widget-api.models.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; import { EntityId } from '@app/shared/models/id/entity-id'; import { DataSet, diff --git a/ui-ngx/src/app/core/core.module.ts b/ui-ngx/src/app/core/core.module.ts index b053938722..3defaea872 100644 --- a/ui-ngx/src/app/core/core.module.ts +++ b/ui-ngx/src/app/core/core.module.ts @@ -28,7 +28,8 @@ import { MissingTranslationHandler, TranslateCompiler, TranslateLoader, - TranslateModule, TranslateParser + TranslateModule, + TranslateParser } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { TbMissingTranslationHandler } from './translate/missing-translate-handler'; diff --git a/ui-ngx/src/app/core/core.state.ts b/ui-ngx/src/app/core/core.state.ts index 45ed3ce4c1..6dc03f3b0a 100644 --- a/ui-ngx/src/app/core/core.state.ts +++ b/ui-ngx/src/app/core/core.state.ts @@ -14,13 +14,10 @@ /// limitations under the License. /// -import { - ActionReducerMap, - MetaReducer, Store -} from '@ngrx/store'; +import { ActionReducerMap, MetaReducer } from '@ngrx/store'; import { storeFreeze } from 'ngrx-store-freeze'; -import { environment as env} from '@env/environment'; +import { environment as env } from '@env/environment'; import { initStateFromLocalStorage } from './meta-reducers/init-state-from-local-storage.reducer'; import { debug } from './meta-reducers/debug.reducer'; @@ -35,7 +32,6 @@ import { SettingsEffects } from '@app/core/settings/settings.effects'; import { NotificationState } from '@app/core/notification/notification.models'; import { notificationReducer } from '@app/core/notification/notification.reducer'; import { NotificationEffects } from '@app/core/notification/notification.effects'; -import { take } from 'rxjs/operators'; export const reducers: ActionReducerMap = { load: loadReducer, diff --git a/ui-ngx/src/app/core/guards/auth.guard.ts b/ui-ngx/src/app/core/guards/auth.guard.ts index f42029f6f9..98a0e781d2 100644 --- a/ui-ngx/src/app/core/guards/auth.guard.ts +++ b/ui-ngx/src/app/core/guards/auth.guard.ts @@ -15,12 +15,7 @@ /// import { Injectable, NgZone } from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - CanActivateChild, - RouterStateSnapshot -} from '@angular/router'; +import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, RouterStateSnapshot } from '@angular/router'; import { AuthService } from '../auth/auth.service'; import { select, Store } from '@ngrx/store'; import { AppState } from '../core.state'; diff --git a/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts b/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts index 6a76f27056..e3ee9a5330 100644 --- a/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts +++ b/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts @@ -15,11 +15,7 @@ /// import { Injectable } from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanDeactivate, - RouterStateSnapshot -} from '@angular/router'; +import { ActivatedRouteSnapshot, CanDeactivate, RouterStateSnapshot } from '@angular/router'; import { FormGroup } from '@angular/forms'; import { select, Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; diff --git a/ui-ngx/src/app/core/http/alarm.service.ts b/ui-ngx/src/app/core/http/alarm.service.ts index 3e2bf58285..417975aebb 100644 --- a/ui-ngx/src/app/core/http/alarm.service.ts +++ b/ui-ngx/src/app/core/http/alarm.service.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils'; -import { Observable } from 'rxjs'; +import { EMPTY, Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { PageData } from '@shared/models/page/page-data'; import { EntityId } from '@shared/models/id/entity-id'; @@ -36,9 +36,8 @@ import { UtilsService } from '@core/services/utils.service'; import { TimePageLink } from '@shared/models/page/page-link'; import { Direction, SortOrder } from '@shared/models/page/sort-order'; import { concatMap, expand, map, toArray } from 'rxjs/operators'; -import { EMPTY } from 'rxjs'; -import Timeout = NodeJS.Timeout; import { isDefined } from '@core/utils'; +import Timeout = NodeJS.Timeout; interface AlarmSourceListenerQuery { entityType: EntityType; diff --git a/ui-ngx/src/app/core/http/component-descriptor.service.ts b/ui-ngx/src/app/core/http/component-descriptor.service.ts index 3eb5725ac8..a3198b862a 100644 --- a/ui-ngx/src/app/core/http/component-descriptor.service.ts +++ b/ui-ngx/src/app/core/http/component-descriptor.service.ts @@ -19,8 +19,7 @@ import { HttpClient } from '@angular/common/http'; import { ComponentDescriptor, ComponentType } from '@shared/models/component-descriptor.models'; import { defaultHttpOptionsFromConfig, RequestConfig } from '@core/http/http-utils'; import { Observable, of } from 'rxjs'; -import { RuleChainMetaData } from '@shared/models/rule-chain.models'; -import { tap, map } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { RuleNodeType } from '@shared/models/rule-node.models'; @Injectable({ diff --git a/ui-ngx/src/app/core/http/device.service.ts b/ui-ngx/src/app/core/http/device.service.ts index b432c81e41..2d31503bd1 100644 --- a/ui-ngx/src/app/core/http/device.service.ts +++ b/ui-ngx/src/app/core/http/device.service.ts @@ -21,7 +21,8 @@ import { HttpClient } from '@angular/common/http'; import { PageLink } from '@shared/models/page/page-link'; import { PageData } from '@shared/models/page/page-data'; import { - ClaimRequest, ClaimResult, + ClaimRequest, + ClaimResult, Device, DeviceCredentials, DeviceInfo, diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index 4cf67175e4..3eb80ef6a3 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -642,7 +642,6 @@ export class EntityService { return result; } )); - break; case AliasFilterType.entityList: return this.getEntities(filter.entityType, filter.entityList, {ignoreLoading: true, ignoreErrors: true}).pipe( map((entities) => { @@ -654,7 +653,6 @@ export class EntityService { } } )); - break; case AliasFilterType.entityName: return this.getEntitiesByNameFilter(filter.entityType, filter.entityNameFilter, maxItems, '', {ignoreLoading: true, ignoreErrors: true}).pipe( @@ -668,7 +666,6 @@ export class EntityService { } ) ); - break; case AliasFilterType.stateEntity: result.stateEntity = true; if (stateEntityId) { @@ -681,7 +678,6 @@ export class EntityService { } else { return of(result); } - break; case AliasFilterType.assetType: return this.getEntitiesByNameFilter(EntityType.ASSET, filter.assetNameFilter, maxItems, filter.assetType, {ignoreLoading: true, ignoreErrors: true}).pipe( @@ -695,7 +691,6 @@ export class EntityService { } ) ); - break; case AliasFilterType.deviceType: return this.getEntitiesByNameFilter(EntityType.DEVICE, filter.deviceNameFilter, maxItems, filter.deviceType, {ignoreLoading: true, ignoreErrors: true}).pipe( @@ -709,7 +704,6 @@ export class EntityService { } ) ); - break; case AliasFilterType.entityViewType: return this.getEntitiesByNameFilter(EntityType.ENTITY_VIEW, filter.entityViewNameFilter, maxItems, filter.entityViewType, {ignoreLoading: true, ignoreErrors: true}).pipe( @@ -723,7 +717,6 @@ export class EntityService { } ) ); - break; case AliasFilterType.relationsQuery: result.stateEntity = filter.rootStateEntity; let rootEntityType; @@ -768,7 +761,6 @@ export class EntityService { } else { return of(result); } - break; case AliasFilterType.assetSearchQuery: case AliasFilterType.deviceSearchQuery: case AliasFilterType.entityViewSearchQuery: @@ -823,7 +815,6 @@ export class EntityService { } else { return of(result); } - break; } } diff --git a/ui-ngx/src/app/core/interceptors/load.selectors.ts b/ui-ngx/src/app/core/interceptors/load.selectors.ts index 280653361f..a423d6c9ab 100644 --- a/ui-ngx/src/app/core/interceptors/load.selectors.ts +++ b/ui-ngx/src/app/core/interceptors/load.selectors.ts @@ -18,9 +18,7 @@ import { createFeatureSelector, createSelector, select, Store } from '@ngrx/stor import { AppState } from '../core.state'; import { LoadState } from './load.models'; -import { AuthUser } from '@shared/models/user.model'; import { take } from 'rxjs/operators'; -import { selectAuthUser } from '@core/auth/auth.selectors'; export const selectLoadState = createFeatureSelector( 'load' diff --git a/ui-ngx/src/app/core/notification/notification.actions.ts b/ui-ngx/src/app/core/notification/notification.actions.ts index a7cc19fe14..098e5cd2c8 100644 --- a/ui-ngx/src/app/core/notification/notification.actions.ts +++ b/ui-ngx/src/app/core/notification/notification.actions.ts @@ -15,7 +15,7 @@ /// import { Action } from '@ngrx/store'; -import { NotificationMessage, HideNotification } from '@app/core/notification/notification.models'; +import { HideNotification, NotificationMessage } from '@app/core/notification/notification.models'; export enum NotificationActionTypes { SHOW_NOTIFICATION = '[Notification] Show', diff --git a/ui-ngx/src/app/core/notification/notification.effects.ts b/ui-ngx/src/app/core/notification/notification.effects.ts index 017ba5fd77..a7dd698172 100644 --- a/ui-ngx/src/app/core/notification/notification.effects.ts +++ b/ui-ngx/src/app/core/notification/notification.effects.ts @@ -16,14 +16,9 @@ import { Injectable } from '@angular/core'; import { Actions, Effect, ofType } from '@ngrx/effects'; -import { - map, -} from 'rxjs/operators'; +import { map } from 'rxjs/operators'; -import { - NotificationActions, - NotificationActionTypes -} from '@app/core/notification/notification.actions'; +import { NotificationActions, NotificationActionTypes } from '@app/core/notification/notification.actions'; import { NotificationService } from '@app/core/services/notification.service'; @Injectable() diff --git a/ui-ngx/src/app/core/services/broadcast.service.ts b/ui-ngx/src/app/core/services/broadcast.service.ts index 90a8bcff4c..92dc2ef98e 100644 --- a/ui-ngx/src/app/core/services/broadcast.service.ts +++ b/ui-ngx/src/app/core/services/broadcast.service.ts @@ -14,11 +14,10 @@ /// limitations under the License. /// -import {Injectable} from '@angular/core'; -import {Subject, Subscription} from 'rxjs'; -import {NotificationMessage} from '@core/notification/notification.models'; -import {BroadcastEvent, BroadcastListener, BroadcastMessage} from '@core/services/broadcast.models'; -import {filter} from 'rxjs/operators'; +import { Injectable } from '@angular/core'; +import { Subject, Subscription } from 'rxjs'; +import { BroadcastEvent, BroadcastListener, BroadcastMessage } from '@core/services/broadcast.models'; +import { filter } from 'rxjs/operators'; @Injectable({ providedIn: 'root' diff --git a/ui-ngx/src/app/core/services/dashboard-utils.service.ts b/ui-ngx/src/app/core/services/dashboard-utils.service.ts index c892d02c34..15f0b23d6a 100644 --- a/ui-ngx/src/app/core/services/dashboard-utils.service.ts +++ b/ui-ngx/src/app/core/services/dashboard-utils.service.ts @@ -331,7 +331,6 @@ export class DashboardUtilsService { const states = dashboardConfiguration.states; const state = states[targetState]; if (state) { - const allWidgets = dashboardConfiguration.widgets; const result: DashboardLayoutsInfo = {}; for (const l of Object.keys(state.layouts)) { const layout: DashboardLayout = state.layouts[l]; diff --git a/ui-ngx/src/app/core/services/item-buffer.service.ts b/ui-ngx/src/app/core/services/item-buffer.service.ts index 081953e2bf..2b0d95e3be 100644 --- a/ui-ngx/src/app/core/services/item-buffer.service.ts +++ b/ui-ngx/src/app/core/services/item-buffer.service.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { Dashboard, DashboardLayoutId } from '@app/shared/models/dashboard.models'; -import { EntityAlias, EntityAliasFilter, EntityAliases, EntityAliasInfo, AliasesInfo } from '@shared/models/alias.models'; +import { AliasesInfo, EntityAlias, EntityAliases, EntityAliasInfo } from '@shared/models/alias.models'; import { DatasourceType, Widget, WidgetPosition, WidgetSize } from '@shared/models/widget.models'; import { DashboardUtilsService } from '@core/services/dashboard-utils.service'; import { deepClone, isEqual } from '@core/utils'; diff --git a/ui-ngx/src/app/core/services/menu.service.ts b/ui-ngx/src/app/core/services/menu.service.ts index 84799da5ed..6032bf24f3 100644 --- a/ui-ngx/src/app/core/services/menu.service.ts +++ b/ui-ngx/src/app/core/services/menu.service.ts @@ -23,7 +23,7 @@ import { take } from 'rxjs/operators'; import { HomeSection, MenuSection } from '@core/services/menu.models'; import { BehaviorSubject, Observable, Subject } from 'rxjs'; import { Authority } from '@shared/models/authority.enum'; -import {AuthUser} from '@shared/models/user.model'; +import { AuthUser } from '@shared/models/user.model'; @Injectable({ providedIn: 'root' diff --git a/ui-ngx/src/app/core/services/notification.service.ts b/ui-ngx/src/app/core/services/notification.service.ts index c4dd566d56..78a2cd198d 100644 --- a/ui-ngx/src/app/core/services/notification.service.ts +++ b/ui-ngx/src/app/core/services/notification.service.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { HideNotification, NotificationMessage } from '@app/core/notification/notification.models'; -import { BehaviorSubject, Observable, Subject } from 'rxjs'; +import { Observable, Subject } from 'rxjs'; @Injectable( diff --git a/ui-ngx/src/app/core/services/raf.service.ts b/ui-ngx/src/app/core/services/raf.service.ts index 98d31d7dd6..3461cbd9ee 100644 --- a/ui-ngx/src/app/core/services/raf.service.ts +++ b/ui-ngx/src/app/core/services/raf.service.ts @@ -15,7 +15,6 @@ /// import { Inject, Injectable, NgZone } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; import { WINDOW } from '@core/services/window.service'; export type CancelAnimationFrame = () => void; diff --git a/ui-ngx/src/app/core/services/script/node-script-test.service.ts b/ui-ngx/src/app/core/services/script/node-script-test.service.ts index ac50af85f8..d6272d58b7 100644 --- a/ui-ngx/src/app/core/services/script/node-script-test.service.ts +++ b/ui-ngx/src/app/core/services/script/node-script-test.service.ts @@ -15,11 +15,14 @@ /// import { Injectable } from '@angular/core'; -import { Observable, of } from 'rxjs'; +import { Observable } from 'rxjs'; import { RuleChainService } from '@core/http/rule-chain.service'; -import { map, switchMap } from 'rxjs/operators'; +import { switchMap } from 'rxjs/operators'; import { MatDialog } from '@angular/material/dialog'; -import { NodeScriptTestDialogComponent, NodeScriptTestDialogData } from '@shared/components/dialog/node-script-test-dialog.component'; +import { + NodeScriptTestDialogComponent, + NodeScriptTestDialogData +} from '@shared/components/dialog/node-script-test-dialog.component'; @Injectable({ providedIn: 'root' diff --git a/ui-ngx/src/app/core/services/time.service.ts b/ui-ngx/src/app/core/services/time.service.ts index ea9326e6ba..d76cfc9135 100644 --- a/ui-ngx/src/app/core/services/time.service.ts +++ b/ui-ngx/src/app/core/services/time.service.ts @@ -15,7 +15,14 @@ /// import { Injectable } from '@angular/core'; -import { AggregationType, DAY, defaultTimeIntervals, SECOND, Timewindow, defaultTimewindow } from '@shared/models/time/time.models'; +import { + AggregationType, + DAY, + defaultTimeIntervals, + defaultTimewindow, + SECOND, + Timewindow +} from '@shared/models/time/time.models'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { defaultHttpOptions } from '@core/http/http-utils'; diff --git a/ui-ngx/src/app/core/services/window.service.ts b/ui-ngx/src/app/core/services/window.service.ts index 1bd0ce3c8e..acb11f7e9e 100644 --- a/ui-ngx/src/app/core/services/window.service.ts +++ b/ui-ngx/src/app/core/services/window.service.ts @@ -16,7 +16,7 @@ import { isPlatformBrowser } from '@angular/common'; -import { ClassProvider, FactoryProvider, InjectionToken, PLATFORM_ID, Injectable } from '@angular/core'; +import { ClassProvider, FactoryProvider, Injectable, InjectionToken, PLATFORM_ID } from '@angular/core'; /* Create a new injection token for injecting the window into a component. */ export const WINDOW = new InjectionToken('WindowToken'); diff --git a/ui-ngx/src/app/core/settings/settings.effects.ts b/ui-ngx/src/app/core/settings/settings.effects.ts index f11cc5bbed..e16e7b862b 100644 --- a/ui-ngx/src/app/core/settings/settings.effects.ts +++ b/ui-ngx/src/app/core/settings/settings.effects.ts @@ -14,27 +14,16 @@ /// limitations under the License. /// -import { ActivationEnd, ActivationStart, Router } from '@angular/router'; +import { ActivationEnd, Router } from '@angular/router'; import { Injectable } from '@angular/core'; import { select, Store } from '@ngrx/store'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { TranslateService } from '@ngx-translate/core'; import { merge } from 'rxjs'; -import { - tap, - withLatestFrom, - map, - distinctUntilChanged, - filter -} from 'rxjs/operators'; +import { distinctUntilChanged, filter, map, tap, withLatestFrom } from 'rxjs/operators'; -import { - SettingsActionTypes, - SettingsActions, -} from './settings.actions'; -import { - selectSettingsState -} from './settings.selectors'; +import { SettingsActions, SettingsActionTypes, } from './settings.actions'; +import { selectSettingsState } from './settings.selectors'; import { AppState } from '@app/core/core.state'; import { LocalStorageService } from '@app/core/local-storage/local-storage.service'; import { TitleService } from '@app/core/services/title.service'; diff --git a/ui-ngx/src/app/core/translate/missing-translate-handler.ts b/ui-ngx/src/app/core/translate/missing-translate-handler.ts index dd91e9f4bf..32353fa2cf 100644 --- a/ui-ngx/src/app/core/translate/missing-translate-handler.ts +++ b/ui-ngx/src/app/core/translate/missing-translate-handler.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import {MissingTranslationHandler, MissingTranslationHandlerParams} from '@ngx-translate/core'; +import { MissingTranslationHandler, MissingTranslationHandlerParams } from '@ngx-translate/core'; import { customTranslationsPrefix } from '@app/shared/models/constants'; export class TbMissingTranslationHandler implements MissingTranslationHandler { diff --git a/ui-ngx/src/app/core/translate/translate-default-compiler.ts b/ui-ngx/src/app/core/translate/translate-default-compiler.ts index 26fcfc0746..7badb08f12 100644 --- a/ui-ngx/src/app/core/translate/translate-default-compiler.ts +++ b/ui-ngx/src/app/core/translate/translate-default-compiler.ts @@ -15,10 +15,12 @@ /// import { - MESSAGE_FORMAT_CONFIG, MessageFormatConfig, + MESSAGE_FORMAT_CONFIG, + MessageFormatConfig, TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'; import { Inject, Injectable, Optional } from '@angular/core'; + const parse = require('messageformat-parser').parse; @Injectable({ providedIn: 'root' }) diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts index ea3682f72e..467f2e3e09 100644 --- a/ui-ngx/src/app/core/utils.ts +++ b/ui-ngx/src/app/core/utils.ts @@ -15,8 +15,8 @@ /// import _ from 'lodash'; -import { Observable, Subject, fromEvent, of } from 'rxjs'; -import { finalize, share, map } from 'rxjs/operators'; +import { fromEvent, Observable, of, Subject } from 'rxjs'; +import { finalize, map, share } from 'rxjs/operators'; import base64js from 'base64-js'; export function onParentScrollOrWindowResize(el: Node): Observable { diff --git a/ui-ngx/src/app/modules/dashboard/dashboard-pages.routing.module.ts b/ui-ngx/src/app/modules/dashboard/dashboard-pages.routing.module.ts index f7ce154661..d163f6a7b8 100644 --- a/ui-ngx/src/app/modules/dashboard/dashboard-pages.routing.module.ts +++ b/ui-ngx/src/app/modules/dashboard/dashboard-pages.routing.module.ts @@ -17,18 +17,12 @@ import { Injectable, NgModule } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, RouterModule, Routes } from '@angular/router'; -import {Authority} from '@shared/models/authority.enum'; +import { Authority } from '@shared/models/authority.enum'; import { DashboardPageComponent } from '@home/pages/dashboard/dashboard-page.component'; -import { BreadCrumbConfig, BreadCrumbLabelFunction } from '@shared/components/breadcrumb'; -import { widgetTypesBreadcumbLabelFunction } from '@home/pages/widget/widget-library-routing.module'; -import { WidgetsBundle } from '@shared/models/widgets-bundle.model'; -import { WidgetService } from '@core/http/widget.service'; -import { Observable } from 'rxjs'; import { Dashboard } from '@app/shared/models/dashboard.models'; import { DashboardService } from '@core/http/dashboard.service'; import { DashboardUtilsService } from '@core/services/dashboard-utils.service'; -import { map } from 'rxjs/operators'; -import { dashboardBreadcumbLabelFunction, DashboardResolver } from '@app/modules/home/pages/dashboard/dashboard-routing.module'; +import { DashboardResolver } from '@app/modules/home/pages/dashboard/dashboard-routing.module'; import { UtilsService } from '@core/services/utils.service'; import { Widget } from '@app/shared/models/widget.models'; diff --git a/ui-ngx/src/app/modules/dashboard/dashboard-routing.module.ts b/ui-ngx/src/app/modules/dashboard/dashboard-routing.module.ts index 5166465170..6f0c208596 100644 --- a/ui-ngx/src/app/modules/dashboard/dashboard-routing.module.ts +++ b/ui-ngx/src/app/modules/dashboard/dashboard-routing.module.ts @@ -15,7 +15,7 @@ /// import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AuthGuard } from '@core/guards/auth.guard'; import { StoreModule } from '@ngrx/store'; diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.html b/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.html index 2cdc3faf28..ad85a91923 100644 --- a/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.html +++ b/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.html @@ -57,7 +57,7 @@
+ style="margin-bottom: 0; padding-right: 20px;"> {{ 'dashboard.open-dashboard' | translate }}
-
+
diff --git a/ui-ngx/src/app/modules/home/components/entity/entity-table-header.component.ts b/ui-ngx/src/app/modules/home/components/entity/entity-table-header.component.ts index e24345bc7e..ba04af086f 100644 --- a/ui-ngx/src/app/modules/home/components/entity/entity-table-header.component.ts +++ b/ui-ngx/src/app/modules/home/components/entity/entity-table-header.component.ts @@ -16,13 +16,14 @@ import { BaseData, HasId } from '@shared/models/base-data'; import { PageComponent } from '@shared/components/page.component'; -import { Input, OnInit, Directive } from '@angular/core'; +import { Directive, Input, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { EntityTableConfig } from '@home/models/entity/entities-table-config.models'; import { PageLink } from '@shared/models/page/page-link'; @Directive() +// tslint:disable-next-line:directive-class-suffix export abstract class EntityTableHeaderComponent, P extends PageLink = PageLink, L extends BaseData = T, diff --git a/ui-ngx/src/app/modules/home/components/entity/entity-tabs.component.ts b/ui-ngx/src/app/modules/home/components/entity/entity-tabs.component.ts index 31ed87529e..41ba7420dc 100644 --- a/ui-ngx/src/app/modules/home/components/entity/entity-tabs.component.ts +++ b/ui-ngx/src/app/modules/home/components/entity/entity-tabs.component.ts @@ -16,15 +16,14 @@ import { BaseData, HasId } from '@shared/models/base-data'; import { PageComponent } from '@shared/components/page.component'; -import { AfterViewInit, ContentChildren, EventEmitter, Input, OnInit, Output, QueryList, ViewChildren, Directive } from '@angular/core'; +import { AfterViewInit, Directive, Input, OnInit, QueryList, ViewChildren } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { EntityTableConfig } from '@home/models/entity/entities-table-config.models'; import { MatTab } from '@angular/material/tabs'; -import { EntityAction } from '@home/models/entity/entity-component.models'; import { BehaviorSubject } from 'rxjs'; import { Authority } from '@app/shared/models/authority.enum'; -import { selectAuthUser, getCurrentAuthUser } from '@core/auth/auth.selectors'; +import { getCurrentAuthUser } from '@core/auth/auth.selectors'; import { AuthUser } from '@shared/models/user.model'; import { EntityType } from '@shared/models/entity-type.models'; import { AuditLogMode } from '@shared/models/audit-log.models'; @@ -35,6 +34,7 @@ import { NgForm } from '@angular/forms'; import { PageLink } from '@shared/models/page/page-link'; @Directive() +// tslint:disable-next-line:directive-class-suffix export abstract class EntityTabsComponent, P extends PageLink = PageLink, L extends BaseData = T, diff --git a/ui-ngx/src/app/modules/home/components/import-export/import-dialog.component.ts b/ui-ngx/src/app/modules/home/components/import-export/import-dialog.component.ts index 20f7a1ee9b..ba0e66fc2e 100644 --- a/ui-ngx/src/app/modules/home/components/import-export/import-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/import-export/import-dialog.component.ts @@ -19,27 +19,10 @@ import { ErrorStateMatcher } from '@angular/material/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; -import { - AbstractControl, - FormArray, - FormBuilder, - FormControl, - FormGroup, - FormGroupDirective, - NgForm, Validators, ValidatorFn -} from '@angular/forms'; +import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { DialogComponent } from '@app/shared/components/dialog.component'; -import { AttributeData } from '@shared/models/telemetry/telemetry.models'; -import { EntityAlias, EntityAliases, EntityAliasFilter } from '@shared/models/alias.models'; -import { DatasourceType, Widget, widgetType } from '@shared/models/widget.models'; -import { AliasEntityType, EntityType } from '@shared/models/entity-type.models'; -import { UtilsService } from '@core/services/utils.service'; -import { TranslateService } from '@ngx-translate/core'; import { ActionNotificationShow } from '@core/notification/notification.actions'; -import { DialogService } from '@core/services/dialog.service'; -import { EntityService } from '@core/http/entity.service'; -import { Observable, of } from 'rxjs'; export interface ImportDialogData { importTitle: string; diff --git a/ui-ngx/src/app/modules/home/components/widget/action/custom-action-pretty-resources-tabs.component.scss b/ui-ngx/src/app/modules/home/components/widget/action/custom-action-pretty-resources-tabs.component.scss index 6a37c45ae6..32d865eaa4 100644 --- a/ui-ngx/src/app/modules/home/components/widget/action/custom-action-pretty-resources-tabs.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/action/custom-action-pretty-resources-tabs.component.scss @@ -17,7 +17,7 @@ mat-form-field.resource-field { max-height: 40px; - margin: 10px 0px 0px 0px; + margin: 10px 0 0; .mat-form-field-wrapper { padding-bottom: 0; .mat-form-field-flex { diff --git a/ui-ngx/src/app/modules/home/components/widget/data-keys.component.scss b/ui-ngx/src/app/modules/home/components/widget/data-keys.component.scss index afd505b54e..1a58e8c6f8 100644 --- a/ui-ngx/src/app/modules/home/components/widget/data-keys.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/data-keys.component.scss @@ -51,7 +51,7 @@ width: 24px; height: 24px; font-size: 24px; - margin-left: 0px; + margin-left: 0; color: inherit; opacity: inherit; } diff --git a/ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.service.ts b/ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.service.ts index 98f07663f3..b9e4513279 100644 --- a/ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.service.ts +++ b/ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.service.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Injectable, Injector, NgModule } from '@angular/core'; +import { Injectable, NgModule } from '@angular/core'; import { Observable } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; @@ -36,7 +36,6 @@ export class CustomDialogService { private translate: TranslateService, private authService: AuthService, private dynamicComponentFactoryService: DynamicComponentFactoryService, - private injector: Injector, public dialog: MatDialog ) { } diff --git a/ui-ngx/src/app/modules/home/components/widget/legend-config-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/legend-config-panel.component.ts index a96d1bab9c..5f5abff7a3 100644 --- a/ui-ngx/src/app/modules/home/components/widget/legend-config-panel.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/legend-config-panel.component.ts @@ -15,7 +15,7 @@ /// import { Component, Inject, InjectionToken, OnInit, ViewContainerRef } from '@angular/core'; -import { Overlay, OverlayRef } from '@angular/cdk/overlay'; +import { OverlayRef } from '@angular/cdk/overlay'; import { PageComponent } from '@shared/components/page.component'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; @@ -60,7 +60,6 @@ export class LegendConfigPanelComponent extends PageComponent implements OnInit public overlayRef: OverlayRef, protected store: Store, public fb: FormBuilder, - private overlay: Overlay, public viewContainerRef: ViewContainerRef) { super(store); } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts index 6f84149ae3..ee8f72048b 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts @@ -37,8 +37,7 @@ import { deepClone, isDefined, isNumber } from '@core/utils'; import cssjs from '@core/css/css'; import { PageLink } from '@shared/models/page/page-link'; import { Direction, SortOrder, sortOrderFromString } from '@shared/models/page/sort-order'; -import { DataSource } from '@angular/cdk/collections'; -import { CollectionViewer, SelectionModel } from '@angular/cdk/collections'; +import { CollectionViewer, DataSource, SelectionModel } from '@angular/cdk/collections'; import { BehaviorSubject, forkJoin, fromEvent, merge, Observable, of } from 'rxjs'; import { emptyPageData, PageData } from '@shared/models/page/page-data'; import { entityTypeTranslations } from '@shared/models/entity-type.models'; @@ -59,7 +58,8 @@ import { getColumnWidth, TableWidgetDataKeySettings, TableWidgetSettings, - toAlarmColumnDef, widthStyle + toAlarmColumnDef, + widthStyle } from '@home/components/widget/lib/table-widget.models'; import { ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay'; import { ComponentPortal, PortalInjector } from '@angular/cdk/portal'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts index 38ddc7f536..1571c5c3d0 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts @@ -16,7 +16,8 @@ import * as CanvasGauges from 'canvas-gauges'; import { - AnalogueRadialGaugeSettings, getAnalogueRadialGaugeSettingsSchema + AnalogueRadialGaugeSettings, + getAnalogueRadialGaugeSettingsSchema } from '@home/components/widget/lib/analogue-radial-gauge.models'; import { JsonSettingsSchema } from '@shared/models/widget.models'; import { WidgetContext } from '@home/models/widget-component.models'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.html index da922d8ca4..94d66e2a8a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.html @@ -19,7 +19,7 @@ [ngClass]="{'short-mode':ctx.width < 400, 'labels-hidden': settings.hideLabels, 'long-mode': ctx.width >= 400}"> widgets.date-range-navigator.localizationMap.Date picker - + {{advancedModel.chosenLabel}} @@ -27,7 +27,7 @@ widgets.date-range-navigator.localizationMap.Interval - + {{'widgets.date-range-navigator.localizationMap.' + customInterval.label | translate}} @@ -43,7 +43,7 @@ widgets.date-range-navigator.localizationMap.Step size - + {{'widgets.date-range-navigator.localizationMap.' + date.value.label | translate}} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.scss index 5663801189..e3505275e5 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.scss @@ -34,12 +34,6 @@ margin: 4px 0; } - .navigation { - md-input-container { - margin: 0; - } - } - .picker { .picker__wrapper { position: relative; @@ -74,10 +68,6 @@ .drn__element { width: 100%; - - md-input-container { - flex: 1; - } } .picker { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.ts index a0893305e3..8d0cc7cb3a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/date-range-navigator/date-range-navigator.component.ts @@ -38,7 +38,7 @@ import { DateRangeNavigatorSettings, getFormattedDate } from '@home/components/widget/lib/date-range-navigator/date-range-navigator.models'; -import { DatePipe, KeyValue } from '@angular/common'; +import { KeyValue } from '@angular/common'; import * as _moment from 'moment'; import { ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay'; import { ComponentPortal, PortalInjector } from '@angular/cdk/portal'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts index fa2fe59903..bbdb145835 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts @@ -43,9 +43,8 @@ import { deepClone, isDefined, isNumber } from '@core/utils'; import cssjs from '@core/css/css'; import { PageLink } from '@shared/models/page/page-link'; import { Direction, SortOrder, sortOrderFromString } from '@shared/models/page/sort-order'; -import { DataSource } from '@angular/cdk/collections'; +import { CollectionViewer, DataSource } from '@angular/cdk/collections'; import { DataKeyType } from '@shared/models/telemetry/telemetry.models'; -import { CollectionViewer } from '@angular/cdk/collections'; import { BehaviorSubject, fromEvent, merge, Observable, of } from 'rxjs'; import { emptyPageData, PageData } from '@shared/models/page/page-data'; import { EntityId } from '@shared/models/id/entity-id'; @@ -55,20 +54,21 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; import { - CellContentInfo, - CellStyleInfo, - constructTableCssString, - DisplayColumn, - EntityColumn, - EntityData, - fromEntityColumnDef, - getCellContentInfo, - getCellStyleInfo, - getColumnWidth, - getEntityValue, - TableWidgetDataKeySettings, - TableWidgetSettings, - toEntityColumnDef, widthStyle + CellContentInfo, + CellStyleInfo, + constructTableCssString, + DisplayColumn, + EntityColumn, + EntityData, + fromEntityColumnDef, + getCellContentInfo, + getCellStyleInfo, + getColumnWidth, + getEntityValue, + TableWidgetDataKeySettings, + TableWidgetSettings, + toEntityColumnDef, + widthStyle } from '@home/components/widget/lib/table-widget.models'; import { ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay'; import { ComponentPortal, PortalInjector } from '@angular/cdk/portal'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts index 765d47e8f4..6726931576 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts @@ -17,7 +17,7 @@ // tslint:disable-next-line:no-reference /// -import { JsonSettingsSchema, DataKey, DatasourceData, Datasource } from '@shared/models/widget.models'; +import { DataKey, Datasource, DatasourceData, JsonSettingsSchema } from '@shared/models/widget.models'; import * as moment_ from 'moment'; export declare type ChartType = 'line' | 'pie' | 'bar' | 'state' | 'graph'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts index da870813f3..956e37b51b 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts @@ -14,16 +14,23 @@ /// limitations under the License. /// -import L, { LatLngTuple, LatLngBounds, Point } from 'leaflet'; +import L, { LatLngBounds, LatLngTuple } from 'leaflet'; import 'leaflet-providers'; import 'leaflet.markercluster/dist/MarkerCluster.css'; import 'leaflet.markercluster/dist/MarkerCluster.Default.css'; import LM from 'leaflet.markercluster/dist/leaflet.markercluster'; -import { MapSettings, MarkerSettings, FormattedData, UnitedMapSettings, PolygonSettings, PolylineSettings } from './map-models'; +import { + FormattedData, + MapSettings, + MarkerSettings, + PolygonSettings, + PolylineSettings, + UnitedMapSettings +} from './map-models'; import { Marker } from './markers'; -import { Observable, BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; import { filter } from 'rxjs/operators'; import { Polyline } from './polyline'; import { Polygon } from './polygon'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts index 69faafcb14..0b7a92455d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts @@ -17,22 +17,22 @@ import { MapProviders, UnitedMapSettings } from './map-models'; import LeafletMap from './leaflet-map'; import { - openstreetMapSettingsSchema, - googleMapSettingsSchema, - imageMapSettingsSchema, - tencentMapSettingsSchema, - commonMapSettingsSchema, - routeMapSettingsSchema, - markerClusteringSettingsSchema, - markerClusteringSettingsSchemaLeaflet, - hereMapSettingsSchema, - mapProviderSchema, - mapPolygonSchema + commonMapSettingsSchema, + googleMapSettingsSchema, + hereMapSettingsSchema, + imageMapSettingsSchema, + mapPolygonSchema, + mapProviderSchema, + markerClusteringSettingsSchema, + markerClusteringSettingsSchemaLeaflet, + openstreetMapSettingsSchema, + routeMapSettingsSchema, + tencentMapSettingsSchema } from './schemes'; -import { MapWidgetStaticInterface, MapWidgetInterface } from './map-widget.interface'; -import { OpenStreetMap, TencentMap, GoogleMap, HEREMap, ImageMap } from './providers'; -import { parseFunction, parseArray, parseData, safeExecute, parseWithTranslation } from '@core/utils'; -import { initSchema, addToSchema, mergeSchemes, addCondition, addGroupInfo } from '@core/schema-utils'; +import { MapWidgetInterface, MapWidgetStaticInterface } from './map-widget.interface'; +import { GoogleMap, HEREMap, ImageMap, OpenStreetMap, TencentMap } from './providers'; +import { parseArray, parseData, parseFunction, parseWithTranslation } from '@core/utils'; +import { addCondition, addGroupInfo, addToSchema, initSchema, mergeSchemes } from '@core/schema-utils'; import { forkJoin } from 'rxjs'; import { WidgetContext } from '@app/modules/home/models/widget-component.models'; import { getDefCenterPosition } from './maps-utils'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts index 4ac437830c..f3c825c069 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts @@ -15,9 +15,7 @@ /// import L from 'leaflet'; -import _ from 'lodash'; -import { MarkerSettings, PolylineSettings, PolygonSettings } from './map-models'; -import { parseWithTranslation } from '@app/core/utils'; +import { MarkerSettings, PolygonSettings, PolylineSettings } from './map-models'; export function createTooltip(target: L.Layer, settings: MarkerSettings | PolylineSettings | PolygonSettings, @@ -63,4 +61,4 @@ export function getDefCenterPosition(position) { if (typeof (position) === 'object') return position; return [0, 0]; -} \ No newline at end of file +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.scss b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.scss index d402a4b5d9..8cb1894194 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.scss @@ -16,10 +16,8 @@ .arrow { height: 30px; width: 30px; - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAtCAMAAAANxBKoAAACAVBMVEUAAAAAqv9AgP8ggP8udP8qgP8ndv8kbf8kgP8eeP8rcf8mc/8jdP8hev8me/8kdv8jcv8pcP8ic/8neP8leP8ofP8mef8pev8nef8oe/8nef8pef8qfv8qgf8qe/8mev8off8oev8oef8oe/8pev8qe/8oe/8off8pfP8oev8pev8qe/8qfP8pev8pe/8qfP8pe/8oev8pe/8qe/8qfP8qfP8qff8qff8qfP8qff8pe/8qff8qfP8qfP8pev8pev8JYf8KYP8UY/8UZf8WY/8WZv8YZP8bZP8fZv8fZ/8gZv8gZ/8hZP8iZ/8jaf8jav8kaP8kav8ka/8kbP8kbf8kb/8lbP8lbf8lbv8lb/8lcP8mb/8mcP8mcf8ncf8ncv8nc/8ndP8ndf8ocv4odP8odf8odv8od/8oeP8peP8pef8pev8qev8qe/8qfP8rbP8rfP8rff8tc/4vcP4xbv4zcf42dP49df4+gP4/fv5Rif5biP1ul/14mvx4nvyMrfuMrvuWsfuctvuguPuww/vD0fnH1vrI1frK2PrL2fnV3vnb4vnc5fnd5fnd5vne5fnj6vnl6/jm7Pno7fXo7fbo7ffo7fjp7fnp7vjq7vjs8fnt8Pjt8fjw8fXw8fbw8fjy8/jz9fn5+fj7+/f++/j/+/X/+/b/+/f/+/j//Pj//vhoUaHMAAAAQHRSTlMAAwQICwwNDg4REhQWFxscHTI1QkRGSktOU1RdYWFscXJzhYWKqre6wMHDw8PHx8rN09TW1uLi7e/x8vLz9fj5hfwW0QAAAnVJREFUSMeV1fdb00AYB/BzoQjurSjuvQcuFLcgWqTVtLVpL0GS2GuDuLeouPeAiLOuwOFf6WU0ucvq4/d52v6Qz/M+18u97wHgyfh5m5vUYlHt2rV8BojOqGUqonNhVgTegfxZE2JXoMAUFgXYsSoKy3YfnoIiUqxm8UwUnSoaT0WVUuPi6lCUz+ft/+pqNYwqsiwrlm8s45XBVpE7BQgFyeZLbB1ihVwmefjpDSjbi7HwziArCdlU/MArjDHfaestBh4dZs9/JBb/4kVbo5FEr/JaWRL4VPvZ39jMVV4q63qiCx7bIfDJtst/LYt/JnLldaNuACbS9JwiQj4Zu/3HlDr5nEyJivMcgPn0Nogwfaq1Z9igQ7pO9AuqNEJzQINTV5ZghjvywLFG6dYMVRptAF3uPvBc8xPsWH0Q44ccpEqjvaBoa0lI7/ts2kHdCsbDJ5jSSC2/SEU8856x+hDGd+JZujQquvp6ieT7Nyel0o/jCSgzTefq0y81I30f7PRr2i1fbWrd+98yXtMGfOt29wTyiebHpu83dZ+m3U969qSBeje5DHeod8Dx5PeYZ7/rPO8y0XLvk+1J8UcJyLzLScw5kTsgz8Xu2vXJV0uaOSfsGcznZZGcwdi1L5qV13HmDILV3tY1z3fbxa8Wv+Se74VEj/H3jmz0TvuVN4Z+x/ZORF8efU64s/CtUT0vCbk0d/DZTSgxPQ/WhswTSYTZrDNPllaaVQo1q/Y4k63mv+YgmFZxxk6gR/LsCngcO+6nR9lCrfcqqQ2/dxqD7rT1IXhxyB24O8BuCr9eq9axU7F7wYjoy3ty3TZVLaCC2rRxru/hPwVgtEdFK5vOAAAAAElFTkSuQmCC"); background-size: cover; - background-repeat: no-repeat; - background-position: center center; + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAtCAMAAAANxBKoAAACAVBMVEUAAAAAqv9AgP8ggP8udP8qgP8ndv8kbf8kgP8eeP8rcf8mc/8jdP8hev8me/8kdv8jcv8pcP8ic/8neP8leP8ofP8mef8pev8nef8oe/8nef8pef8qfv8qgf8qe/8mev8off8oev8oef8oe/8pev8qe/8oe/8off8pfP8oev8pev8qe/8qfP8pev8pe/8qfP8pe/8oev8pe/8qe/8qfP8qfP8qff8qff8qfP8qff8pe/8qff8qfP8qfP8pev8pev8JYf8KYP8UY/8UZf8WY/8WZv8YZP8bZP8fZv8fZ/8gZv8gZ/8hZP8iZ/8jaf8jav8kaP8kav8ka/8kbP8kbf8kb/8lbP8lbf8lbv8lb/8lcP8mb/8mcP8mcf8ncf8ncv8nc/8ndP8ndf8ocv4odP8odf8odv8od/8oeP8peP8pef8pev8qev8qe/8qfP8rbP8rfP8rff8tc/4vcP4xbv4zcf42dP49df4+gP4/fv5Rif5biP1ul/14mvx4nvyMrfuMrvuWsfuctvuguPuww/vD0fnH1vrI1frK2PrL2fnV3vnb4vnc5fnd5fnd5vne5fnj6vnl6/jm7Pno7fXo7fbo7ffo7fjp7fnp7vjq7vjs8fnt8Pjt8fjw8fXw8fbw8fjy8/jz9fn5+fj7+/f++/j/+/X/+/b/+/f/+/j//Pj//vhoUaHMAAAAQHRSTlMAAwQICwwNDg4REhQWFxscHTI1QkRGSktOU1RdYWFscXJzhYWKqre6wMHDw8PHx8rN09TW1uLi7e/x8vLz9fj5hfwW0QAAAnVJREFUSMeV1fdb00AYB/BzoQjurSjuvQcuFLcgWqTVtLVpL0GS2GuDuLeouPeAiLOuwOFf6WU0ucvq4/d52v6Qz/M+18u97wHgyfh5m5vUYlHt2rV8BojOqGUqonNhVgTegfxZE2JXoMAUFgXYsSoKy3YfnoIiUqxm8UwUnSoaT0WVUuPi6lCUz+ft/+pqNYwqsiwrlm8s45XBVpE7BQgFyeZLbB1ihVwmefjpDSjbi7HwziArCdlU/MArjDHfaestBh4dZs9/JBb/4kVbo5FEr/JaWRL4VPvZ39jMVV4q63qiCx7bIfDJtst/LYt/JnLldaNuACbS9JwiQj4Zu/3HlDr5nEyJivMcgPn0Nogwfaq1Z9igQ7pO9AuqNEJzQINTV5ZghjvywLFG6dYMVRptAF3uPvBc8xPsWH0Q44ccpEqjvaBoa0lI7/ts2kHdCsbDJ5jSSC2/SEU8856x+hDGd+JZujQquvp6ieT7Nyel0o/jCSgzTefq0y81I30f7PRr2i1fbWrd+98yXtMGfOt29wTyiebHpu83dZ+m3U969qSBeje5DHeod8Dx5PeYZ7/rPO8y0XLvk+1J8UcJyLzLScw5kTsgz8Xu2vXJV0uaOSfsGcznZZGcwdi1L5qV13HmDILV3tY1z3fbxa8Wv+Se74VEj/H3jmz0TvuVN4Z+x/ZORF8efU64s/CtUT0vCbk0d/DZTSgxPQ/WhswTSYTZrDNPllaaVQo1q/Y4k63mv+YgmFZxxk6gR/LsCngcO+6nR9lCrfcqqQ2/dxqD7rT1IXhxyB24O8BuCr9eq9axU7F7wYjoy3ty3TZVLaCC2rRxru/hPwVgtEdFK5vOAAAAAElFTkSuQmCC") no-repeat center center; } .leaflet-div-icon, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts index 0b0d269ce1..f5263bb4a3 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts @@ -17,7 +17,7 @@ import L from 'leaflet'; import LeafletMap from '../leaflet-map'; -import { MapSettings, UnitedMapSettings } from '../map-models'; +import { UnitedMapSettings } from '../map-models'; import 'leaflet.gridlayer.googlemutant'; let googleLoaded = false; @@ -54,4 +54,4 @@ export class GoogleMap extends LeafletMap { document.getElementsByTagName('head')[0].appendChild(script); } } -} \ No newline at end of file +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/here-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/here-map.ts index 2b48e3ee8b..9ad0d7b160 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/here-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/here-map.ts @@ -16,7 +16,7 @@ import L from 'leaflet'; import LeafletMap from '../leaflet-map'; -import { MapSettings, UnitedMapSettings } from '../map-models'; +import { UnitedMapSettings } from '../map-models'; export class HEREMap extends LeafletMap { constructor($container, options: UnitedMapSettings) { @@ -27,4 +27,4 @@ export class HEREMap extends LeafletMap { super.setMap(map); super.initSettings(options); } -} \ No newline at end of file +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts index 94c58b6520..8a7c8f5712 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts @@ -16,7 +16,7 @@ import L, { LatLngLiteral } from 'leaflet'; import LeafletMap from '../leaflet-map'; -import { MapSettings, UnitedMapSettings } from '../map-models'; +import { UnitedMapSettings } from '../map-models'; import { aspectCache } from '@app/core/utils'; const maxZoom = 4;// ? @@ -135,4 +135,4 @@ export class ImageMap extends LeafletMap { [this.options.yPosKeyName]: (position.lat + 180) / 360 } }*/ -} \ No newline at end of file +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts index e39aa6ab02..38db40208a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts @@ -16,7 +16,7 @@ import L from 'leaflet'; import LeafletMap from '../leaflet-map'; -import { MapSettings, UnitedMapSettings } from '../map-models'; +import { UnitedMapSettings } from '../map-models'; export class OpenStreetMap extends LeafletMap { constructor($container, options: UnitedMapSettings) { @@ -27,4 +27,4 @@ export class OpenStreetMap extends LeafletMap { super.setMap(map); super.initSettings(options); } -} \ No newline at end of file +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/tencent-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/tencent-map.ts index 980846796c..51c848c533 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/tencent-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/tencent-map.ts @@ -17,7 +17,7 @@ import L from 'leaflet'; import LeafletMap from '../leaflet-map'; -import { MapSettings, UnitedMapSettings } from '../map-models'; +import { UnitedMapSettings } from '../map-models'; export class TencentMap extends LeafletMap { constructor($container, options: UnitedMapSettings) { @@ -29,4 +29,4 @@ export class TencentMap extends LeafletMap { super.setMap(map); super.initSettings(options); } -} \ No newline at end of file +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/knob.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/knob.component.ts index e15d25bd86..0b9a8cb995 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/knob.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/knob.component.ts @@ -23,8 +23,8 @@ import { AppState } from '@core/core.state'; import { isDefined, isNumber } from '@core/utils'; import { CanvasDigitalGauge, CanvasDigitalGaugeOptions } from '@home/components/widget/lib/canvas-digital-gauge'; import * as tinycolor_ from 'tinycolor2'; -import GenericOptions = CanvasGauges.GenericOptions; import { ResizeObserver } from '@juggle/resize-observer'; +import GenericOptions = CanvasGauges.GenericOptions; const tinycolor = tinycolor_; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.scss b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.scss index 2f393f5856..d20588e412 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.scss @@ -32,16 +32,16 @@ .mat-row:not(.mat-row-select), .mat-header-row:not(.mat-row-select) { mat-cell:nth-child(n+2):nth-last-child(n+2), mat-footer-cell:nth-child(n+2):nth-last-child(n+2), mat-header-cell:nth-child(n+2):nth-last-child(n+2) { - padding: 0px 5px; + padding: 0 5px; } } .mat-row.mat-row-select, .mat-header-row.mat-row-select { mat-cell:nth-child(2), mat-footer-cell:nth-child(2), mat-header-cell:nth-child(2) { - padding: 0px 5px; + padding: 0 5px; } mat-cell:nth-child(n+3):nth-last-child(n+2), mat-footer-cell:nth-child(n+3):nth-last-child(n+2), mat-header-cell:nth-child(n+3):nth-last-child(n+2) { - padding: 0px 5px; + padding: 0 5px; } } } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts index d0bb73e3af..592cb4d286 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts @@ -44,8 +44,7 @@ import { isDefined, isNumber } from '@core/utils'; import cssjs from '@core/css/css'; import { PageLink } from '@shared/models/page/page-link'; import { Direction, SortOrder, sortOrderFromString } from '@shared/models/page/sort-order'; -import { DataSource } from '@angular/cdk/collections'; -import { CollectionViewer } from '@angular/cdk/collections'; +import { CollectionViewer, DataSource } from '@angular/cdk/collections'; import { BehaviorSubject, fromEvent, merge, Observable, of } from 'rxjs'; import { emptyPageData, PageData } from '@shared/models/page/page-data'; import { catchError, debounceTime, distinctUntilChanged, map, tap } from 'rxjs/operators'; diff --git a/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts b/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts index 5d2f8bfa2e..ce1502ac58 100644 --- a/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts @@ -19,15 +19,15 @@ import _ from 'lodash'; import tinycolor from 'tinycolor2'; import { interpolateOnPointSegment } from 'leaflet-geometryutil'; -import { Component, OnInit, Input, ViewChild, AfterViewInit, ChangeDetectorRef, SecurityContext } from '@angular/core'; +import { AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, SecurityContext, ViewChild } from '@angular/core'; import { MapWidgetController, TbMapWidgetV2 } from '../lib/maps/map-widget2'; import { MapProviders } from '../lib/maps/map-models'; -import { parseArray, parseWithTranslation, safeExecute, parseTemplate } from '@app/core/utils'; -import { initSchema, addToSchema, addGroupInfo } from '@app/core/schema-utils'; +import { parseArray, parseWithTranslation, safeExecute } from '@app/core/utils'; +import { addGroupInfo, addToSchema, initSchema } from '@app/core/schema-utils'; import { tripAnimationSchema } from '../lib/maps/schemes'; import { DomSanitizer } from '@angular/platform-browser'; import { WidgetContext } from '@app/modules/home/models/widget-component.models'; -import { getRatio, findAngle } from '../lib/maps/maps-utils'; +import { findAngle, getRatio } from '../lib/maps/maps-utils'; import { JsonSettingsSchema, WidgetConfig } from '@shared/models/widget.models'; import moment from 'moment'; diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts index 344f7cf02d..00ba5b2b8d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts @@ -23,7 +23,9 @@ import { Datasource, DatasourceType, datasourceTypeTranslationMap, - defaultLegendConfig, GroupInfo, JsonSchema, + defaultLegendConfig, + GroupInfo, + JsonSchema, widgetType } from '@shared/models/widget.models'; import { diff --git a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.ts b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.ts index dd696d25bd..d7e03bc79f 100644 --- a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.ts @@ -120,16 +120,12 @@ export class AddEntitiesToCustomerDialogComponent extends switch (this.data.entityType) { case EntityType.DEVICE: return this.deviceService.assignDeviceToCustomer(customerId, entityId); - break; case EntityType.ASSET: return this.assetService.assignAssetToCustomer(customerId, entityId); - break; case EntityType.ENTITY_VIEW: return this.entityViewService.assignEntityViewToCustomer(customerId, entityId); - break; case EntityType.DASHBOARD: return this.dashboardService.assignDashboardToCustomer(customerId, entityId); - break; } } diff --git a/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.ts b/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.ts index 1643223ebf..97177378f6 100644 --- a/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.ts @@ -114,13 +114,10 @@ export class AssignToCustomerDialogComponent extends switch (this.data.entityType) { case EntityType.DEVICE: return this.deviceService.assignDeviceToCustomer(customerId, entityId); - break; case EntityType.ASSET: return this.assetService.assignAssetToCustomer(customerId, entityId); - break; case EntityType.ENTITY_VIEW: return this.entityViewService.assignEntityViewToCustomer(customerId, entityId); - break; } } diff --git a/ui-ngx/src/app/modules/home/home-routing.module.ts b/ui-ngx/src/app/modules/home/home-routing.module.ts index 7aa99e6ebc..f73528db68 100644 --- a/ui-ngx/src/app/modules/home/home-routing.module.ts +++ b/ui-ngx/src/app/modules/home/home-routing.module.ts @@ -15,7 +15,7 @@ /// import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { HomeComponent } from './home.component'; import { AuthGuard } from '@core/guards/auth.guard'; diff --git a/ui-ngx/src/app/modules/home/menu/menu-link.component.ts b/ui-ngx/src/app/modules/home/menu/menu-link.component.ts index 787d7b7928..6edef6a8af 100644 --- a/ui-ngx/src/app/modules/home/menu/menu-link.component.ts +++ b/ui-ngx/src/app/modules/home/menu/menu-link.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { MenuSection } from '@core/services/menu.models'; @Component({ diff --git a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.ts b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.ts index fcadd04a2f..4054bc4b4f 100644 --- a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.ts +++ b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { MenuSection } from '@core/services/menu.models'; import { Router } from '@angular/router'; diff --git a/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts b/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts index 768b7fcc52..b79c16527e 100644 --- a/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts +++ b/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts @@ -15,13 +15,13 @@ /// import { GridsterComponent, GridsterConfig, GridsterItem, GridsterItemComponentInterface } from 'angular-gridster2'; -import { Widget, widgetType, WidgetPosition } from '@app/shared/models/widget.models'; +import { Widget, WidgetPosition, widgetType } from '@app/shared/models/widget.models'; import { WidgetLayout, WidgetLayouts } from '@app/shared/models/dashboard.models'; import { IDashboardWidget, WidgetAction, WidgetContext, WidgetHeaderAction } from './widget-component.models'; import { Timewindow } from '@shared/models/time/time.models'; import { Observable, of, Subject } from 'rxjs'; import { guid, isDefined, isEqual, isUndefined } from '@app/core/utils'; -import { IterableDiffer, KeyValueDiffer, NgZone } from '@angular/core'; +import { IterableDiffer, KeyValueDiffer } from '@angular/core'; import { IAliasController, IStateController } from '@app/core/api/widget-api.models'; export interface WidgetsData { diff --git a/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts b/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts index d377fe9373..3d46a8a8cf 100644 --- a/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts +++ b/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts @@ -14,10 +14,9 @@ /// limitations under the License. /// -import { CollectionViewer, DataSource } from '@angular/cdk/collections'; +import { CollectionViewer, DataSource, SelectionModel } from '@angular/cdk/collections'; import { BehaviorSubject, Observable, of, ReplaySubject } from 'rxjs'; import { emptyPageData, PageData } from '@shared/models/page/page-data'; -import { SelectionModel } from '@angular/cdk/collections'; import { PageLink } from '@shared/models/page/page-link'; import { catchError, map, publishReplay, refCount, take, tap } from 'rxjs/operators'; import { EntityId } from '@app/shared/models/id/entity-id'; @@ -26,8 +25,8 @@ import { AttributeData, AttributeScope, isClientSideTelemetryType, - TelemetryType, - TelemetrySubscriber + TelemetrySubscriber, + TelemetryType } from '@shared/models/telemetry/telemetry.models'; import { AttributeService } from '@core/http/attribute.service'; import { TelemetryWebsocketService } from '@core/ws/telemetry-websocket.service'; diff --git a/ui-ngx/src/app/modules/home/models/entity/entity-component.models.ts b/ui-ngx/src/app/modules/home/models/entity/entity-component.models.ts index dde03b6227..9b081431ef 100644 --- a/ui-ngx/src/app/modules/home/models/entity/entity-component.models.ts +++ b/ui-ngx/src/app/modules/home/models/entity/entity-component.models.ts @@ -14,8 +14,8 @@ /// limitations under the License. /// -import {BaseData, HasId} from '@shared/models/base-data'; -import {EntityTableConfig} from './entities-table-config.models'; +import { BaseData, HasId } from '@shared/models/base-data'; +import { EntityTableConfig } from './entities-table-config.models'; export interface AddEntityDialogData> { entitiesTableConfig: EntityTableConfig; diff --git a/ui-ngx/src/app/modules/home/models/widget-component.models.ts b/ui-ngx/src/app/modules/home/models/widget-component.models.ts index 185074a8ad..30dea45d6b 100644 --- a/ui-ngx/src/app/modules/home/models/widget-component.models.ts +++ b/ui-ngx/src/app/modules/home/models/widget-component.models.ts @@ -17,7 +17,10 @@ import { IDashboardComponent } from '@home/models/dashboard-component.models'; import { DataSet, - Datasource, DatasourceData, + Datasource, + DatasourceData, + JsonSettingsSchema, + Widget, WidgetActionDescriptor, WidgetActionSource, WidgetConfig, @@ -25,8 +28,7 @@ import { WidgetType, widgetType, WidgetTypeDescriptor, - WidgetTypeParameters, - Widget, JsonSettingsSchema + WidgetTypeParameters } from '@shared/models/widget.models'; import { Timewindow, WidgetTimewindow } from '@shared/models/time/time.models'; import { @@ -34,10 +36,11 @@ import { IStateController, IWidgetSubscription, IWidgetUtils, - RpcApi, SubscriptionEntityInfo, SubscriptionInfo, + RpcApi, + SubscriptionEntityInfo, TimewindowFunctions, WidgetActionsApi, - WidgetSubscriptionApi, WidgetSubscriptionContext, WidgetSubscriptionOptions + WidgetSubscriptionApi } from '@core/api/widget-api.models'; import { ChangeDetectorRef, ComponentFactory, Injector, NgZone, Type } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; @@ -45,13 +48,8 @@ import { RafService } from '@core/services/raf.service'; import { WidgetTypeId } from '@shared/models/id/widget-type-id'; import { TenantId } from '@shared/models/id/tenant-id'; import { WidgetLayout } from '@shared/models/dashboard.models'; -import { DeviceService } from '@core/http/device.service'; -import { AssetService } from '@app/core/http/asset.service'; -import { DialogService } from '@core/services/dialog.service'; -import { CustomDialogService } from '@home/components/widget/dialog/custom-dialog.service'; -import { isDefined, formatValue } from '@core/utils'; -import { forkJoin, Observable, of, ReplaySubject } from 'rxjs'; -import { WidgetSubscription } from '@core/api/widget-subscription'; +import { formatValue, isDefined } from '@core/utils'; +import { forkJoin, of } from 'rxjs'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts index f69a9b591f..ab5535a92f 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts @@ -26,8 +26,10 @@ import { DashboardConfiguration, DashboardLayoutId, DashboardLayoutInfo, - DashboardLayoutsInfo, DashboardState, - DashboardStateLayouts, GridSettings, + DashboardLayoutsInfo, + DashboardState, + DashboardStateLayouts, + GridSettings, WidgetLayout } from '@app/shared/models/dashboard.models'; import { WINDOW } from '@core/services/window.service'; diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.models.ts b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.models.ts index 7fd00cdd04..010c64b444 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.models.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.models.ts @@ -70,7 +70,6 @@ export declare type DashboardPageLayouts = {[key in DashboardLayoutId]: Dashboar export class LayoutWidgetsArray implements Iterable { private widgetIds: string[] = []; - private pointer = 0; private loaded = false; diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-widget-select.component.ts b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-widget-select.component.ts index 2fcc659d13..0c90a9bdda 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-widget-select.component.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-widget-select.component.ts @@ -14,23 +14,12 @@ /// limitations under the License. /// -import { - Component, - OnDestroy, - OnInit, - ViewEncapsulation, - Input, - Output, - EventEmitter, - OnChanges, - SimpleChanges -} from '@angular/core'; -import { PageComponent } from '@shared/components/page.component'; +import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { WidgetsBundle } from '@shared/models/widgets-bundle.model'; import { IAliasController } from '@core/api/widget-api.models'; import { NULL_UUID } from '@shared/models/id/has-uuid'; import { WidgetService } from '@core/http/widget.service'; -import { widgetType, Widget } from '@shared/models/widget.models'; +import { Widget, widgetType } from '@shared/models/widget.models'; import { toWidgetInfo } from '@home/models/widget-component.models'; import { DashboardCallbacks } from '../../models/dashboard-component.models'; diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/edit-widget.component.ts b/ui-ngx/src/app/modules/home/pages/dashboard/edit-widget.component.ts index 553d3515d0..38c49b9f16 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/edit-widget.component.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/edit-widget.component.ts @@ -14,35 +14,18 @@ /// limitations under the License. /// -import { Component, OnInit, Input, OnChanges, SimpleChanges, ViewChild, ChangeDetectionStrategy } from '@angular/core'; +import { Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { PageComponent } from '@shared/components/page.component'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; -import { ActivatedRoute, Router } from '@angular/router'; -import { WidgetService } from '@core/http/widget.service'; -import { DialogService } from '@core/services/dialog.service'; import { MatDialog } from '@angular/material/dialog'; -import { TranslateService } from '@ngx-translate/core'; import { Dashboard, WidgetLayout } from '@shared/models/dashboard.models'; import { IAliasController } from '@core/api/widget-api.models'; -import { Widget, WidgetActionSource, WidgetTypeParameters } from '@shared/models/widget.models'; +import { Widget } from '@shared/models/widget.models'; import { WidgetComponentService } from '@home/components/widget/widget-component.service'; import { WidgetConfigComponentData } from '../../models/widget-component.models'; -import { deepClone, isDefined, isString } from '@core/utils'; -import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { EntityType } from '@shared/models/entity-type.models'; -import { Observable, of } from 'rxjs'; -import { EntityAlias, EntityAliases } from '@shared/models/alias.models'; -import { WidgetConfigCallbacks } from '@home/components/widget/widget-config.component.models'; -import { - EntityAliasesDialogComponent, - EntityAliasesDialogData -} from '@home/components/alias/entity-aliases-dialog.component'; -import { - EntityAliasDialogComponent, - EntityAliasDialogData -} from '@home/components/alias/entity-alias-dialog.component'; -import { tap } from 'rxjs/operators'; +import { isDefined, isString } from '@core/utils'; +import { FormBuilder, FormGroup, NgForm } from '@angular/forms'; @Component({ selector: 'tb-edit-widget', diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.ts index 92bfdf2d23..caceb2023b 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.ts @@ -14,19 +14,15 @@ /// limitations under the License. /// -import {Component, Inject, OnInit, SkipSelf} from '@angular/core'; -import { ErrorStateMatcher } from '@angular/material/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import {PageComponent} from '@shared/components/page.component'; -import {Store} from '@ngrx/store'; -import {AppState} from '@core/core.state'; -import {FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm} from '@angular/forms'; -import {EntityType} from '@shared/models/entity-type.models'; -import {DashboardService} from '@core/http/dashboard.service'; -import {forkJoin, Observable} from 'rxjs'; -import {DashboardInfo} from '@app/shared/models/dashboard.models'; -import {ActionNotificationShow} from '@core/notification/notification.actions'; -import {TranslateService} from '@ngx-translate/core'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { FormBuilder } from '@angular/forms'; +import { DashboardService } from '@core/http/dashboard.service'; +import { DashboardInfo } from '@app/shared/models/dashboard.models'; +import { ActionNotificationShow } from '@core/notification/notification.actions'; +import { TranslateService } from '@ngx-translate/core'; import { DialogComponent } from '@shared/components/dialog.component'; import { Router } from '@angular/router'; diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.ts index e8950e8eab..b3ea169238 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.ts @@ -14,16 +14,15 @@ /// limitations under the License. /// -import {Component, Inject, OnInit, SkipSelf} from '@angular/core'; +import { Component, Inject, OnInit, SkipSelf } from '@angular/core'; import { ErrorStateMatcher } from '@angular/material/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import {PageComponent} from '@shared/components/page.component'; -import {Store} from '@ngrx/store'; -import {AppState} from '@core/core.state'; -import {FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm} from '@angular/forms'; -import {EntityType} from '@shared/models/entity-type.models'; -import {DashboardService} from '@core/http/dashboard.service'; -import {forkJoin, Observable} from 'rxjs'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms'; +import { EntityType } from '@shared/models/entity-type.models'; +import { DashboardService } from '@core/http/dashboard.service'; +import { forkJoin, Observable } from 'rxjs'; import { DialogComponent } from '@shared/components/dialog.component'; import { Router } from '@angular/router'; @@ -122,13 +121,10 @@ export class ManageDashboardCustomersDialogComponent extends switch (this.data.actionType) { case 'assign': return this.dashboardService.addDashboardCustomers(dashboardId, customerIds); - break; case 'manage': return this.dashboardService.updateDashboardCustomers(dashboardId, customerIds); - break; case 'unassign': return this.dashboardService.removeDashboardCustomers(dashboardId, customerIds); - break; } } } diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/states/state-controller.component.ts b/ui-ngx/src/app/modules/home/pages/dashboard/states/state-controller.component.ts index f8deb4c035..b0825e8aa9 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/states/state-controller.component.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/states/state-controller.component.ts @@ -19,7 +19,7 @@ import { IDashboardController } from '../dashboard-page.models'; import { DashboardState } from '@app/shared/models/dashboard.models'; import { Subscription } from 'rxjs'; import { NgZone, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute, Router, Params } from '@angular/router'; +import { ActivatedRoute, Params, Router } from '@angular/router'; import { StatesControllerService } from '@home/pages/dashboard/states/states-controller.service'; import { EntityId } from '@app/shared/models/id/entity-id'; import { StateParams } from '@app/core/api/widget-api.models'; diff --git a/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts index 10eff975a5..4137a6752d 100644 --- a/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts +++ b/ui-ngx/src/app/modules/home/pages/device/device-table-header.component.ts @@ -18,8 +18,8 @@ import { Component } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { EntityTableHeaderComponent } from '../../components/entity/entity-table-header.component'; -import {DeviceInfo} from '@app/shared/models/device.models'; -import {EntityType} from '@shared/models/entity-type.models'; +import { DeviceInfo } from '@app/shared/models/device.models'; +import { EntityType } from '@shared/models/entity-type.models'; @Component({ selector: 'tb-device-table-header', diff --git a/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts b/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts index 6229d491f5..94fca64ac2 100644 --- a/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts @@ -14,11 +14,11 @@ /// limitations under the License. /// -import {NgModule} from '@angular/core'; -import {RouterModule, Routes} from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import {HomeLinksComponent} from './home-links.component'; -import {Authority} from '@shared/models/authority.enum'; +import { HomeLinksComponent } from './home-links.component'; +import { Authority } from '@shared/models/authority.enum'; const routes: Routes = [ { diff --git a/ui-ngx/src/app/modules/home/pages/home-links/home-links.component.ts b/ui-ngx/src/app/modules/home/pages/home-links/home-links.component.ts index 2a2aaf64f4..2c43b4d702 100644 --- a/ui-ngx/src/app/modules/home/pages/home-links/home-links.component.ts +++ b/ui-ngx/src/app/modules/home/pages/home-links/home-links.component.ts @@ -15,9 +15,6 @@ /// import { Component, OnInit } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { AppState } from '@core/core.state'; -import { PageComponent } from '@shared/components/page.component'; import { MenuService } from '@core/services/menu.service'; import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout'; import { MediaBreakpoints } from '@shared/models/constants'; diff --git a/ui-ngx/src/app/modules/home/pages/home-links/home-links.module.ts b/ui-ngx/src/app/modules/home/pages/home-links/home-links.module.ts index 18ec7018bc..af2f2bf6be 100644 --- a/ui-ngx/src/app/modules/home/pages/home-links/home-links.module.ts +++ b/ui-ngx/src/app/modules/home/pages/home-links/home-links.module.ts @@ -18,7 +18,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { HomeLinksRoutingModule } from './home-links-routing.module'; -import { HomeLinksComponent} from './home-links.component'; +import { HomeLinksComponent } from './home-links.component'; import { SharedModule } from '@app/shared/shared.module'; @NgModule({ diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.scss b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.scss index 768e76b5a9..8d034392c6 100644 --- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.scss +++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.scss @@ -114,7 +114,7 @@ overflow-x: hidden; overflow-y: auto; .mat-expansion-panel { - border-radius: 0px; + border-radius: 0; &:last-child { margin-bottom: 5px; } diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts index 1b5e34a0f5..cd305ed81a 100644 --- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts +++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts @@ -40,10 +40,12 @@ import { DialogService } from '@core/services/dialog.service'; import { AuthService } from '@core/auth/auth.service'; import { ActivatedRoute, Router } from '@angular/router'; import { - inputNodeComponent, NodeConnectionInfo, + inputNodeComponent, + NodeConnectionInfo, ResolvedRuleChainMetaData, RuleChain, - RuleChainConnectionInfo, RuleChainImport, + RuleChainConnectionInfo, + RuleChainImport, RuleChainMetaData, ruleChainNodeComponent } from '@shared/models/rule-chain.models'; @@ -73,8 +75,8 @@ import { MatMenuTrigger } from '@angular/material/menu'; import { ItemBufferService, RuleNodeConnection } from '@core/services/item-buffer.service'; import { Hotkey } from 'angular2-hotkeys'; import { EntityType } from '@shared/models/entity-type.models'; -import Timeout = NodeJS.Timeout; import { DebugEventType, EventType } from '@shared/models/event.models'; +import Timeout = NodeJS.Timeout; @Component({ selector: 'tb-rulechain-page', diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts index d750559c00..99c8bf2a9f 100644 --- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts @@ -16,13 +16,16 @@ import * as AngularCore from '@angular/core'; import { Injectable, NgModule } from '@angular/core'; +import * as AngularRouter from '@angular/router'; import { ActivatedRouteSnapshot, CanActivate, - Resolve, Router, + Resolve, + Router, RouterModule, RouterStateSnapshot, - Routes, UrlTree + Routes, + UrlTree } from '@angular/router'; import { EntitiesTableComponent } from '../../components/entity/entities-table.component'; @@ -40,7 +43,6 @@ import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard'; import * as AngularCommon from '@angular/common'; import * as AngularForms from '@angular/forms'; -import * as AngularRouter from '@angular/router'; import * as AngularCdkCoercion from '@angular/cdk/coercion'; import * as AngularCdkKeycodes from '@angular/cdk/keycodes'; import * as AngularMaterialChips from '@angular/material/chips'; @@ -49,10 +51,10 @@ import * as AngularMaterialDialog from '@angular/material/dialog'; import * as NgrxStore from '@ngrx/store'; import * as TranslateCore from '@ngx-translate/core'; import * as TbCore from '@core/public-api'; +import { ItemBufferService } from '@core/public-api'; import * as TbShared from '@shared/public-api'; import * as TbHomeComponents from '@home/components/public-api'; import * as _moment from 'moment'; -import { ItemBufferService } from '@core/public-api'; declare const SystemJS; diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-tabs.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-tabs.component.ts index 42acf01a3b..e658ed0d7e 100644 --- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-tabs.component.ts +++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-tabs.component.ts @@ -18,7 +18,6 @@ import { Component } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { EntityTabsComponent } from '../../components/entity/entity-tabs.component'; -import { AssetInfo } from '@app/shared/models/asset.models'; import { RuleChain } from '@shared/models/rule-chain.models'; @Component({ diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html index 6bb9863d51..51c7236db2 100644 --- a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html +++ b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html @@ -124,7 +124,7 @@ fxLayoutAlign="start center" *ngFor="let resource of widget.resources; let i = index" > + style="margin: 10px 0 0 0; max-height: 40px;"> diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts index 9d6a172895..d931bbd697 100644 --- a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts +++ b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts @@ -45,8 +45,8 @@ import { SaveWidgetTypeAsDialogResult } from '@home/pages/widget/save-widget-type-as-dialog.component'; import { Subscription } from 'rxjs'; -import Timeout = NodeJS.Timeout; import { ResizeObserver } from '@juggle/resize-observer'; +import Timeout = NodeJS.Timeout; // @dynamic @Component({ diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts index c5f188dfe1..04fe7fdad7 100644 --- a/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts +++ b/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts @@ -14,12 +14,12 @@ /// limitations under the License. /// -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {SharedModule} from '@shared/shared.module'; -import {WidgetsBundleComponent} from '@modules/home/pages/widget/widgets-bundle.component'; -import {WidgetLibraryRoutingModule} from '@modules/home/pages/widget/widget-library-routing.module'; -import {HomeComponentsModule} from '@modules/home/components/home-components.module'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '@shared/shared.module'; +import { WidgetsBundleComponent } from '@modules/home/pages/widget/widgets-bundle.component'; +import { WidgetLibraryRoutingModule } from '@modules/home/pages/widget/widget-library-routing.module'; +import { HomeComponentsModule } from '@modules/home/components/home-components.module'; import { WidgetLibraryComponent } from './widget-library.component'; import { WidgetEditorComponent } from '@home/pages/widget/widget-editor.component'; import { SelectWidgetTypeDialogComponent } from '@home/pages/widget/select-widget-type-dialog.component'; diff --git a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle.component.ts b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle.component.ts index 1e70668556..26db26b4bf 100644 --- a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle.component.ts +++ b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle.component.ts @@ -15,11 +15,11 @@ /// import { Component, Inject } from '@angular/core'; -import {Store} from '@ngrx/store'; -import {AppState} from '@core/core.state'; -import {EntityComponent} from '../../components/entity/entity.component'; -import {FormBuilder, FormGroup, Validators} from '@angular/forms'; -import {WidgetsBundle} from '@shared/models/widgets-bundle.model'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { EntityComponent } from '../../components/entity/entity.component'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { WidgetsBundle } from '@shared/models/widgets-bundle.model'; import { EntityTableConfig } from '@home/models/entity/entities-table-config.models'; @Component({ diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.ts b/ui-ngx/src/app/modules/login/pages/login/login.component.ts index 7e3f99239f..a53d83f839 100644 --- a/ui-ngx/src/app/modules/login/pages/login/login.component.ts +++ b/ui-ngx/src/app/modules/login/pages/login/login.component.ts @@ -22,8 +22,7 @@ import { PageComponent } from '@shared/components/page.component'; import { FormBuilder } from '@angular/forms'; import { HttpErrorResponse } from '@angular/common/http'; import { Constants } from '@shared/models/constants'; -import { Router } from '@angular/router'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; @Component({ selector: 'tb-login', diff --git a/ui-ngx/src/app/shared/animations/speed-dial-fab.animations.ts b/ui-ngx/src/app/shared/animations/speed-dial-fab.animations.ts index 2583789d3d..d3c3d0fcb6 100644 --- a/ui-ngx/src/app/shared/animations/speed-dial-fab.animations.ts +++ b/ui-ngx/src/app/shared/animations/speed-dial-fab.animations.ts @@ -14,16 +14,7 @@ /// limitations under the License. /// -import { - animate, - keyframes, - query, - stagger, - state, - style, - transition, - trigger -} from '@angular/animations'; +import { animate, keyframes, query, stagger, state, style, transition, trigger } from '@angular/animations'; export const speedDialFabAnimations = [ trigger('fabToggler', [ diff --git a/ui-ngx/src/app/shared/components/circular-progress.directive.ts b/ui-ngx/src/app/shared/components/circular-progress.directive.ts index c53267a7be..a7b0b7b690 100644 --- a/ui-ngx/src/app/shared/components/circular-progress.directive.ts +++ b/ui-ngx/src/app/shared/components/circular-progress.directive.ts @@ -14,9 +14,7 @@ /// limitations under the License. /// -import { Directive, ElementRef, ViewContainerRef, ComponentFactoryResolver, ComponentRef, Input } from '@angular/core'; -import { Overlay } from '@angular/cdk/overlay'; -import { MatProgressBar } from '@angular/material/progress-bar'; +import { ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, ViewContainerRef } from '@angular/core'; import { MatSpinner } from '@angular/material/progress-spinner'; @Directive({ diff --git a/ui-ngx/src/app/shared/components/dialog/material-icons-dialog.component.scss b/ui-ngx/src/app/shared/components/dialog/material-icons-dialog.component.scss index a8e9d8725b..5c0520d6ab 100644 --- a/ui-ngx/src/app/shared/components/dialog/material-icons-dialog.component.scss +++ b/ui-ngx/src/app/shared/components/dialog/material-icons-dialog.component.scss @@ -32,7 +32,7 @@ padding: 16px; margin: 10px; border: solid 1px #ffa500; - border-radius: 0%; + border-radius: 0; line-height: 0; } } diff --git a/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html index 795513890e..060a6836fc 100644 --- a/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html +++ b/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html @@ -37,7 +37,7 @@
diff --git a/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts index 482aa450a6..d641012d3a 100644 --- a/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts +++ b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import {Component} from '@angular/core'; +import { Component } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts b/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts index f19022e590..bcd10135c0 100644 --- a/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts +++ b/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts @@ -14,16 +14,18 @@ /// limitations under the License. /// -import {Directive, ElementRef, forwardRef, HostListener, Renderer2, SkipSelf} from '@angular/core'; +import { Directive, ElementRef, forwardRef, HostListener, Renderer2, SkipSelf } from '@angular/core'; import { ControlValueAccessor, - FormControl, FormGroupDirective, + FormControl, + FormGroupDirective, NG_VALIDATORS, - NG_VALUE_ACCESSOR, NgForm, + NG_VALUE_ACCESSOR, + NgForm, ValidationErrors, Validator } from '@angular/forms'; -import {ErrorStateMatcher} from '@angular/material/core'; +import { ErrorStateMatcher } from '@angular/material/core'; @Directive({ selector: '[tb-json-to-string]', diff --git a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.ts index 26e0e6b5f9..94c52bbcb1 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.ts @@ -14,15 +14,15 @@ /// limitations under the License. /// -import {AfterViewInit, Component, forwardRef, Input, OnInit} from '@angular/core'; -import {ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR} from '@angular/forms'; -import {Store} from '@ngrx/store'; -import {AppState} from '@core/core.state'; -import {TranslateService} from '@ngx-translate/core'; -import {AliasEntityType, EntityType, entityTypeTranslations} from '@shared/models/entity-type.models'; -import {EntityService} from '@core/http/entity.service'; -import {EntityId} from '@shared/models/id/entity-id'; -import {coerceBooleanProperty} from '@angular/cdk/coercion'; +import { AfterViewInit, Component, forwardRef, Input, OnInit } from '@angular/core'; +import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { TranslateService } from '@ngx-translate/core'; +import { AliasEntityType, EntityType } from '@shared/models/entity-type.models'; +import { EntityService } from '@core/http/entity.service'; +import { EntityId } from '@shared/models/id/entity-id'; +import { coerceBooleanProperty } from '@angular/cdk/coercion'; interface EntityListSelectModel { entityType: EntityType | AliasEntityType; diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts index f8bdab6243..5595708b96 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts @@ -15,38 +15,29 @@ /// import { - AfterContentInit, AfterViewInit, Component, ElementRef, forwardRef, - Input, OnChanges, - OnInit, SimpleChanges, - SkipSelf, + Input, + OnChanges, + OnInit, + SimpleChanges, ViewChild } from '@angular/core'; -import { - ControlValueAccessor, - FormBuilder, - FormControl, - FormGroup, - FormGroupDirective, - NG_VALUE_ACCESSOR, NgForm, Validators -} from '@angular/forms'; -import {Observable, of} from 'rxjs'; -import {map, mergeMap, startWith, tap, share, pairwise, filter} from 'rxjs/operators'; -import {Store} from '@ngrx/store'; -import {AppState} from '@app/core/core.state'; -import {TranslateService} from '@ngx-translate/core'; -import {AliasEntityType, EntityType} from '@shared/models/entity-type.models'; -import {BaseData} from '@shared/models/base-data'; -import {EntityId} from '@shared/models/id/entity-id'; -import {EntityService} from '@core/http/entity.service'; -import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms'; +import { Observable } from 'rxjs'; +import { filter, map, mergeMap, share, tap } from 'rxjs/operators'; +import { Store } from '@ngrx/store'; +import { AppState } from '@app/core/core.state'; +import { TranslateService } from '@ngx-translate/core'; +import { EntityType } from '@shared/models/entity-type.models'; +import { BaseData } from '@shared/models/base-data'; +import { EntityId } from '@shared/models/id/entity-id'; +import { EntityService } from '@core/http/entity.service'; +import { MatAutocomplete } from '@angular/material/autocomplete'; import { MatChipList } from '@angular/material/chips'; -import { ErrorStateMatcher } from '@angular/material/core'; import { coerceBooleanProperty } from '@angular/cdk/coercion'; -import { emptyPageData } from '@shared/models/page/page-data'; @Component({ selector: 'tb-entity-list', diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-autocomplete.component.ts b/ui-ngx/src/app/shared/components/entity/entity-subtype-autocomplete.component.ts index 487a7520d9..59d7920106 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-subtype-autocomplete.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-autocomplete.component.ts @@ -14,27 +14,19 @@ /// limitations under the License. /// -import {AfterViewInit, Component, ElementRef, forwardRef, Input, OnInit, ViewChild, OnDestroy} from '@angular/core'; -import {ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR} from '@angular/forms'; -import {Observable, of, throwError, Subscription} from 'rxjs'; -import {PageLink} from '@shared/models/page/page-link'; -import {Direction} from '@shared/models/page/sort-order'; -import {filter, map, mergeMap, publishReplay, refCount, startWith, tap, publish} from 'rxjs/operators'; -import {PageData, emptyPageData} from '@shared/models/page/page-data'; -import {DashboardInfo} from '@app/shared/models/dashboard.models'; -import {DashboardId} from '@app/shared/models/id/dashboard-id'; -import {DashboardService} from '@core/http/dashboard.service'; -import {Store} from '@ngrx/store'; -import {AppState} from '@app/core/core.state'; -import {getCurrentAuthUser} from '@app/core/auth/auth.selectors'; -import {Authority} from '@shared/models/authority.enum'; -import {TranslateService} from '@ngx-translate/core'; -import {DeviceService} from '@core/http/device.service'; -import {EntitySubtype, EntityType} from '@app/shared/models/entity-type.models'; -import {BroadcastService} from '@app/core/services/broadcast.service'; -import {coerceBooleanProperty} from '@angular/cdk/coercion'; -import {AssetService} from '@core/http/asset.service'; -import {EntityViewService} from '@core/http/entity-view.service'; +import { AfterViewInit, Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { Observable, Subscription, throwError } from 'rxjs'; +import { map, mergeMap, publishReplay, refCount, tap } from 'rxjs/operators'; +import { Store } from '@ngrx/store'; +import { AppState } from '@app/core/core.state'; +import { TranslateService } from '@ngx-translate/core'; +import { DeviceService } from '@core/http/device.service'; +import { EntitySubtype, EntityType } from '@app/shared/models/entity-type.models'; +import { BroadcastService } from '@app/core/services/broadcast.service'; +import { coerceBooleanProperty } from '@angular/cdk/coercion'; +import { AssetService } from '@core/http/asset.service'; +import { EntityViewService } from '@core/http/entity-view.service'; @Component({ selector: 'tb-entity-subtype-autocomplete', diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts index 981e9f407f..8ccd81edf5 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts @@ -14,44 +14,21 @@ /// limitations under the License. /// -import { - AfterContentInit, - AfterViewInit, - Component, - ElementRef, - forwardRef, - Input, OnDestroy, - OnInit, - SkipSelf, - ViewChild -} from '@angular/core'; -import { - ControlValueAccessor, - FormBuilder, - FormControl, - FormGroup, - FormGroupDirective, - NG_VALUE_ACCESSOR, NgForm, Validators -} from '@angular/forms'; -import { Observable, of, Subscription, throwError } from 'rxjs'; -import { map, mergeMap, startWith, tap, share, pairwise, filter, publishReplay, refCount } from 'rxjs/operators'; -import {Store} from '@ngrx/store'; -import {AppState} from '@app/core/core.state'; -import {TranslateService} from '@ngx-translate/core'; -import { AliasEntityType, EntitySubtype, EntityType, entityTypeTranslations } from '@shared/models/entity-type.models'; -import {BaseData} from '@shared/models/base-data'; -import {EntityId} from '@shared/models/id/entity-id'; -import {EntityService} from '@core/http/entity.service'; +import { AfterViewInit, Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms'; +import { Observable, Subscription, throwError } from 'rxjs'; +import { map, mergeMap, publishReplay, refCount, share } from 'rxjs/operators'; +import { Store } from '@ngrx/store'; +import { AppState } from '@app/core/core.state'; +import { TranslateService } from '@ngx-translate/core'; +import { EntitySubtype, EntityType } from '@shared/models/entity-type.models'; import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; -import { MatChipList } from '@angular/material/chips'; -import { ErrorStateMatcher } from '@angular/material/core'; +import { MatChipInputEvent, MatChipList } from '@angular/material/chips'; import { coerceBooleanProperty } from '@angular/cdk/coercion'; -import { emptyPageData } from '@shared/models/page/page-data'; import { AssetService } from '@core/http/asset.service'; import { DeviceService } from '@core/http/device.service'; import { EntityViewService } from '@core/http/entity-view.service'; import { BroadcastService } from '@core/services/broadcast.service'; -import { MatChipInputEvent } from '@angular/material/chips'; import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes'; @Component({ diff --git a/ui-ngx/src/app/shared/components/fab-toolbar.component.ts b/ui-ngx/src/app/shared/components/fab-toolbar.component.ts index 3799894eb5..e14b0b9cfb 100644 --- a/ui-ngx/src/app/shared/components/fab-toolbar.component.ts +++ b/ui-ngx/src/app/shared/components/fab-toolbar.component.ts @@ -143,7 +143,6 @@ export class FabToolbarComponent extends MatFabToolbarMixinBase implements OnIni const actions = element.find('mat-fab-actions').children(); if (triggerElement && backgroundElement) { const width = el.offsetWidth; - const height = el.offsetHeight; const scale = 2 * (width / triggerElement.offsetWidth); backgroundElement.style.borderRadius = width + 'px'; diff --git a/ui-ngx/src/app/shared/components/file-input.component.scss b/ui-ngx/src/app/shared/components/file-input.component.scss index c3ab44b653..f4085a87fc 100644 --- a/ui-ngx/src/app/shared/components/file-input.component.scss +++ b/ui-ngx/src/app/shared/components/file-input.component.scss @@ -20,7 +20,7 @@ $previewSize: 100px !default; :host { .tb-container { - margin-top: 0px; + margin-top: 0; label.tb-title { display: block; padding-bottom: 8px; diff --git a/ui-ngx/src/app/shared/components/file-input.component.ts b/ui-ngx/src/app/shared/components/file-input.component.ts index b305aa509e..56f6be1dd1 100644 --- a/ui-ngx/src/app/shared/components/file-input.component.ts +++ b/ui-ngx/src/app/shared/components/file-input.component.ts @@ -22,7 +22,8 @@ import { Input, OnChanges, OnDestroy, - Output, SimpleChanges, + Output, + SimpleChanges, ViewChild } from '@angular/core'; import { PageComponent } from '@shared/components/page.component'; diff --git a/ui-ngx/src/app/shared/components/footer-fab-buttons.component.scss b/ui-ngx/src/app/shared/components/footer-fab-buttons.component.scss index 916141aced..106692602b 100644 --- a/ui-ngx/src/app/shared/components/footer-fab-buttons.component.scss +++ b/ui-ngx/src/app/shared/components/footer-fab-buttons.component.scss @@ -40,7 +40,7 @@ .tb-btn-footer { &.fab-toggler { - margin-top: 0px; + margin-top: 0; } position: relative !important; display: inline-block !important; diff --git a/ui-ngx/src/app/shared/components/fullscreen.directive.ts b/ui-ngx/src/app/shared/components/fullscreen.directive.ts index 87214cc317..20558c7c75 100644 --- a/ui-ngx/src/app/shared/components/fullscreen.directive.ts +++ b/ui-ngx/src/app/shared/components/fullscreen.directive.ts @@ -18,8 +18,13 @@ import { Directive, ElementRef, EventEmitter, - Input, OnChanges, OnDestroy, - Output, Renderer2, SecurityContext, SimpleChanges, + Input, + OnChanges, + OnDestroy, + Output, + Renderer2, + SecurityContext, + SimpleChanges, ViewContainerRef } from '@angular/core'; import { Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay'; diff --git a/ui-ngx/src/app/shared/components/hotkeys.directive.ts b/ui-ngx/src/app/shared/components/hotkeys.directive.ts index f67d56280e..744a0765e6 100644 --- a/ui-ngx/src/app/shared/components/hotkeys.directive.ts +++ b/ui-ngx/src/app/shared/components/hotkeys.directive.ts @@ -14,8 +14,8 @@ /// limitations under the License. /// -import {Directive, Input, OnInit, OnDestroy, ElementRef} from '@angular/core'; -import {Hotkey, ExtendedKeyboardEvent} from 'angular2-hotkeys'; +import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; +import { Hotkey } from 'angular2-hotkeys'; import 'mousetrap'; import { TbCheatSheetComponent } from '@shared/components/cheatsheet.component'; diff --git a/ui-ngx/src/app/shared/components/image-input.component.scss b/ui-ngx/src/app/shared/components/image-input.component.scss index d4601f81ec..986c1253b3 100644 --- a/ui-ngx/src/app/shared/components/image-input.component.scss +++ b/ui-ngx/src/app/shared/components/image-input.component.scss @@ -20,7 +20,7 @@ $previewSize: 100px !default; :host { .tb-container { - margin-top: 0px; + margin-top: 0; label.tb-title { display: block; padding-bottom: 8px; diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx index 4a7f265ad8..b33829ca11 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx @@ -16,10 +16,7 @@ import * as React from 'react'; import ThingsboardBaseComponent from './json-form-base-component'; import DateFnsUtils from '@date-io/date-fns'; -import { - MuiPickersUtilsProvider, - KeyboardDatePicker -} from '@material-ui/pickers'; +import { KeyboardDatePicker, MuiPickersUtilsProvider } from '@material-ui/pickers'; import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models'; interface ThingsboardDateState extends JsonFormFieldState { diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-image.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-image.tsx index f7f01796d5..bfc407a61b 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-image.tsx +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-image.tsx @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import React, {useCallback} from 'react'; -import { DropzoneState, useDropzone } from 'react-dropzone'; -import ThingsboardBaseComponent from './json-form-base-component'; +import React from 'react'; import Dropzone from 'react-dropzone'; +import ThingsboardBaseComponent from './json-form-base-component'; import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models'; import IconButton from '@material-ui/core/IconButton'; import ClearIcon from '@material-ui/icons/Clear'; diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx index 8b2789f9c9..8aa63aa4e4 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx @@ -16,7 +16,7 @@ import * as React from 'react'; import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models'; import FormControlLabel from '@material-ui/core/FormControlLabel'; -import { Radio, FormLabel, RadioGroup } from '@material-ui/core'; +import { FormLabel, Radio, RadioGroup } from '@material-ui/core'; import FormControl from '@material-ui/core/FormControl'; import ThingsboardBaseComponent from '@shared/components/json-form/react/json-form-base-component'; diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-rc-select.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-rc-select.tsx index 842c897e36..a6473c7967 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-rc-select.tsx +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-rc-select.tsx @@ -15,7 +15,7 @@ */ import * as React from 'react'; import ThingsboardBaseComponent from './json-form-base-component'; -import Select, {Option} from 'rc-select'; +import Select, { Option } from 'rc-select'; import { JsonFormFieldProps, JsonFormFieldState, diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx index 3fbfbe2a61..50d48565a0 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx @@ -33,11 +33,12 @@ import ThingsboardCheckbox from './json-form-checkbox'; import ThingsboardHelp from './json-form-help'; import ThingsboardFieldSet from './json-form-fieldset'; import ThingsboardIcon from './json-form-icon'; -import { JsonFormProps, JsonFormData, onChangeFn, OnColorClickFn, OnIconClickFn } from './json-form.models'; +import { JsonFormData, JsonFormProps, onChangeFn, OnColorClickFn, OnIconClickFn } from './json-form.models'; import _ from 'lodash'; import * as tinycolor_ from 'tinycolor2'; import { GroupInfo } from '@shared/models/widget.models'; + const tinycolor = tinycolor_; class ThingsboardSchemaForm extends React.Component { diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-select.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-select.tsx index 3695df6fe4..0653209e6a 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-select.tsx +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-select.tsx @@ -14,11 +14,7 @@ * limitations under the License. */ import * as React from 'react'; -import { - JsonFormFieldProps, - JsonFormFieldState, - KeyLabelItem -} from '@shared/components/json-form/react/json-form.models'; +import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models'; import MenuItem from '@material-ui/core/MenuItem'; import FormControl from '@material-ui/core/FormControl'; import InputLabel from '@material-ui/core/InputLabel'; diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-text.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-text.tsx index d043d9899e..0b690f8181 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-text.tsx +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-text.tsx @@ -17,7 +17,6 @@ import * as React from 'react'; import ThingsboardBaseComponent from './json-form-base-component'; import TextField from '@material-ui/core/TextField'; import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models'; -import { FormControl } from '@material-ui/core'; interface ThingsboardTextState extends JsonFormFieldState { focused: boolean; diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-utils.ts b/ui-ngx/src/app/shared/components/json-form/react/json-form-utils.ts index b83b11d7d5..6937a4acb8 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form-utils.ts +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-utils.ts @@ -18,11 +18,11 @@ import * as tv from 'tv4'; import ObjectPath from 'objectpath'; import _ from 'lodash'; import { - SchemaValidationResult, DefaultsFormOptions, FormOption, + JsonFormData, JsonSchemaData, - JsonFormData + SchemaValidationResult } from './json-form.models'; import { isDefined, isEqual, isString, isUndefined } from '@core/utils'; diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form.scss b/ui-ngx/src/app/shared/components/json-form/react/json-form.scss index fbe48114cc..a79b9d24d6 100644 --- a/ui-ngx/src/app/shared/components/json-form/react/json-form.scss +++ b/ui-ngx/src/app/shared/components/json-form/react/json-form.scss @@ -319,7 +319,7 @@ $previewSize: 100px !default; z-index: 100001; background-color: white; border: 1px solid #d9d9d9; - box-shadow: 0 0px 4px #d9d9d9; + box-shadow: 0 0 4px #d9d9d9; border-radius: 4px; box-sizing: border-box; outline: none; diff --git a/ui-ngx/src/app/shared/components/kv-map.component.ts b/ui-ngx/src/app/shared/components/kv-map.component.ts index a932e302e2..b6f438f428 100644 --- a/ui-ngx/src/app/shared/components/kv-map.component.ts +++ b/ui-ngx/src/app/shared/components/kv-map.component.ts @@ -14,21 +14,19 @@ /// limitations under the License. /// -import { Component, EventEmitter, forwardRef, Input, OnInit, Output } from '@angular/core'; +import { Component, forwardRef, Input, OnInit } from '@angular/core'; import { AbstractControl, - ControlValueAccessor, FormArray, - FormBuilder, FormControl, - FormGroup, NG_VALIDATORS, - NG_VALUE_ACCESSOR, Validator, - ValidatorFn, + ControlValueAccessor, + FormArray, + FormBuilder, + FormControl, + FormGroup, + NG_VALIDATORS, + NG_VALUE_ACCESSOR, + Validator, Validators } from '@angular/forms'; -import { AliasFilterType, aliasFilterTypeTranslationMap, EntityAliasFilter } from '@shared/models/alias.models'; -import { AliasEntityType, EntityType } from '@shared/models/entity-type.models'; -import { TranslateService } from '@ngx-translate/core'; -import { EntityService } from '@core/http/entity.service'; -import { EntitySearchDirection, entitySearchDirectionTranslations, EntityTypeFilter } from '@shared/models/relation.models'; import { PageComponent } from '@shared/components/page.component'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; diff --git a/ui-ngx/src/app/shared/components/led-light.component.ts b/ui-ngx/src/app/shared/components/led-light.component.ts index 3db4cf8d52..aa2c373dfa 100644 --- a/ui-ngx/src/app/shared/components/led-light.component.ts +++ b/ui-ngx/src/app/shared/components/led-light.component.ts @@ -16,8 +16,7 @@ import { AfterViewInit, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { coerceBooleanProperty } from '@angular/cdk/coercion'; -import { RaphaelElement, RaphaelPaper, RaphaelSet } from 'raphael'; -import Raphael from 'raphael'; +import Raphael, { RaphaelElement, RaphaelPaper, RaphaelSet } from 'raphael'; import * as tinycolor_ from 'tinycolor2'; const tinycolor = tinycolor_; diff --git a/ui-ngx/src/app/shared/components/nav-tree.component.scss b/ui-ngx/src/app/shared/components/nav-tree.component.scss index b9d9dc7f72..ae318587e5 100644 --- a/ui-ngx/src/app/shared/components/nav-tree.component.scss +++ b/ui-ngx/src/app/shared/components/nav-tree.component.scss @@ -228,7 +228,6 @@ } .jstree-leaf > .jstree-ocl { - background: 0 0; background-position: -40px -120px; } diff --git a/ui-ngx/src/app/shared/components/snack-bar-component.scss b/ui-ngx/src/app/shared/components/snack-bar-component.scss index b694ae9dae..054937fb45 100644 --- a/ui-ngx/src/app/shared/components/snack-bar-component.scss +++ b/ui-ngx/src/app/shared/components/snack-bar-component.scss @@ -17,18 +17,18 @@ display: inline-block; pointer-events: all; .tb-toast { - box-shadow: 0px 3px 5px -1px rgba(0, 0, 0, 0.2), 0px 6px 10px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12); + box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12); color: #fff; font-size: 18px; border-radius: 4px; - padding: 0px 18px; + padding: 0 18px; margin: 8px; .toast-text { - padding: 0px 6px; + padding: 0 6px; width: 100%; } button { - margin: 6px 0px 6px 12px; + margin: 6px 0 6px 12px; } &.info-toast { background: #323232; diff --git a/ui-ngx/src/app/shared/components/tb-error.component.ts b/ui-ngx/src/app/shared/components/tb-error.component.ts index 99ddc55f1a..2a19f6cb0a 100644 --- a/ui-ngx/src/app/shared/components/tb-error.component.ts +++ b/ui-ngx/src/app/shared/components/tb-error.component.ts @@ -15,7 +15,7 @@ /// import { Component, Input } from '@angular/core'; -import { trigger, state, style, transition, animate } from '@angular/animations'; +import { animate, state, style, transition, trigger } from '@angular/animations'; @Component({ selector: 'tb-error', diff --git a/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.scss b/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.scss index 0ca2a9e5b8..8d93f982d9 100644 --- a/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.scss +++ b/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.scss @@ -51,16 +51,6 @@ padding: 0 0 2px; margin: 2px; line-height: 24px; - - ng-mat-icon { - width: 24px; - height: 24px; - - svg { - width: inherit; - height: inherit; - } - } } } diff --git a/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.ts b/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.ts index 252720033c..08fe07abc2 100644 --- a/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.ts +++ b/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component, OnInit, OnChanges, Input, Output, EventEmitter, ChangeDetectorRef } from '@angular/core'; +import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; import { interval } from 'rxjs'; import { filter } from 'rxjs/operators'; import { HistorySelectSettings } from '@app/modules/home/components/widget/lib/maps/map-models'; diff --git a/ui-ngx/src/app/shared/components/toast.directive.ts b/ui-ngx/src/app/shared/components/toast.directive.ts index beb77666df..a8b304a16f 100644 --- a/ui-ngx/src/app/shared/components/toast.directive.ts +++ b/ui-ngx/src/app/shared/components/toast.directive.ts @@ -15,12 +15,16 @@ /// import { - AfterViewInit, ApplicationRef, ChangeDetectorRef, + AfterViewInit, + ChangeDetectorRef, Component, Directive, ElementRef, - Inject, Input, NgZone, - OnDestroy, ViewChild, + Inject, + Input, + NgZone, + OnDestroy, + ViewChild, ViewContainerRef } from '@angular/core'; import { MAT_SNACK_BAR_DATA, MatSnackBar, MatSnackBarConfig, MatSnackBarRef } from '@angular/material/snack-bar'; @@ -30,8 +34,8 @@ import { Subscription } from 'rxjs'; import { NotificationService } from '@app/core/services/notification.service'; import { BreakpointObserver } from '@angular/cdk/layout'; import { MediaBreakpoints } from '@shared/models/constants'; -import Timeout = NodeJS.Timeout; import { MatButton } from '@angular/material/button'; +import Timeout = NodeJS.Timeout; @Directive({ selector: '[tb-toast]' diff --git a/ui-ngx/src/app/shared/components/value-input.component.html b/ui-ngx/src/app/shared/components/value-input.component.html index 754dfced25..b189d8f4b6 100644 --- a/ui-ngx/src/app/shared/components/value-input.component.html +++ b/ui-ngx/src/app/shared/components/value-input.component.html @@ -55,7 +55,7 @@
- + {{ (modelValue ? 'value.true' : 'value.false') | translate }}
diff --git a/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts b/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts index 7a2ca60c71..90952c1ddb 100644 --- a/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts +++ b/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component, forwardRef, Input, OnChanges, OnInit, ViewEncapsulation, SimpleChanges } from '@angular/core'; +import { Component, forwardRef, Input, OnChanges, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Observable } from 'rxjs'; import { share, tap } from 'rxjs/operators'; diff --git a/ui-ngx/src/app/shared/models/alias.models.ts b/ui-ngx/src/app/shared/models/alias.models.ts index 50d26f10a0..3009685321 100644 --- a/ui-ngx/src/app/shared/models/alias.models.ts +++ b/ui-ngx/src/app/shared/models/alias.models.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { AliasEntityType, EntityType } from '@shared/models/entity-type.models'; +import { EntityType } from '@shared/models/entity-type.models'; import { EntityId } from '@shared/models/id/entity-id'; import { EntitySearchDirection, EntityTypeFilter } from '@shared/models/relation.models'; import { EntityInfo } from './entity.models'; diff --git a/ui-ngx/src/app/shared/models/asset.models.ts b/ui-ngx/src/app/shared/models/asset.models.ts index 21610eae76..ab952d26a5 100644 --- a/ui-ngx/src/app/shared/models/asset.models.ts +++ b/ui-ngx/src/app/shared/models/asset.models.ts @@ -14,11 +14,10 @@ /// limitations under the License. /// -import {BaseData} from '@shared/models/base-data'; -import {AssetId} from './id/asset-id'; -import {TenantId} from '@shared/models/id/tenant-id'; -import {CustomerId} from '@shared/models/id/customer-id'; -import {DeviceCredentialsId} from '@shared/models/id/device-credentials-id'; +import { BaseData } from '@shared/models/base-data'; +import { AssetId } from './id/asset-id'; +import { TenantId } from '@shared/models/id/tenant-id'; +import { CustomerId } from '@shared/models/id/customer-id'; import { EntitySearchQuery } from '@shared/models/relation.models'; export interface Asset extends BaseData { diff --git a/ui-ngx/src/app/shared/models/customer.model.ts b/ui-ngx/src/app/shared/models/customer.model.ts index 81b44e6f8a..f33ea0ff3b 100644 --- a/ui-ngx/src/app/shared/models/customer.model.ts +++ b/ui-ngx/src/app/shared/models/customer.model.ts @@ -16,7 +16,7 @@ import { CustomerId } from '@shared/models/id/customer-id'; import { ContactBased } from '@shared/models/contact-based.model'; -import {TenantId} from './id/tenant-id'; +import { TenantId } from './id/tenant-id'; export interface Customer extends ContactBased { tenantId: TenantId; diff --git a/ui-ngx/src/app/shared/models/dashboard.models.ts b/ui-ngx/src/app/shared/models/dashboard.models.ts index 292a21ca9d..781471c22f 100644 --- a/ui-ngx/src/app/shared/models/dashboard.models.ts +++ b/ui-ngx/src/app/shared/models/dashboard.models.ts @@ -20,8 +20,7 @@ import { TenantId } from '@shared/models/id/tenant-id'; import { ShortCustomerInfo } from '@shared/models/customer.model'; import { Widget } from './widget.models'; import { Timewindow } from '@shared/models/time/time.models'; -import { EntityType } from '@shared/models/entity-type.models'; -import { EntityAlias, EntityAliases } from './alias.models'; +import { EntityAliases } from './alias.models'; export interface DashboardInfo extends BaseData { tenantId?: TenantId; diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts index 7378fc430a..780f60904e 100644 --- a/ui-ngx/src/app/shared/models/device.models.ts +++ b/ui-ngx/src/app/shared/models/device.models.ts @@ -14,11 +14,11 @@ /// limitations under the License. /// -import {BaseData} from '@shared/models/base-data'; -import {DeviceId} from './id/device-id'; -import {TenantId} from '@shared/models/id/tenant-id'; -import {CustomerId} from '@shared/models/id/customer-id'; -import {DeviceCredentialsId} from '@shared/models/id/device-credentials-id'; +import { BaseData } from '@shared/models/base-data'; +import { DeviceId } from './id/device-id'; +import { TenantId } from '@shared/models/id/tenant-id'; +import { CustomerId } from '@shared/models/id/customer-id'; +import { DeviceCredentialsId } from '@shared/models/id/device-credentials-id'; import { EntitySearchQuery } from '@shared/models/relation.models'; export interface Device extends BaseData { diff --git a/ui-ngx/src/app/shared/models/entity-type.models.ts b/ui-ngx/src/app/shared/models/entity-type.models.ts index b206281bce..83b9bcc1fe 100644 --- a/ui-ngx/src/app/shared/models/entity-type.models.ts +++ b/ui-ngx/src/app/shared/models/entity-type.models.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import {TenantId} from './id/tenant-id'; +import { TenantId } from './id/tenant-id'; import { BaseData, HasId } from '@shared/models/base-data'; /// diff --git a/ui-ngx/src/app/shared/models/entity-view.models.ts b/ui-ngx/src/app/shared/models/entity-view.models.ts index 49c0218121..758916fe4b 100644 --- a/ui-ngx/src/app/shared/models/entity-view.models.ts +++ b/ui-ngx/src/app/shared/models/entity-view.models.ts @@ -14,12 +14,11 @@ /// limitations under the License. /// -import {BaseData} from '@shared/models/base-data'; -import {AssetId} from './id/asset-id'; -import {TenantId} from '@shared/models/id/tenant-id'; -import {CustomerId} from '@shared/models/id/customer-id'; -import {EntityViewId} from '@shared/models/id/entity-view-id'; -import {EntityId} from '@shared/models/id/entity-id'; +import { BaseData } from '@shared/models/base-data'; +import { TenantId } from '@shared/models/id/tenant-id'; +import { CustomerId } from '@shared/models/id/customer-id'; +import { EntityViewId } from '@shared/models/id/entity-view-id'; +import { EntityId } from '@shared/models/id/entity-id'; import { EntitySearchQuery } from '@shared/models/relation.models'; export interface AttributesEntityView { diff --git a/ui-ngx/src/app/shared/models/id/entity-id.ts b/ui-ngx/src/app/shared/models/id/entity-id.ts index 0a0f0515bc..6ead753066 100644 --- a/ui-ngx/src/app/shared/models/id/entity-id.ts +++ b/ui-ngx/src/app/shared/models/id/entity-id.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import {AliasEntityType, EntityType} from '@shared/models/entity-type.models'; +import { AliasEntityType, EntityType } from '@shared/models/entity-type.models'; import { HasUUID } from '@shared/models/id/has-uuid'; export interface EntityId extends HasUUID { diff --git a/ui-ngx/src/app/shared/models/material.models.ts b/ui-ngx/src/app/shared/models/material.models.ts index 22f751c640..7016898edf 100644 --- a/ui-ngx/src/app/shared/models/material.models.ts +++ b/ui-ngx/src/app/shared/models/material.models.ts @@ -15,6 +15,7 @@ /// import * as tinycolor_ from 'tinycolor2'; + const tinycolor = tinycolor_; export interface MaterialColorItem { diff --git a/ui-ngx/src/app/shared/models/page/page-data.ts b/ui-ngx/src/app/shared/models/page/page-data.ts index d5cfc71a9c..02662c4348 100644 --- a/ui-ngx/src/app/shared/models/page/page-data.ts +++ b/ui-ngx/src/app/shared/models/page/page-data.ts @@ -14,9 +14,6 @@ /// limitations under the License. /// -import { PageLink } from '@shared/models/page/page-link'; -import { Direction, SortOrder } from '@shared/models/page/sort-order'; - export interface PageData { data: Array; totalPages: number; diff --git a/ui-ngx/src/app/shared/models/relation.models.ts b/ui-ngx/src/app/shared/models/relation.models.ts index 0cb4f20ca9..dfb0b1d671 100644 --- a/ui-ngx/src/app/shared/models/relation.models.ts +++ b/ui-ngx/src/app/shared/models/relation.models.ts @@ -16,7 +16,6 @@ import { EntityId } from '@shared/models/id/entity-id'; import { EntityType } from '@shared/models/entity-type.models'; -import { ActionStatus } from '@shared/models/audit-log.models'; export const CONTAINS_TYPE = 'Contains'; export const MANAGES_TYPE = 'Manages'; diff --git a/ui-ngx/src/app/shared/models/tenant.model.ts b/ui-ngx/src/app/shared/models/tenant.model.ts index 4f2e01ea81..65a176de0d 100644 --- a/ui-ngx/src/app/shared/models/tenant.model.ts +++ b/ui-ngx/src/app/shared/models/tenant.model.ts @@ -14,9 +14,8 @@ /// limitations under the License. /// -import { CustomerId } from '@shared/models/id/customer-id'; import { ContactBased } from '@shared/models/contact-based.model'; -import {TenantId} from './id/tenant-id'; +import { TenantId } from './id/tenant-id'; export interface Tenant extends ContactBased { title: string; diff --git a/ui-ngx/src/app/shared/models/user.model.ts b/ui-ngx/src/app/shared/models/user.model.ts index 468ed3d8c5..9a64242702 100644 --- a/ui-ngx/src/app/shared/models/user.model.ts +++ b/ui-ngx/src/app/shared/models/user.model.ts @@ -18,7 +18,7 @@ import { BaseData } from './base-data'; import { UserId } from './id/user-id'; import { CustomerId } from './id/customer-id'; import { Authority } from './authority.enum'; -import {TenantId} from './id/tenant-id'; +import { TenantId } from './id/tenant-id'; export interface User extends BaseData { tenantId: TenantId; diff --git a/ui-ngx/src/app/shared/models/widgets-bundle.model.ts b/ui-ngx/src/app/shared/models/widgets-bundle.model.ts index 576be20de4..0d91340ed3 100644 --- a/ui-ngx/src/app/shared/models/widgets-bundle.model.ts +++ b/ui-ngx/src/app/shared/models/widgets-bundle.model.ts @@ -14,9 +14,9 @@ /// limitations under the License. /// -import {BaseData} from '@shared/models/base-data'; -import {TenantId} from '@shared/models/id/tenant-id'; -import {WidgetsBundleId} from '@shared/models/id/widgets-bundle-id'; +import { BaseData } from '@shared/models/base-data'; +import { TenantId } from '@shared/models/id/tenant-id'; +import { WidgetsBundleId } from '@shared/models/id/widgets-bundle-id'; export interface WidgetsBundle extends BaseData { tenantId: TenantId; diff --git a/ui-ngx/src/app/shared/pipe/highlight.pipe.ts b/ui-ngx/src/app/shared/pipe/highlight.pipe.ts index 12c591939c..bcd158d146 100644 --- a/ui-ngx/src/app/shared/pipe/highlight.pipe.ts +++ b/ui-ngx/src/app/shared/pipe/highlight.pipe.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import {Pipe, PipeTransform} from '@angular/core'; +import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ name: 'highlight' }) export class HighlightPipe implements PipeTransform { diff --git a/ui-ngx/src/app/shared/pipe/tbJson.pipe.ts b/ui-ngx/src/app/shared/pipe/tbJson.pipe.ts index 5a5fa684fc..42d3f5a74c 100644 --- a/ui-ngx/src/app/shared/pipe/tbJson.pipe.ts +++ b/ui-ngx/src/app/shared/pipe/tbJson.pipe.ts @@ -14,8 +14,8 @@ /// limitations under the License. /// -import {Pipe, PipeTransform} from '@angular/core'; -import {isObject, isNumber} from '@core/utils'; +import { Pipe, PipeTransform } from '@angular/core'; +import { isNumber, isObject } from '@core/utils'; @Pipe({name: 'tbJson'}) export class TbJsonPipe implements PipeTransform { diff --git a/ui-ngx/src/app/shared/pipe/template.pipe.ts b/ui-ngx/src/app/shared/pipe/template.pipe.ts index 2cce658adb..4fa02a69e5 100644 --- a/ui-ngx/src/app/shared/pipe/template.pipe.ts +++ b/ui-ngx/src/app/shared/pipe/template.pipe.ts @@ -15,7 +15,7 @@ /// import { Pipe, PipeTransform } from '@angular/core'; -import { parseTemplate, parseWithTranslation } from '@app/core/utils'; +import { parseWithTranslation } from '@app/core/utils'; @Pipe({ name: 'tbParseTemplate' }) export class TbTemplatePipe implements PipeTransform { diff --git a/ui-ngx/src/app/shared/pipe/truncate.pipe.ts b/ui-ngx/src/app/shared/pipe/truncate.pipe.ts index b6c505ba74..2830b6ce7f 100644 --- a/ui-ngx/src/app/shared/pipe/truncate.pipe.ts +++ b/ui-ngx/src/app/shared/pipe/truncate.pipe.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import {Pipe, PipeTransform} from '@angular/core'; +import { Pipe, PipeTransform } from '@angular/core'; import { isString } from '@core/utils'; @Pipe({ name: 'truncate' }) diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts index e94c8a6641..4914873095 100644 --- a/ui-ngx/src/app/shared/shared.module.ts +++ b/ui-ngx/src/app/shared/shared.module.ts @@ -20,7 +20,7 @@ import { FooterComponent } from '@shared/components/footer.component'; import { LogoComponent } from '@shared/components/logo.component'; import { TbSnackBarComponent, ToastDirective } from '@shared/components/toast.directive'; import { BreadcrumbComponent } from '@shared/components/breadcrumb.component'; -import { NgxFlowModule, FlowInjectionToken } from '@flowjs/ngx-flow'; +import { FlowInjectionToken, NgxFlowModule } from '@flowjs/ngx-flow'; import { NgxFlowchartModule } from 'ngx-flowchart/dist/ngx-flowchart'; import Flow from '@flowjs/flow.js'; @@ -94,7 +94,11 @@ import { EntityListSelectComponent } from '@shared/components/entity/entity-list import { JsonObjectEditComponent } from '@shared/components/json-object-edit.component'; import { FooterFabButtonsComponent } from '@shared/components/footer-fab-buttons.component'; import { CircularProgressDirective } from '@shared/components/circular-progress.directive'; -import { FabToolbarComponent, FabActionsDirective, FabTriggerDirective } from '@shared/components/fab-toolbar.component'; +import { + FabActionsDirective, + FabToolbarComponent, + FabTriggerDirective +} from '@shared/components/fab-toolbar.component'; import { DashboardSelectPanelComponent } from '@shared/components/dashboard-select-panel.component'; import { DashboardSelectComponent } from '@shared/components/dashboard-select.component'; import { WidgetsBundleSelectComponent } from '@shared/components/widgets-bundle-select.component'; diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss index 61e9326286..ba963eb075 100644 --- a/ui-ngx/src/styles.scss +++ b/ui-ngx/src/styles.scss @@ -527,11 +527,10 @@ mat-label { .mat-table { width: 100%; max-width: 100%; - margin-bottom: 1rem; display: table; table-layout: auto; border-collapse: separate; - margin: 0px; + margin: 0; } mat-footer-row::after, mat-header-row::after, mat-row::after {