Andrii Shvaika
6 years ago
69 changed files with 1175 additions and 236 deletions
@ -1,2 +1,3 @@ |
|||
TB_QUEUE_TYPE=kafka |
|||
TB_KAFKA_SERVERS=kafka:9092 |
|||
TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES=retention.ms:604800000;segment.bytes:26214400;retention.bytes:104857600;partitions:100 |
|||
|
|||
@ -0,0 +1,19 @@ |
|||
<!-- |
|||
|
|||
Copyright © 2016-2020 The Thingsboard Authors |
|||
|
|||
Licensed under the Apache License, Version 2.0 (the "License"); |
|||
you may not use this file except in compliance with the License. |
|||
You may obtain a copy of the License at |
|||
|
|||
http://www.apache.org/licenses/LICENSE-2.0 |
|||
|
|||
Unless required by applicable law or agreed to in writing, software |
|||
distributed under the License is distributed on an "AS IS" BASIS, |
|||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
See the License for the specific language governing permissions and |
|||
limitations under the License. |
|||
|
|||
--> |
|||
<div class="tb-filter-text" [ngClass]="{disabled: disabled, required: requiredClass}" |
|||
[innerHTML]="filterText"></div> |
|||
@ -0,0 +1,79 @@ |
|||
/** |
|||
* Copyright © 2016-2020 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0 |
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
:host { |
|||
.tb-filter-text { |
|||
overflow-y: auto; |
|||
&.disabled { |
|||
opacity: 0.7; |
|||
} |
|||
&.required { |
|||
color: #f44336; |
|||
} |
|||
} |
|||
} |
|||
|
|||
:host ::ng-deep { |
|||
.tb-filter-text { |
|||
line-height: 1.8em; |
|||
span { |
|||
display: inline-block; |
|||
vertical-align: middle; |
|||
line-height: 1.4em; |
|||
} |
|||
.tb-filter-predicate { |
|||
padding-right: 4px; |
|||
padding-left: 4px; |
|||
} |
|||
.tb-filter-entity-key, .tb-filter-value, .tb-filter-dynamic-source { |
|||
font-weight: bold; |
|||
border: 1px groove rgba(0, 0, 0, .25); |
|||
border-radius: 4px; |
|||
padding-left: 4px; |
|||
padding-right: 4px; |
|||
} |
|||
.tb-filter-entity-key, .tb-filter-value { |
|||
white-space: nowrap; |
|||
overflow: hidden; |
|||
text-overflow: ellipsis; |
|||
max-width: 150px; |
|||
} |
|||
.tb-filter-dynamic-source { |
|||
} |
|||
.tb-filter-entity-key { |
|||
color: #305680; |
|||
} |
|||
.tb-filter-value { |
|||
color: #ff5722; |
|||
} |
|||
.tb-filter-simple-operation { |
|||
font-size: 0.9em; |
|||
} |
|||
.tb-filter-complex-operation { |
|||
text-transform: uppercase; |
|||
font-weight: bold; |
|||
} |
|||
.tb-filter-dynamic-value { |
|||
.tb-filter-dynamic-source, .tb-filter-value { |
|||
color: #0c959c; |
|||
} |
|||
} |
|||
.tb-filter-bracket { |
|||
.tb-left-bracket, .tb-right-bracket { |
|||
font-size: 1.2em; |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,101 @@ |
|||
///
|
|||
/// Copyright © 2016-2020 The Thingsboard Authors
|
|||
///
|
|||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|||
/// you may not use this file except in compliance with the License.
|
|||
/// You may obtain a copy of the License at
|
|||
///
|
|||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|||
///
|
|||
/// Unless required by applicable law or agreed to in writing, software
|
|||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||
/// See the License for the specific language governing permissions and
|
|||
/// limitations under the License.
|
|||
///
|
|||
|
|||
import { Component, forwardRef, Input, OnInit } from '@angular/core'; |
|||
import { ControlValueAccessor, FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms'; |
|||
import { MatDialog } from '@angular/material/dialog'; |
|||
import { KeyFilter, keyFiltersToText } from '@shared/models/query/query.models'; |
|||
import { TranslateService } from '@ngx-translate/core'; |
|||
import { DatePipe } from '@angular/common'; |
|||
import { coerceBooleanProperty } from '@angular/cdk/coercion'; |
|||
|
|||
@Component({ |
|||
selector: 'tb-filter-text', |
|||
templateUrl: './filter-text.component.html', |
|||
styleUrls: ['./filter-text.component.scss'], |
|||
providers: [ |
|||
{ |
|||
provide: NG_VALUE_ACCESSOR, |
|||
useExisting: forwardRef(() => FilterTextComponent), |
|||
multi: true |
|||
} |
|||
] |
|||
}) |
|||
export class FilterTextComponent implements ControlValueAccessor, OnInit { |
|||
|
|||
private requiredValue: boolean; |
|||
get required(): boolean { |
|||
return this.requiredValue; |
|||
} |
|||
@Input() |
|||
set required(value: boolean) { |
|||
this.requiredValue = coerceBooleanProperty(value); |
|||
} |
|||
|
|||
@Input() |
|||
disabled: boolean; |
|||
|
|||
@Input() |
|||
noFilterText = this.translate.instant('filter.no-filter-text'); |
|||
|
|||
@Input() |
|||
addFilterPrompt = this.translate.instant('filter.add-filter-prompt'); |
|||
|
|||
requiredClass = false; |
|||
|
|||
private filterText: string; |
|||
|
|||
private propagateChange = (v: any) => { }; |
|||
|
|||
constructor(private dialog: MatDialog, |
|||
private fb: FormBuilder, |
|||
private translate: TranslateService, |
|||
private datePipe: DatePipe) { |
|||
} |
|||
|
|||
registerOnChange(fn: any): void { |
|||
this.propagateChange = fn; |
|||
} |
|||
|
|||
registerOnTouched(fn: any): void { |
|||
} |
|||
|
|||
ngOnInit() { |
|||
} |
|||
|
|||
setDisabledState(isDisabled: boolean): void { |
|||
this.disabled = isDisabled; |
|||
} |
|||
|
|||
writeValue(value: Array<KeyFilter>): void { |
|||
this.updateFilterText(value); |
|||
} |
|||
|
|||
private updateFilterText(value: Array<KeyFilter>) { |
|||
this.requiredClass = false; |
|||
if (value && value.length) { |
|||
this.filterText = keyFiltersToText(this.translate, this.datePipe, value); |
|||
} else { |
|||
if (this.required && !this.disabled) { |
|||
this.filterText = this.addFilterPrompt; |
|||
this.requiredClass = true; |
|||
} else { |
|||
this.filterText = this.noFilterText; |
|||
} |
|||
} |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,114 @@ |
|||
<!-- |
|||
|
|||
Copyright © 2016-2020 The Thingsboard Authors |
|||
|
|||
Licensed under the Apache License, Version 2.0 (the "License"); |
|||
you may not use this file except in compliance with the License. |
|||
You may obtain a copy of the License at |
|||
|
|||
http://www.apache.org/licenses/LICENSE-2.0 |
|||
|
|||
Unless required by applicable law or agreed to in writing, software |
|||
distributed under the License is distributed on an "AS IS" BASIS, |
|||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
See the License for the specific language governing permissions and |
|||
limitations under the License. |
|||
|
|||
--> |
|||
<div style="min-width: 1000px;"> |
|||
<mat-toolbar color="primary"> |
|||
<h2 translate>device-profile.add</h2> |
|||
<span fxFlex></span> |
|||
<button mat-icon-button |
|||
(click)="cancel()" |
|||
type="button"> |
|||
<mat-icon class="material-icons">close</mat-icon> |
|||
</button> |
|||
</mat-toolbar> |
|||
<mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async"> |
|||
</mat-progress-bar> |
|||
<div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div> |
|||
<div mat-dialog-content> |
|||
<mat-horizontal-stepper [linear]="true" #addDeviceProfileStepper (selectionChange)="selectedIndex = $event.selectedIndex"> |
|||
<mat-step [stepControl]="deviceProfileDetailsFormGroup"> |
|||
<form [formGroup]="deviceProfileDetailsFormGroup" style="padding-bottom: 16px;"> |
|||
<ng-template matStepLabel>{{ 'device-profile.device-profile-details' | translate }}</ng-template> |
|||
<fieldset [disabled]="isLoading$ | async"> |
|||
<mat-form-field class="mat-block"> |
|||
<mat-label translate>device-profile.name</mat-label> |
|||
<input matInput formControlName="name" required/> |
|||
<mat-error *ngIf="deviceProfileDetailsFormGroup.get('name').hasError('required')"> |
|||
{{ 'device-profile.name-required' | translate }} |
|||
</mat-error> |
|||
</mat-form-field> |
|||
<tb-entity-autocomplete |
|||
labelText="device-profile.default-rule-chain" |
|||
[entityType]="entityType.RULE_CHAIN" |
|||
formControlName="defaultRuleChainId"> |
|||
</tb-entity-autocomplete> |
|||
<mat-form-field class="mat-block"> |
|||
<mat-label translate>device-profile.type</mat-label> |
|||
<mat-select formControlName="type" required> |
|||
<mat-option *ngFor="let type of deviceProfileTypes" [value]="type"> |
|||
{{deviceProfileTypeTranslations.get(type) | translate}} |
|||
</mat-option> |
|||
</mat-select> |
|||
<mat-error *ngIf="deviceProfileDetailsFormGroup.get('type').hasError('required')"> |
|||
{{ 'device-profile.type-required' | translate }} |
|||
</mat-error> |
|||
</mat-form-field> |
|||
<mat-form-field class="mat-block"> |
|||
<mat-label translate>device-profile.description</mat-label> |
|||
<textarea matInput formControlName="description" rows="2"></textarea> |
|||
</mat-form-field> |
|||
</fieldset> |
|||
</form> |
|||
</mat-step> |
|||
<mat-step [stepControl]="transportConfigFormGroup"> |
|||
<form [formGroup]="transportConfigFormGroup" style="padding-bottom: 16px;"> |
|||
<ng-template matStepLabel>{{ 'device-profile.transport-configuration' | translate }}</ng-template> |
|||
<mat-form-field class="mat-block"> |
|||
<mat-label translate>device-profile.transport-type</mat-label> |
|||
<mat-select formControlName="transportType" required> |
|||
<mat-option *ngFor="let type of deviceTransportTypes" [value]="type"> |
|||
{{deviceTransportTypeTranslations.get(type) | translate}} |
|||
</mat-option> |
|||
</mat-select> |
|||
<mat-error *ngIf="transportConfigFormGroup.get('transportType').hasError('required')"> |
|||
{{ 'device-profile.transport-type-required' | translate }} |
|||
</mat-error> |
|||
</mat-form-field> |
|||
<tb-device-profile-transport-configuration |
|||
formControlName="transportConfiguration" |
|||
required> |
|||
</tb-device-profile-transport-configuration> |
|||
</form> |
|||
</mat-step> |
|||
<mat-step [stepControl]="alarmRulesFormGroup"> |
|||
<form [formGroup]="alarmRulesFormGroup" style="padding-bottom: 16px;"> |
|||
<ng-template matStepLabel>{{'device-profile.alarm-rules' | translate: |
|||
{count: alarmRulesFormGroup.get('alarms').value ? |
|||
alarmRulesFormGroup.get('alarms').value.length : 0} }}</ng-template> |
|||
<tb-device-profile-alarms |
|||
formControlName="alarms"> |
|||
</tb-device-profile-alarms> |
|||
</form> |
|||
</mat-step> |
|||
</mat-horizontal-stepper> |
|||
</div> |
|||
<div mat-dialog-actions fxLayout="row wrap" fxLayoutAlign="space-between center"> |
|||
<button mat-button *ngIf="selectedIndex > 0" |
|||
[disabled]="(isLoading$ | async)" |
|||
(click)="previousStep()">{{ 'action.back' | translate }}</button> |
|||
<span *ngIf="selectedIndex <= 0"></span> |
|||
<div fxLayout="row wrap" fxLayoutGap="20px"> |
|||
<button mat-button |
|||
[disabled]="(isLoading$ | async)" |
|||
(click)="cancel()">{{ 'action.cancel' | translate }}</button> |
|||
<button mat-raised-button |
|||
[disabled]="(isLoading$ | async) || selectedForm().invalid" |
|||
color="primary" |
|||
(click)="nextStep()">{{ (selectedIndex === 2 ? 'action.add' : 'action.continue') | translate }}</button> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
@ -0,0 +1,38 @@ |
|||
/** |
|||
* Copyright © 2016-2020 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0 |
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
:host { |
|||
.mat-dialog-content { |
|||
display: flex; |
|||
flex-direction: column; |
|||
overflow: hidden; |
|||
|
|||
.mat-stepper-horizontal { |
|||
display: flex; |
|||
flex-direction: column; |
|||
overflow: hidden; |
|||
} |
|||
} |
|||
} |
|||
|
|||
:host ::ng-deep { |
|||
.mat-dialog-content { |
|||
.mat-stepper-horizontal { |
|||
.mat-horizontal-content-container { |
|||
overflow: auto; |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,173 @@ |
|||
///
|
|||
/// Copyright © 2016-2020 The Thingsboard Authors
|
|||
///
|
|||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|||
/// you may not use this file except in compliance with the License.
|
|||
/// You may obtain a copy of the License at
|
|||
///
|
|||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|||
///
|
|||
/// Unless required by applicable law or agreed to in writing, software
|
|||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||
/// See the License for the specific language governing permissions and
|
|||
/// limitations under the License.
|
|||
///
|
|||
|
|||
import { |
|||
AfterViewInit, |
|||
Component, |
|||
ComponentFactoryResolver, |
|||
Inject, |
|||
Injector, |
|||
SkipSelf, |
|||
ViewChild |
|||
} from '@angular/core'; |
|||
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 { FormBuilder, FormGroup, Validators } from '@angular/forms'; |
|||
import { DialogComponent } from '@shared/components/dialog.component'; |
|||
import { Router } from '@angular/router'; |
|||
import { |
|||
createDeviceProfileConfiguration, |
|||
createDeviceProfileTransportConfiguration, |
|||
DeviceProfile, |
|||
DeviceProfileType, |
|||
deviceProfileTypeTranslationMap, |
|||
DeviceTransportType, |
|||
deviceTransportTypeTranslationMap |
|||
} from '@shared/models/device.models'; |
|||
import { DeviceProfileService } from '@core/http/device-profile.service'; |
|||
import { EntityType } from '@shared/models/entity-type.models'; |
|||
import { MatHorizontalStepper } from '@angular/material/stepper'; |
|||
import { RuleChainId } from '@shared/models/id/rule-chain-id'; |
|||
|
|||
export interface AddDeviceProfileDialogData { |
|||
deviceProfileName: string; |
|||
} |
|||
|
|||
@Component({ |
|||
selector: 'tb-add-device-profile-dialog', |
|||
templateUrl: './add-device-profile-dialog.component.html', |
|||
providers: [], |
|||
styleUrls: ['./add-device-profile-dialog.component.scss'] |
|||
}) |
|||
export class AddDeviceProfileDialogComponent extends |
|||
DialogComponent<AddDeviceProfileDialogComponent, DeviceProfile> implements AfterViewInit { |
|||
|
|||
@ViewChild('addDeviceProfileStepper', {static: true}) addDeviceProfileStepper: MatHorizontalStepper; |
|||
|
|||
selectedIndex = 0; |
|||
|
|||
entityType = EntityType; |
|||
|
|||
deviceProfileTypes = Object.keys(DeviceProfileType); |
|||
|
|||
deviceProfileTypeTranslations = deviceProfileTypeTranslationMap; |
|||
|
|||
deviceTransportTypes = Object.keys(DeviceTransportType); |
|||
|
|||
deviceTransportTypeTranslations = deviceTransportTypeTranslationMap; |
|||
|
|||
deviceProfileDetailsFormGroup: FormGroup; |
|||
|
|||
transportConfigFormGroup: FormGroup; |
|||
|
|||
alarmRulesFormGroup: FormGroup; |
|||
|
|||
constructor(protected store: Store<AppState>, |
|||
protected router: Router, |
|||
@Inject(MAT_DIALOG_DATA) public data: AddDeviceProfileDialogData, |
|||
public dialogRef: MatDialogRef<AddDeviceProfileDialogComponent, DeviceProfile>, |
|||
private componentFactoryResolver: ComponentFactoryResolver, |
|||
private injector: Injector, |
|||
@SkipSelf() private errorStateMatcher: ErrorStateMatcher, |
|||
private deviceProfileService: DeviceProfileService, |
|||
private fb: FormBuilder) { |
|||
super(store, router, dialogRef); |
|||
this.deviceProfileDetailsFormGroup = this.fb.group( |
|||
{ |
|||
name: [data.deviceProfileName, [Validators.required]], |
|||
type: [DeviceProfileType.DEFAULT, [Validators.required]], |
|||
defaultRuleChainId: [null, []], |
|||
description: ['', []] |
|||
} |
|||
); |
|||
this.transportConfigFormGroup = this.fb.group( |
|||
{ |
|||
transportType: [DeviceTransportType.DEFAULT, [Validators.required]], |
|||
transportConfiguration: [createDeviceProfileTransportConfiguration(DeviceTransportType.DEFAULT), |
|||
[Validators.required]] |
|||
} |
|||
); |
|||
this.transportConfigFormGroup.get('transportType').valueChanges.subscribe(() => { |
|||
this.deviceProfileTransportTypeChanged(); |
|||
}); |
|||
|
|||
this.alarmRulesFormGroup = this.fb.group( |
|||
{ |
|||
alarms: [null] |
|||
} |
|||
); |
|||
} |
|||
|
|||
private deviceProfileTransportTypeChanged() { |
|||
const deviceTransportType: DeviceTransportType = this.transportConfigFormGroup.get('transportType').value; |
|||
this.transportConfigFormGroup.patchValue( |
|||
{transportConfiguration: createDeviceProfileTransportConfiguration(deviceTransportType)}); |
|||
} |
|||
|
|||
ngAfterViewInit(): void { |
|||
} |
|||
|
|||
cancel(): void { |
|||
this.dialogRef.close(null); |
|||
} |
|||
|
|||
previousStep() { |
|||
this.addDeviceProfileStepper.previous(); |
|||
} |
|||
|
|||
nextStep() { |
|||
if (this.selectedIndex < 2) { |
|||
this.addDeviceProfileStepper.next(); |
|||
} else { |
|||
this.add(); |
|||
} |
|||
} |
|||
|
|||
selectedForm(): FormGroup { |
|||
switch (this.selectedIndex) { |
|||
case 0: |
|||
return this.deviceProfileDetailsFormGroup; |
|||
case 1: |
|||
return this.transportConfigFormGroup; |
|||
case 2: |
|||
return this.alarmRulesFormGroup; |
|||
} |
|||
} |
|||
|
|||
private add(): void { |
|||
const deviceProfile: DeviceProfile = { |
|||
name: this.deviceProfileDetailsFormGroup.get('name').value, |
|||
type: this.deviceProfileDetailsFormGroup.get('type').value, |
|||
transportType: this.transportConfigFormGroup.get('transportType').value, |
|||
description: this.deviceProfileDetailsFormGroup.get('description').value, |
|||
profileData: { |
|||
configuration: createDeviceProfileConfiguration(DeviceProfileType.DEFAULT), |
|||
transportConfiguration: this.transportConfigFormGroup.get('transportConfiguration').value, |
|||
alarms: this.alarmRulesFormGroup.get('alarms').value |
|||
} |
|||
}; |
|||
if (this.deviceProfileDetailsFormGroup.get('defaultRuleChainId').value) { |
|||
deviceProfile.defaultRuleChainId = new RuleChainId(this.deviceProfileDetailsFormGroup.get('defaultRuleChainId').value); |
|||
} |
|||
this.deviceProfileService.saveDeviceProfile(deviceProfile).subscribe( |
|||
(savedDeviceProfile) => { |
|||
this.dialogRef.close(savedDeviceProfile); |
|||
} |
|||
); |
|||
} |
|||
} |
|||
Loading…
Reference in new issue