UI: mqtt version select refactor as component.
This commit is contained in:
parent
610806487d
commit
c945e47732
@ -72,16 +72,7 @@
|
|||||||
{{ 'rule-node-config.parse-to-plain-text' | translate }}
|
{{ 'rule-node-config.parse-to-plain-text' | translate }}
|
||||||
</mat-checkbox>
|
</mat-checkbox>
|
||||||
<div class="tb-hint">{{ "rule-node-config.parse-to-plain-text-hint" | translate }}</div>
|
<div class="tb-hint">{{ "rule-node-config.parse-to-plain-text-hint" | translate }}</div>
|
||||||
<mat-form-field class="flex flex-1" subscriptSizing="dynamic">
|
<tb-mqtt-version-select formControlName="protocolVersion"></tb-mqtt-version-select>
|
||||||
<mat-label translate>device-profile.mqtt-protocol-version</mat-label>
|
|
||||||
<mat-select formControlName="protocolVersion">
|
|
||||||
@for (version of mqttVersions; track version) {
|
|
||||||
<mat-option [value]="version">
|
|
||||||
{{ mqttVersionTranslation.get(version) }}
|
|
||||||
</mat-option>
|
|
||||||
}
|
|
||||||
</mat-select>
|
|
||||||
</mat-form-field>
|
|
||||||
<mat-checkbox formControlName="cleanSession">
|
<mat-checkbox formControlName="cleanSession">
|
||||||
{{ 'rule-node-config.clean-session' | translate }}
|
{{ 'rule-node-config.clean-session' | translate }}
|
||||||
</mat-checkbox>
|
</mat-checkbox>
|
||||||
|
|||||||
@ -18,7 +18,6 @@ import { Component } from '@angular/core';
|
|||||||
import { isNotEmptyStr } from '@core/public-api';
|
import { isNotEmptyStr } from '@core/public-api';
|
||||||
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
|
import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
|
||||||
import { MqttVersions, MqttVersionTranslation } from '@shared/models/device.models';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'tb-external-node-mqtt-config',
|
selector: 'tb-external-node-mqtt-config',
|
||||||
@ -29,9 +28,6 @@ export class MqttConfigComponent extends RuleNodeConfigurationComponent {
|
|||||||
|
|
||||||
mqttConfigForm: UntypedFormGroup;
|
mqttConfigForm: UntypedFormGroup;
|
||||||
|
|
||||||
mqttVersions = MqttVersions;
|
|
||||||
mqttVersionTranslation = MqttVersionTranslation;
|
|
||||||
|
|
||||||
constructor(private fb: UntypedFormBuilder) {
|
constructor(private fb: UntypedFormBuilder) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,30 @@
|
|||||||
|
<!--
|
||||||
|
|
||||||
|
Copyright © 2016-2025 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.
|
||||||
|
|
||||||
|
-->
|
||||||
|
<mat-form-field class="flex flex-1" [subscriptSizing]="subscriptSizing" [appearance]="appearance">
|
||||||
|
<mat-label translate>device-profile.mqtt-protocol-version</mat-label>
|
||||||
|
<mat-select [required]="required"
|
||||||
|
[disabled]="disabled"
|
||||||
|
[(ngModel)]="modelValue"
|
||||||
|
(ngModelChange)="mqttVersionChanged()">
|
||||||
|
@for (version of mqttVersions; track version) {
|
||||||
|
<mat-option [value]="version">
|
||||||
|
{{ mqttVersionTranslation.get(version) }}
|
||||||
|
</mat-option>
|
||||||
|
}
|
||||||
|
</mat-select>
|
||||||
|
</mat-form-field>
|
||||||
@ -0,0 +1,84 @@
|
|||||||
|
///
|
||||||
|
/// Copyright © 2016-2025 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 } from '@angular/core';
|
||||||
|
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
|
||||||
|
import { coerceBooleanProperty } from '@angular/cdk/coercion';
|
||||||
|
import { MqttVersion, MqttVersions, MqttVersionTranslation } from '@shared/models/device.models';
|
||||||
|
import { SubscriptSizing, MatFormFieldAppearance } from '@angular/material/form-field';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'tb-mqtt-version-select',
|
||||||
|
templateUrl: './mqtt-version-select.component.html',
|
||||||
|
styleUrls: [],
|
||||||
|
providers: [{
|
||||||
|
provide: NG_VALUE_ACCESSOR,
|
||||||
|
useExisting: forwardRef(() => MqttVersionSelectComponent),
|
||||||
|
multi: true
|
||||||
|
}]
|
||||||
|
})
|
||||||
|
export class MqttVersionSelectComponent implements ControlValueAccessor {
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
disabled: boolean;
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
subscriptSizing: SubscriptSizing = 'dynamic';
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
appearance: MatFormFieldAppearance = 'fill';
|
||||||
|
|
||||||
|
mqttVersions = MqttVersions;
|
||||||
|
mqttVersionTranslation = MqttVersionTranslation;
|
||||||
|
modelValue: MqttVersion;
|
||||||
|
|
||||||
|
private requiredValue: boolean;
|
||||||
|
get required(): boolean {
|
||||||
|
return this.requiredValue;
|
||||||
|
}
|
||||||
|
@Input()
|
||||||
|
set required(value: boolean) {
|
||||||
|
this.requiredValue = coerceBooleanProperty(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private propagateChange = (v: any) => { };
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
}
|
||||||
|
|
||||||
|
registerOnChange(fn: any): void {
|
||||||
|
this.propagateChange = fn;
|
||||||
|
}
|
||||||
|
|
||||||
|
registerOnTouched(fn: any): void {
|
||||||
|
}
|
||||||
|
|
||||||
|
setDisabledState(isDisabled: boolean): void {
|
||||||
|
this.disabled = isDisabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
writeValue(value: MqttVersion | null): void {
|
||||||
|
this.modelValue = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
mqttVersionChanged() {
|
||||||
|
this.updateView();
|
||||||
|
}
|
||||||
|
|
||||||
|
private updateView() {
|
||||||
|
this.propagateChange(this.modelValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -226,6 +226,7 @@ import { JsFuncModulesComponent } from '@shared/components/js-func-modules.compo
|
|||||||
import { JsFuncModuleRowComponent } from '@shared/components/js-func-module-row.component';
|
import { JsFuncModuleRowComponent } from '@shared/components/js-func-module-row.component';
|
||||||
import { EntityKeyAutocompleteComponent } from '@shared/components/entity/entity-key-autocomplete.component';
|
import { EntityKeyAutocompleteComponent } from '@shared/components/entity/entity-key-autocomplete.component';
|
||||||
import { DurationLeftPipe } from '@shared/pipe/duration-left.pipe';
|
import { DurationLeftPipe } from '@shared/pipe/duration-left.pipe';
|
||||||
|
import { MqttVersionSelectComponent } from '@shared/components/mqtt-version-select.component';
|
||||||
|
|
||||||
export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) {
|
export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) {
|
||||||
return markedOptionsService;
|
return markedOptionsService;
|
||||||
@ -437,6 +438,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
|
|||||||
HexInputComponent,
|
HexInputComponent,
|
||||||
ScadaSymbolInputComponent,
|
ScadaSymbolInputComponent,
|
||||||
EntityKeyAutocompleteComponent,
|
EntityKeyAutocompleteComponent,
|
||||||
|
MqttVersionSelectComponent,
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
@ -700,6 +702,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
|
|||||||
WidgetButtonComponent,
|
WidgetButtonComponent,
|
||||||
ScadaSymbolInputComponent,
|
ScadaSymbolInputComponent,
|
||||||
EntityKeyAutocompleteComponent,
|
EntityKeyAutocompleteComponent,
|
||||||
|
MqttVersionSelectComponent,
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class SharedModule { }
|
export class SharedModule { }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user