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

Merge pull request #75 from deaflynx/develop/3.3-edge

Browse Source 
Code restyle: single instead of double quotes, deleted unused imports
This commit is contained in:
VoBa 2021-01-13 08:28:35 +02:00 committed by GitHub
commit f99d7171a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 170 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/core/http/component-descriptor.service.ts
View File

@ -21,7 +21,7 @@ import { defaultHttpOptionsFromConfig, RequestConfig } from '@core/http/http-uti
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
import { RuleNodeType } from '@shared/models/rule-node.models';
import { RuleChainType } from "@shared/models/rule-chain.models";
import { RuleChainType } from '@shared/models/rule-chain.models';
@Injectable({
providedIn: 'root'

2
ui-ngx/src/app/core/http/device-profile.service.ts
View File

@ -24,7 +24,7 @@ import { DeviceProfile, DeviceProfileInfo, DeviceTransportType } from '@shared/m
import { isDefinedAndNotNull } from '@core/utils';
import {
ObjectLwM2M, ServerSecurityConfig
} from "../../modules/home/components/profile/device/lwm2m/profile-config.models";
} from '../../modules/home/components/profile/device/lwm2m/profile-config.models';
@Injectable({
providedIn: 'root'

6
ui-ngx/src/app/core/http/edge.service.ts
View File

@ -21,9 +21,9 @@ import { HttpClient } from '@angular/common/http';
import { PageLink, TimePageLink } from '@shared/models/page/page-link';
import { PageData } from '@shared/models/page/page-data';
import { EntitySubtype } from '@app/shared/models/entity-type.models';
import { Edge, EdgeEvent, EdgeInfo, EdgeSearchQuery } from "@shared/models/edge.models";
import { EntityId } from "@shared/models/id/entity-id";
import { EdgeId } from "@shared/models/id/edge-id";
import { Edge, EdgeEvent, EdgeInfo, EdgeSearchQuery } from '@shared/models/edge.models';
import { EntityId } from '@shared/models/id/entity-id';
@Injectable({
providedIn: 'root'
})

2
ui-ngx/src/app/core/http/rule-chain.service.ts
View File

@ -44,7 +44,7 @@ import { TranslateService } from '@ngx-translate/core';
import { EntityType } from '@shared/models/entity-type.models';
import { deepClone, snakeCase } from '@core/utils';
import { DebugRuleNodeEventBody } from '@app/shared/models/event.models';
import { Edge } from "@shared/models/edge.models";
import { Edge } from '@shared/models/edge.models';
@Injectable({
providedIn: 'root'

4
ui-ngx/src/app/core/services/menu.service.ts
View File

@ -18,13 +18,13 @@ import { Injectable } from '@angular/core';
import { AuthService } from '../auth/auth.service';
import { select, Store } from '@ngrx/store';
import { AppState } from '../core.state';
import { selectAuth, selectAuthUser, selectIsAuthenticated } from '../auth/auth.selectors';
import { selectAuth, selectIsAuthenticated } from '../auth/auth.selectors';
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 { guid } from '@core/utils';
import { AuthState } from "@core/auth/auth.models";
import { AuthState } from '@core/auth/auth.models';
@Injectable({
providedIn: 'root'

19
ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts
View File

@ -43,16 +43,15 @@ import {
EventContentDialogData
} from '@home/components/event/event-content-dialog.component';
import { sortObjectKeys } from '@core/utils';
import { RuleChainService } from "@core/http/rule-chain.service";
import { AttributeService } from "@core/http/attribute.service";
import { AttributeScope } from "@shared/models/telemetry/telemetry.models";
import { EdgeDownlinkTableHeaderComponent } from "@home/components/edge/edge-downlink-table-header.component";
import { EdgeService } from "@core/http/edge.service";
import { map } from "rxjs/operators";
import { AssetService } from "@core/http/asset.service";
import { DeviceService } from "@core/http/device.service";
import { EntityViewService } from "@core/http/entity-view.service";
import { actionTypeTranslations } from "@shared/models/audit-log.models";
import { RuleChainService } from '@core/http/rule-chain.service';
import { AttributeService } from '@core/http/attribute.service';
import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
import { EdgeDownlinkTableHeaderComponent } from '@home/components/edge/edge-downlink-table-header.component';
import { EdgeService } from '@core/http/edge.service';
import { map } from 'rxjs/operators';
import { AssetService } from '@core/http/asset.service';
import { DeviceService } from '@core/http/device.service';
import { EntityViewService } from '@core/http/entity-view.service';
export class EdgeDownlinkTableConfig extends EntityTableConfig<EdgeEvent, TimePageLink> {

12
ui-ngx/src/app/modules/home/components/edge/edge-downlink-table.component.ts
View File

@ -22,12 +22,12 @@ import { EntityId } from '@shared/models/id/entity-id';
import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
import { EdgeDownlinkTableConfig } from './edge-downlink-table-config';
import { DialogService } from '@core/services/dialog.service';
import { RuleChainService } from "@core/http/rule-chain.service";
import { AttributeService } from "@core/http/attribute.service";
import { EdgeService } from "@core/http/edge.service";
import { DeviceService } from "@core/http/device.service";
import { AssetService } from "@core/http/asset.service";
import { EntityViewService } from "@core/http/entity-view.service";
import { RuleChainService } from '@core/http/rule-chain.service';
import { AttributeService } from '@core/http/attribute.service';
import { EdgeService } from '@core/http/edge.service';
import { DeviceService } from '@core/http/device.service';
import { AssetService } from '@core/http/asset.service';
import { EntityViewService } from '@core/http/entity-view.service';
@Component({
selector: 'tb-edge-downlink-table',

2
ui-ngx/src/app/modules/home/components/home-components.module.ts
View File

@ -119,7 +119,7 @@ import { AwsSnsProviderConfigurationComponent } from '@home/components/sms/aws-s
import { TwilioSmsProviderConfigurationComponent } from '@home/components/sms/twilio-sms-provider-configuration.component';
import { CopyDeviceCredentialsComponent } from '@home/components/device/copy-device-credentials.component';
import { Lwm2mProfileComponentsModule } from '@home/components/profile/device/lwm2m/lwm2m-profile-components.module';
import { EdgeDownlinkTableComponent } from "@home/components/edge/edge-downlink-table.component";
import { EdgeDownlinkTableComponent } from '@home/components/edge/edge-downlink-table.component';
@NgModule({
declarations:

14
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-config-server.component.ts
View File

@ -14,12 +14,12 @@
/// limitations under the License.
///
import { Component, forwardRef, Inject, Input, OnInit } from "@angular/core";
import { Component, forwardRef, Inject, Input, OnInit } from '@angular/core';
import {
ControlValueAccessor,
FormBuilder, FormGroup, NG_VALUE_ACCESSOR, NgModel, Validators
} from "@angular/forms";
} from '@angular/forms';
import {
SECURITY_CONFIG_MODE,
SECURITY_CONFIG_MODE_NAMES,
@ -32,11 +32,11 @@ import {
DEFAULT_PORT_SERVER_NO_SEC,
DEFAULT_CLIENT_HOLD_OFF_TIME,
DEFAULT_ID_SERVER
} from "./profile-config.models";
import { Store } from "@ngrx/store";
import { AppState } from "@core/core.state";
import { coerceBooleanProperty } from "@angular/cdk/coercion";
import { WINDOW } from "../../../../../../core/services/window.service";
} from './profile-config.models';
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { WINDOW } from '../../../../../../core/services/window.service';
import { pairwise, startWith } from 'rxjs/operators';
import { DeviceProfileService } from '@core/http/device-profile.service';

8
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts
View File

@ -34,10 +34,10 @@ import {
OBSERVE_ATTR,
TELEMETRY,
ObjectLwM2M, getDefaultProfileConfig, KEY_NAME, Instance
} from "./profile-config.models";
import { DeviceProfileService } from "../../../../../../core/http/device-profile.service";
import { deepClone, isUndefined } from "../../../../../../core/utils";
import { WINDOW } from "../../../../../../core/services/window.service";
} from './profile-config.models';
import { DeviceProfileService } from '../../../../../../core/http/device-profile.service';
import { deepClone, isUndefined } from '../../../../../../core/utils';
import { WINDOW } from '../../../../../../core/services/window.service';
import { JsonObject } from '@angular/compiler-cli/ngcc/src/packages/entry_point';
import { isNotNullOrUndefined } from 'codelyzer/util/isNotNullOrUndefined';

18
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.ts
View File

@ -21,23 +21,23 @@ import {
OnInit,
ViewChild,
ElementRef,
} from "@angular/core";
} from '@angular/core';
import {
ControlValueAccessor,
FormBuilder,
FormGroup, NG_VALIDATORS,
FormGroup,
NG_VALUE_ACCESSOR, Validators
} from "@angular/forms";
import { coerceBooleanProperty } from "@angular/cdk/coercion";
import { Store } from "@ngrx/store";
import { AppState } from "../../../../../../core/core.state";
} from '@angular/forms';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { Store } from '@ngrx/store';
import { AppState } from '../../../../../../core/core.state';
import { MatChipList } from '@angular/material/chips';
import {
INSTANCES_ID_VALUE_MAX,
INSTANCES_ID_VALUE_MIN
} from "./profile-config.models";
import { TranslateService } from "@ngx-translate/core";
import { DeviceProfileService } from "../../../../../../core/http/device-profile.service";
} from './profile-config.models';
import { TranslateService } from '@ngx-translate/core';
import { DeviceProfileService } from '../../../../../../core/http/device-profile.service';
@Component({
selector: 'tb-profile-lwm2m-object-add-instances-list',

24
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
View File

@ -23,25 +23,25 @@ import {
ElementRef,
Output,
EventEmitter
} from "@angular/core";
} from '@angular/core';
import {
ControlValueAccessor,
FormBuilder,
FormGroup,
NG_VALUE_ACCESSOR, Validators
} from "@angular/forms";
import {coerceBooleanProperty} from "@angular/cdk/coercion";
import {Store} from "@ngrx/store";
import {AppState} from "../../../../../../core/core.state";
} from '@angular/forms';
import {coerceBooleanProperty} from '@angular/cdk/coercion';
import {Store} from '@ngrx/store';
import {AppState} from '../../../../../../core/core.state';
import {MatChipList} from '@angular/material/chips';
import {MatAutocomplete} from "@angular/material/autocomplete";
import {Observable} from "rxjs";
import {MatAutocomplete} from '@angular/material/autocomplete';
import {Observable} from 'rxjs';
import {filter, map, mergeMap, share, tap} from 'rxjs/operators';
import {ObjectLwM2M} from "./profile-config.models";
import {TranslateService} from "@ngx-translate/core";
import {DeviceProfileService} from "../../../../../../core/http/device-profile.service";
import {PageLink} from "../../../../../../shared/models/page/page-link";
import {Direction} from "../../../../../../shared/models/page/sort-order";
import {ObjectLwM2M} from './profile-config.models';
import {TranslateService} from '@ngx-translate/core';
import {DeviceProfileService} from '../../../../../../core/http/device-profile.service';
import {PageLink} from '../../../../../../shared/models/page/page-link';
import {Direction} from '../../../../../../shared/models/page/sort-order';
@Component({
selector: 'tb-profile-lwm2m-object-list',

4
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resource.component.ts
View File

@ -14,13 +14,13 @@
/// limitations under the License.
///
import { Component, EventEmitter, forwardRef, Input, OnInit, Output, ViewChild } from "@angular/core";
import { Component, forwardRef, Input, OnInit } from '@angular/core';
import {
ControlValueAccessor,
FormArray, FormBuilder,
FormGroup,
NG_VALUE_ACCESSOR, Validators
} from "@angular/forms";
} from '@angular/forms';
import {
CAMEL_CASE_REGEXP,
ResourceLwM2M

12
ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.ts
View File

@ -15,7 +15,7 @@
///
import { Component, forwardRef, Input, OnInit, Output } from "@angular/core";
import { Component, forwardRef, Input, OnInit, Output } from '@angular/core';
import {
AbstractControl,
ControlValueAccessor,
@ -24,10 +24,10 @@ import {
FormGroup,
NG_VALUE_ACCESSOR,
Validators
} from "@angular/forms";
import { Store } from "@ngrx/store";
import { AppState } from "@core/core.state";
import { coerceBooleanProperty } from "@angular/cdk/coercion";
} from '@angular/forms';
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import {
ATTR,
Instance,
@ -35,7 +35,7 @@ import {
OBSERVE,
ResourceLwM2M,
TELEMETRY
} from "./profile-config.models";
} from './profile-config.models';
import { isNotNullOrUndefined } from 'codelyzer/util/isNotNullOrUndefined';
import { deepClone, isUndefined } from '@core/utils';
import { MatDialog } from '@angular/material/dialog';

16
ui-ngx/src/app/modules/home/components/widget/lib/edges-overview-widget.component.ts
View File

@ -33,14 +33,14 @@ import {
EntityNodeData,
EntityNodeDatasource
} from '@home/components/widget/lib/edges-overview-widget.models';
import { EdgeService } from "@core/http/edge.service";
import { EntityService } from "@core/http/entity.service";
import { TranslateService } from "@ngx-translate/core";
import { PageLink } from "@shared/models/page/page-link";
import { BaseData, HasId } from "@shared/models/base-data";
import { EntityId } from "@shared/models/id/entity-id";
import { getCurrentAuthUser } from "@core/auth/auth.selectors";
import { Authority } from "@shared/models/authority.enum";
import { EdgeService } from '@core/http/edge.service';
import { EntityService } from '@core/http/entity.service';
import { TranslateService } from '@ngx-translate/core';
import { PageLink } from '@shared/models/page/page-link';
import { BaseData, HasId } from '@shared/models/base-data';
import { EntityId } from '@shared/models/id/entity-id';
import { getCurrentAuthUser } from '@core/auth/auth.selectors';
import { Authority } from '@shared/models/authority.enum';
@Component({
selector: 'tb-edges-overview-widget',

4
ui-ngx/src/app/modules/home/components/widget/lib/edges-overview-widget.models.ts
View File

@ -17,8 +17,8 @@
import { NavTreeNode } from '@shared/components/nav-tree.component';
import { Datasource } from '@shared/models/widget.models';
import { EntityType } from '@shared/models/entity-type.models';
import { TranslateService } from "@ngx-translate/core";
import { BaseData, HasId } from "@shared/models/base-data";
import { TranslateService } from '@ngx-translate/core';
import { BaseData, HasId } from '@shared/models/base-data';
export interface EntityNodeDatasource extends Datasource {
nodeId: string;

2
ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
View File

@ -35,7 +35,7 @@ import { TripAnimationComponent } from './trip-animation/trip-animation.componen
import { PhotoCameraInputWidgetComponent } from './lib/photo-camera-input.component';
import { GatewayFormComponent } from './lib/gateway/gateway-form.component';
import { ImportExportService } from '@home/components/import-export/import-export.service';
import { EdgesOverviewWidgetComponent } from "@home/components/widget/lib/edges-overview-widget.component";
import { EdgesOverviewWidgetComponent } from '@home/components/widget/lib/edges-overview-widget.component';
@NgModule({
declarations:

2
ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.ts
View File

@ -28,7 +28,7 @@ import { EntityViewService } from '@core/http/entity-view.service';
import { DashboardService } from '@core/http/dashboard.service';
import { DialogComponent } from '@shared/components/dialog.component';
import { Router } from '@angular/router';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
export interface AddEntitiesToCustomerDialogData {
customerId: string;

6
ui-ngx/src/app/modules/home/dialogs/add-entities-to-edge-dialog.component.ts
View File

@ -21,7 +21,7 @@ import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
import { DeviceService } from '@core/http/device.service';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
import { EntityType } from '@shared/models/entity-type.models';
import { forkJoin, Observable } from 'rxjs';
import { AssetService } from '@core/http/asset.service';
@ -29,8 +29,8 @@ import { EntityViewService } from '@core/http/entity-view.service';
import { DashboardService } from '@core/http/dashboard.service';
import { DialogComponent } from '@shared/components/dialog.component';
import { Router } from '@angular/router';
import { RuleChainService } from "@core/http/rule-chain.service";
import { ruleChainType } from "@shared/models/rule-chain.models";
import { RuleChainService } from '@core/http/rule-chain.service';
import { ruleChainType } from '@shared/models/rule-chain.models';
export interface AddEntitiesToEdgeDialogData {
edgeId: string;

2
ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.ts
View File

@ -28,7 +28,7 @@ import { AssetService } from '@core/http/asset.service';
import { EntityViewService } from '@core/http/entity-view.service';
import { DialogComponent } from '@shared/components/dialog.component';
import { Router } from '@angular/router';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
export interface AssignToCustomerDialogData {
entityIds: Array<EntityId>;

2
ui-ngx/src/app/modules/home/dialogs/home-dialogs.module.ts
View File

@ -20,7 +20,7 @@ import { SharedModule } from '@app/shared/shared.module';
import { AssignToCustomerDialogComponent } from '@modules/home/dialogs/assign-to-customer-dialog.component';
import { AddEntitiesToCustomerDialogComponent } from '@modules/home/dialogs/add-entities-to-customer-dialog.component';
import { HomeDialogsService } from './home-dialogs.service';
import { AddEntitiesToEdgeDialogComponent } from "@home/dialogs/add-entities-to-edge-dialog.component";
import { AddEntitiesToEdgeDialogComponent } from '@home/dialogs/add-entities-to-edge-dialog.component';
@NgModule({
declarations:

4
ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
View File

@ -58,11 +58,11 @@ import { AssetId } from '@app/shared/models/id/asset-id';
import { AssetTabsComponent } from '@home/pages/asset/asset-tabs.component';
import { HomeDialogsService } from '@home/dialogs/home-dialogs.service';
import { DeviceInfo } from '@shared/models/device.models';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
import {
AddEntitiesToEdgeDialogComponent,
AddEntitiesToEdgeDialogData
} from "@home/dialogs/add-entities-to-edge-dialog.component";
} from '@home/dialogs/add-entities-to-edge-dialog.component';
@Injectable()
export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<AssetInfo>> {

2
ui-ngx/src/app/modules/home/pages/customer/customer-routing.module.ts
View File

@ -27,7 +27,7 @@ import { DashboardsTableConfigResolver } from '@modules/home/pages/dashboard/das
import { DashboardPageComponent } from '@home/pages/dashboard/dashboard-page.component';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
import { dashboardBreadcumbLabelFunction, DashboardResolver } from '@home/pages/dashboard/dashboard-routing.module';
import { EdgesTableConfigResolver } from "@home/pages/edge/edges-table-config.resolver";
import { EdgesTableConfigResolver } from '@home/pages/edge/edges-table-config.resolver';
const routes: Routes = [
{

2
ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts
View File

@ -99,7 +99,7 @@ import { ImportExportService } from '@home/components/import-export/import-expor
import { AuthState } from '@app/core/auth/auth.models';
import { FiltersDialogComponent, FiltersDialogData } from '@home/components/filter/filters-dialog.component';
import { Filters } from '@shared/models/query/query.models';
import { AliasEntityType, EntityType } from "@shared/models/entity-type.models";
import { AliasEntityType, EntityType } from '@shared/models/entity-type.models';
// @dynamic
@Component({

4
ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts
View File

@ -64,11 +64,11 @@ import {
} from '@modules/home/pages/dashboard/make-dashboard-public-dialog.component';
import { DashboardTabsComponent } from '@home/pages/dashboard/dashboard-tabs.component';
import { ImportExportService } from '@home/components/import-export/import-export.service';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
import {
AddEntitiesToEdgeDialogComponent,
AddEntitiesToEdgeDialogData
} from "@home/dialogs/add-entities-to-edge-dialog.component";
} from '@home/dialogs/add-entities-to-edge-dialog.component';
@Injectable()
export class DashboardsTableConfigResolver implements Resolve<EntityTableConfig<DashboardInfo | Dashboard>> {

2
ui-ngx/src/app/modules/home/pages/device/device.module.ts
View File

@ -26,7 +26,7 @@ import { HomeComponentsModule } from '@modules/home/components/home-components.m
import { DeviceTabsComponent } from '@home/pages/device/device-tabs.component';
import { SecurityConfigComponent } from '@home/pages/device/lwm2m/security-config.component';
// TODO: @nickAS21 move to device profile
import {SecurityConfigServerComponent} from "@home/pages/device/lwm2m/security-config-server.component";
import { SecurityConfigServerComponent } from '@home/pages/device/lwm2m/security-config-server.component';
import { DefaultDeviceConfigurationComponent } from './data/default-device-configuration.component';
import { DeviceConfigurationComponent } from './data/device-configuration.component';
import { DeviceDataComponent } from './data/device-data.component';

4
ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
View File

@ -64,11 +64,11 @@ import { HomeDialogsService } from '@home/dialogs/home-dialogs.service';
import { DeviceWizardDialogComponent } from '@home/components/wizard/device-wizard-dialog.component';
import { BaseData, HasId } from '@shared/models/base-data';
import { isDefinedAndNotNull } from '@core/utils';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
import {
AddEntitiesToEdgeDialogComponent,
AddEntitiesToEdgeDialogData
} from "@home/dialogs/add-entities-to-edge-dialog.component";
} from '@home/dialogs/add-entities-to-edge-dialog.component';
@Injectable()
export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<DeviceInfo>> {

16
ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.ts
View File

@ -14,12 +14,12 @@
/// limitations under the License.
///
import {Component, forwardRef, Inject, Input, OnInit, ViewChild} from "@angular/core";
import {Component, forwardRef, Inject, Input, OnInit, ViewChild} from '@angular/core';
import {
ControlValueAccessor,
FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Validators
} from "@angular/forms";
} from '@angular/forms';
import {
SECURITY_CONFIG_MODE,
SECURITY_CONFIG_MODE_NAMES,
@ -28,12 +28,12 @@ import {
DeviceCredentialsDialogLwm2mData,
LEN_MAX_PSK,
LEN_MAX_PRIVATE_KEY, LEN_MAX_PUBLIC_KEY_RPK, KEY_PRIVATE_REGEXP, LEN_MAX_PUBLIC_KEY_X509, KEY_PUBLIC_REGEXP_X509
} from "@home/pages/device/lwm2m/security-config.models";
import {Store} from "@ngrx/store";
import {AppState} from "@core/core.state";
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
import {PageComponent} from "@shared/components/page.component";
import {MatPaginator} from "@angular/material/paginator";
} from '@home/pages/device/lwm2m/security-config.models';
import {Store} from '@ngrx/store';
import {AppState} from '@core/core.state';
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
import {PageComponent} from '@shared/components/page.component';
import {MatPaginator} from '@angular/material/paginator';
import { TranslateService } from '@ngx-translate/core';
@Component({

8
ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config.component.ts
View File

@ -41,10 +41,10 @@ import {
getDefaultClientSecurityConfigType,
LEN_MAX_PSK,
LEN_MAX_PUBLIC_KEY_RPK
} from "./security-config.models";
import {WINDOW} from "@core/services/window.service";
import {MatTabChangeEvent, MatTabGroup} from "@angular/material/tabs";
import {MatTab} from "@angular/material/tabs/tab";
} from './security-config.models';
import {WINDOW} from '@core/services/window.service';
import {MatTabChangeEvent, MatTabGroup} from '@angular/material/tabs';
import {MatTab} from '@angular/material/tabs/tab';
@Component({

32
ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
View File

@ -15,27 +15,27 @@
///
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from "@angular/router";
import { EntitiesTableComponent } from "@home/components/entity/entities-table.component";
import { Authority } from "@shared/models/authority.enum";
import { EdgesTableConfigResolver } from "@home/pages/edge/edges-table-config.resolver"
import { AssetsTableConfigResolver } from "@home/pages/asset/assets-table-config.resolver";
import { DevicesTableConfigResolver } from "@home/pages/device/devices-table-config.resolver";
import { EntityViewsTableConfigResolver } from "@home/pages/entity-view/entity-views-table-config.resolver";
import { DashboardsTableConfigResolver } from "@home/pages/dashboard/dashboards-table-config.resolver";
import { RuleChainsTableConfigResolver } from "@home/pages/rulechain/rulechains-table-config.resolver";
import { DashboardPageComponent } from "@home/pages/dashboard/dashboard-page.component";
import { dashboardBreadcumbLabelFunction, DashboardResolver } from "@home/pages/dashboard/dashboard-routing.module";
import { BreadCrumbConfig } from "@shared/components/breadcrumb";
import { RuleChainPageComponent } from "@home/pages/rulechain/rulechain-page.component";
import { ConfirmOnExitGuard } from "@core/guards/confirm-on-exit.guard";
import { ruleChainType } from "@shared/models/rule-chain.models";
import { RouterModule, Routes } from '@angular/router';
import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
import { Authority } from '@shared/models/authority.enum';
import { EdgesTableConfigResolver } from '@home/pages/edge/edges-table-config.resolver'
import { AssetsTableConfigResolver } from '@home/pages/asset/assets-table-config.resolver';
import { DevicesTableConfigResolver } from '@home/pages/device/devices-table-config.resolver';
import { EntityViewsTableConfigResolver } from '@home/pages/entity-view/entity-views-table-config.resolver';
import { DashboardsTableConfigResolver } from '@home/pages/dashboard/dashboards-table-config.resolver';
import { RuleChainsTableConfigResolver } from '@home/pages/rulechain/rulechains-table-config.resolver';
import { DashboardPageComponent } from '@home/pages/dashboard/dashboard-page.component';
import { dashboardBreadcumbLabelFunction, DashboardResolver } from '@home/pages/dashboard/dashboard-routing.module';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
import { RuleChainPageComponent } from '@home/pages/rulechain/rulechain-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { ruleChainType } from '@shared/models/rule-chain.models';
import {
importRuleChainBreadcumbLabelFunction,
ResolvedRuleChainMetaDataResolver,
ruleChainBreadcumbLabelFunction, RuleChainImportGuard,
RuleChainResolver, RuleNodeComponentsResolver
} from "@home/pages/rulechain/rulechain-routing.module";
} from '@home/pages/rulechain/rulechain-routing.module';
const routes: Routes = [
{

10
ui-ngx/src/app/modules/home/pages/edge/edge-table-header.component.ts
View File

@ -15,11 +15,11 @@
///
import { Component } from '@angular/core';
import { EntityTableHeaderComponent } from "@home/components/entity/entity-table-header.component";
import { EntityType } from "@shared/models/entity-type.models";
import { Store } from "@ngrx/store";
import { AppState } from "@core/core.state";
import { EdgeInfo } from "@shared/models/edge.models";
import { EntityTableHeaderComponent } from '@home/components/entity/entity-table-header.component';
import { EntityType } from '@shared/models/entity-type.models';
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { EdgeInfo } from '@shared/models/edge.models';
@Component({
selector: 'tb-edge-table-header',

8
ui-ngx/src/app/modules/home/pages/edge/edge-tabs.component.ts
View File

@ -15,10 +15,10 @@
///
import { Component } from '@angular/core';
import { Store } from "@ngrx/store";
import { AppState } from "@core/core.state";
import { EdgeInfo } from "@shared/models/edge.models";
import { EntityTabsComponent } from "@home/components/entity/entity-tabs.component";
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { EdgeInfo } from '@shared/models/edge.models';
import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component';
@Component({
selector: 'tb-edge-tabs',

22
ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
View File

@ -16,17 +16,17 @@
import { Component, Inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { AppState } from "@core/core.state";
import { EntityComponent } from "@home/components/entity/entity.component";
import { FormBuilder, FormGroup, Validators } from "@angular/forms";
import { EntityType } from "@shared/models/entity-type.models";
import { EdgeInfo } from "@shared/models/edge.models";
import { TranslateService } from "@ngx-translate/core";
import { NULL_UUID } from "@shared/models/id/has-uuid";
import { ActionNotificationShow } from "@core/notification/notification.actions";
import { guid, isUndefined } from "@core/utils";
import { EntityTableConfig } from "@home/models/entity/entities-table-config.models";
import { WINDOW } from "@core/services/window.service";
import { AppState } from '@core/core.state';
import { EntityComponent } from '@home/components/entity/entity.component';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { EntityType } from '@shared/models/entity-type.models';
import { EdgeInfo } from '@shared/models/edge.models';
import { TranslateService } from '@ngx-translate/core';
import { NULL_UUID } from '@shared/models/id/has-uuid';
import { ActionNotificationShow } from '@core/notification/notification.actions';
import { guid, isUndefined } from '@core/utils';
import { EntityTableConfig } from '@home/models/entity/entities-table-config.models';
import { WINDOW } from '@core/services/window.service';
@Component({
selector: 'tb-edge',

10
ui-ngx/src/app/modules/home/pages/edge/edge.module.ts
View File

@ -17,12 +17,12 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared/shared.module';
import { HomeDialogsModule } from "@home/dialogs/home-dialogs.module";
import { HomeComponentsModule } from "@home/components/home-components.module";
import { EdgeRoutingModule } from "@home/pages/edge/edge-routing.module";
import { HomeDialogsModule } from '@home/dialogs/home-dialogs.module';
import { HomeComponentsModule } from '@home/components/home-components.module';
import { EdgeRoutingModule } from '@home/pages/edge/edge-routing.module';
import { EdgeComponent } from '@modules/home/pages/edge/edge.component';
import { EdgeTableHeaderComponent } from "@home/pages/edge/edge-table-header.component";
import { EdgeTabsComponent } from "@home/pages/edge/edge-tabs.component";
import { EdgeTableHeaderComponent } from '@home/pages/edge/edge-table-header.component';
import { EdgeTabsComponent } from '@home/pages/edge/edge-tabs.component';
@NgModule({
declarations: [

14
ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
View File

@ -51,13 +51,13 @@ import {
AddEntitiesToCustomerDialogData
} from '../../dialogs/add-entities-to-customer-dialog.component';
import { HomeDialogsService } from '@home/dialogs/home-dialogs.service';
import { Edge, EdgeInfo } from "@shared/models/edge.models";
import { EdgeService } from "@core/http/edge.service";
import { EdgeComponent } from "@home/pages/edge/edge.component";
import { EdgeTableHeaderComponent } from "@home/pages/edge/edge-table-header.component";
import { EdgeId } from "@shared/models/id/edge-id";
import { EdgeTabsComponent } from "@home/pages/edge/edge-tabs.component";
import { ActionNotificationShow } from "@core/notification/notification.actions";
import { Edge, EdgeInfo } from '@shared/models/edge.models';
import { EdgeService } from '@core/http/edge.service';
import { EdgeComponent } from '@home/pages/edge/edge.component';
import { EdgeTableHeaderComponent } from '@home/pages/edge/edge-table-header.component';
import { EdgeId } from '@shared/models/id/edge-id';
import { EdgeTabsComponent } from '@home/pages/edge/edge-tabs.component';
import { ActionNotificationShow } from '@core/notification/notification.actions';
@Injectable()
export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeInfo>> {

4
ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
View File

@ -56,11 +56,11 @@ import { EntityViewComponent } from '@modules/home/pages/entity-view/entity-view
import { EntityViewTableHeaderComponent } from '@modules/home/pages/entity-view/entity-view-table-header.component';
import { EntityViewId } from '@shared/models/id/entity-view-id';
import { EntityViewTabsComponent } from '@home/pages/entity-view/entity-view-tabs.component';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
import {
AddEntitiesToEdgeDialogComponent,
AddEntitiesToEdgeDialogData
} from "@home/dialogs/add-entities-to-edge-dialog.component";
} from '@home/dialogs/add-entities-to-edge-dialog.component';
@Injectable()
export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig<EntityViewInfo>> {

2
ui-ngx/src/app/modules/home/pages/home-pages.module.ts
View File

@ -34,7 +34,7 @@ import { MODULES_MAP } from '@shared/public-api';
import { modulesMap } from '../../common/modules-map';
import { DeviceProfileModule } from './device-profile/device-profile.module';
import { ApiUsageModule } from '@home/pages/api-usage/api-usage.module';
import { EdgeModule } from "@home/pages/edge/edge.module";
import { EdgeModule } from '@home/pages/edge/edge.module';
@NgModule({
exports: [

16
ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
View File

@ -38,17 +38,17 @@ import { DialogService } from '@core/services/dialog.service';
import { RuleChainTabsComponent } from '@home/pages/rulechain/rulechain-tabs.component';
import { ImportExportService } from '@home/components/import-export/import-export.service';
import { ItemBufferService } from '@core/services/item-buffer.service';
import { EdgeService } from "@core/http/edge.service";
import { forkJoin, Observable } from "rxjs";
import { EdgeService } from '@core/http/edge.service';
import { forkJoin, Observable } from 'rxjs';
import {
AddEntitiesToEdgeDialogComponent,
AddEntitiesToEdgeDialogData
} from "@home/dialogs/add-entities-to-edge-dialog.component";
import { MatDialog } from "@angular/material/dialog";
import { isUndefined } from "@core/utils";
import { PageLink } from "@shared/models/page/page-link";
import { Edge } from "@shared/models/edge.models";
import { mergeMap } from "rxjs/operators";
} from '@home/dialogs/add-entities-to-edge-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { isUndefined } from '@core/utils';
import { PageLink } from '@shared/models/page/page-link';
import { Edge } from '@shared/models/edge.models';
import { mergeMap } from 'rxjs/operators';
@Injectable()
export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<RuleChain>> {

4
ui-ngx/src/app/modules/home/pages/widget/widgets-bundles-table-config.resolver.ts
View File

@ -37,8 +37,8 @@ import { getCurrentAuthState, getCurrentAuthUser } from '@app/core/auth/auth.sel
import { Authority } from '@shared/models/authority.enum';
import { DialogService } from '@core/services/dialog.service';
import { ImportExportService } from '@home/components/import-export/import-export.service';
import { Direction } from "@shared/models/page/sort-order";
import { map } from "rxjs/operators";
import { Direction } from '@shared/models/page/sort-order';
import { map } from 'rxjs/operators';
@Injectable()
export class WidgetsBundlesTableConfigResolver implements Resolve<EntityTableConfig<WidgetsBundle>> {

2
ui-ngx/src/app/shared/components/entity/entity-subtype-autocomplete.component.ts
View File

@ -27,7 +27,7 @@ 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 { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
@Component({
selector: 'tb-entity-subtype-autocomplete',

2
ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts
View File

@ -27,7 +27,7 @@ import { MatChipInputEvent, MatChipList } from '@angular/material/chips';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { AssetService } from '@core/http/asset.service';
import { DeviceService } from '@core/http/device.service';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
import { EntityViewService } from '@core/http/entity-view.service';
import { BroadcastService } from '@core/services/broadcast.service';
import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';

2
ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.ts
View File

@ -25,7 +25,7 @@ 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 { AssetService } from '@core/http/asset.service';
import { EdgeService } from "@core/http/edge.service";
import { EdgeService } from '@core/http/edge.service';
import { EntityViewService } from '@core/http/entity-view.service';
@Component({

2
ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts
View File

@ -25,7 +25,7 @@ import { WidgetsBundle } from '@shared/models/widgets-bundle.model';
import { WidgetService } from '@core/http/widget.service';
import { isDefined } from '@core/utils';
import { NULL_UUID } from '@shared/models/id/has-uuid';
import { getCurrentAuthState } from "@core/auth/auth.selectors";
import { getCurrentAuthState } from '@core/auth/auth.selectors';
@Component({
selector: 'tb-widgets-bundle-select',

6
ui-ngx/src/app/shared/models/edge.models.ts
View File

@ -19,9 +19,9 @@ import { TenantId } from '@shared/models/id/tenant-id';
import { CustomerId } from '@shared/models/id/customer-id';
import { EdgeId } from '@shared/models/id/edge-id';
import { EntitySearchQuery } from '@shared/models/relation.models';
import { RuleChainId } from "@shared/models/id/rule-chain-id";
import { BaseEventBody } from "@shared/models/event.models";
import { EventId } from "@shared/models/id/event-id";
import { RuleChainId } from '@shared/models/id/rule-chain-id';
import { BaseEventBody } from '@shared/models/event.models';
import { EventId } from '@shared/models/id/event-id';
export interface Edge extends BaseData<EdgeId> {
tenantId?: TenantId;