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

Merge pull request #4739 from vvlladd28/imrovement/ota-package/component

Browse Source 
UI: Add validation ota package URL; Improvement ota-package-autocompl…
This commit is contained in:
Igor Kulikov 2021-06-15 16:56:08 +03:00 committed by GitHub
commit 8769fe3ad6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui-ngx/src/app/modules/home/pages/device/device.component.ts
View File

@ -35,6 +35,7 @@ import { TranslateService } from '@ngx-translate/core';
import { EntityTableConfig } from '@home/models/entity/entities-table-config.models';
import { Subject } from 'rxjs';
import { OtaUpdateType } from '@shared/models/ota-package.models';
import { distinctUntilChanged } from 'rxjs/operators';
@Component({
selector: 'tb-device',
@ -78,7 +79,7 @@ export class DeviceComponent extends EntityComponent<DeviceInfo> {
}
buildForm(entity: DeviceInfo): FormGroup {
return this.fb.group(
const form = this.fb.group(
{
name: [entity ? entity.name : '', [Validators.required]],
deviceProfileId: [entity ? entity.deviceProfileId : null, [Validators.required]],
@ -95,6 +96,17 @@ export class DeviceComponent extends EntityComponent<DeviceInfo> {
)
}
);
form.get('deviceProfileId').valueChanges.pipe(
distinctUntilChanged((prev, curr) => prev?.id === curr?.id)
).subscribe(profileId => {
if (profileId && this.isEdit) {
this.entityForm.patchValue({
firmwareId: null,
softwareId: null
}, {emitEvent: false});
}
});
return form;
}
updateForm(entity: DeviceInfo) {
@ -156,10 +168,6 @@ export class DeviceComponent extends EntityComponent<DeviceInfo> {
this.entityForm.markAsDirty();
}
}
this.entityForm.patchValue({
firmwareId: null,
softwareId: null
});
}
}
}

2
ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.html
View File

@ -149,7 +149,7 @@
<input matInput formControlName="url"
type="text"
[required]="entityForm.get('resource').value === 'url'">
<mat-error *ngIf="entityForm.get('url').hasError('required')" translate>
<mat-error *ngIf="entityForm.get('url').hasError('required') || entityForm.get('url').hasError('pattern')" translate>
ota-update.direct-url-required
</mat-error>
</mat-form-field>

7
ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.ts
View File

@ -67,7 +67,7 @@ export class OtaUpdateComponent extends EntityComponent<OtaPackage> implements O
this.entityForm.get('file').updateValueAndValidity({emitEvent: false});
} else {
this.entityForm.get('file').clearValidators();
this.entityForm.get('url').setValidators(Validators.required);
this.entityForm.get('url').setValidators([Validators.required, Validators.pattern('(.|\\s)*\\S(.|\\s)*')]);
this.entityForm.get('file').updateValueAndValidity({emitEvent: false});
this.entityForm.get('url').updateValueAndValidity({emitEvent: false});
}
@ -172,6 +172,11 @@ export class OtaUpdateComponent extends EntityComponent<OtaPackage> implements O
}
prepareFormValue(formValue: any): any {
if (formValue.resource === 'url') {
delete formValue.file;
} else {
delete formValue.url;
}
delete formValue.resource;
delete formValue.generateChecksum;
return super.prepareFormValue(formValue);

3
ui-ngx/src/app/shared/components/ota-package/ota-package-autocomplete.component.html
View File

@ -21,7 +21,8 @@
formControlName="packageId"
(focusin)="onFocus()"
[required]="required"
[matAutocomplete]="packageAutocomplete">
[matAutocomplete]="packageAutocomplete"
[matAutocompleteDisabled]="disabled">
<button *ngIf="otaPackageFormGroup.get('packageId').value && !disabled"
type="button"
matSuffix mat-button mat-icon-button aria-label="Clear"

2
ui-ngx/src/app/shared/components/ota-package/ota-package-autocomplete.component.ts
View File

@ -222,7 +222,7 @@ export class OtaPackageAutocompleteComponent implements ControlValueAccessor, On
}
clear() {
this.otaPackageFormGroup.get('packageId').patchValue('', {emitEvent: true});
this.otaPackageFormGroup.get('packageId').patchValue('', {emitEvent: false});
setTimeout(() => {
this.packageInput.nativeElement.blur();
this.packageInput.nativeElement.focus();