|
...
|
...
|
@@ -15,7 +15,7 @@ |
|
15
|
15
|
///
|
|
16
|
16
|
|
|
17
|
17
|
import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
|
|
18
|
|
-import { Subject } from 'rxjs';
|
|
|
18
|
+import { combineLatest, Subject } from 'rxjs';
|
|
19
|
19
|
import { Store } from '@ngrx/store';
|
|
20
|
20
|
import { AppState } from '@core/core.state';
|
|
21
|
21
|
import { TranslateService } from '@ngx-translate/core';
|
|
...
|
...
|
@@ -30,7 +30,7 @@ import { |
|
30
|
30
|
OtaUpdateTypeTranslationMap
|
|
31
|
31
|
} from '@shared/models/ota-package.models';
|
|
32
|
32
|
import { ActionNotificationShow } from '@core/notification/notification.actions';
|
|
33
|
|
-import { filter, takeUntil } from 'rxjs/operators';
|
|
|
33
|
+import { filter, startWith, takeUntil } from 'rxjs/operators';
|
|
34
|
34
|
import { isNotEmptyStr } from '@core/utils';
|
|
35
|
35
|
|
|
36
|
36
|
@Component({
|
|
...
|
...
|
@@ -56,22 +56,36 @@ export class OtaUpdateComponent extends EntityComponent<OtaPackage> implements O |
|
56
|
56
|
|
|
57
|
57
|
ngOnInit() {
|
|
58
|
58
|
super.ngOnInit();
|
|
59
|
|
- this.entityForm.get('isURL').valueChanges.pipe(
|
|
60
|
|
- filter(() => this.isAdd),
|
|
61
|
|
- takeUntil(this.destroy$)
|
|
62
|
|
- ).subscribe((isURL) => {
|
|
63
|
|
- if (isURL === false) {
|
|
64
|
|
- this.entityForm.get('url').clearValidators();
|
|
65
|
|
- this.entityForm.get('file').setValidators(Validators.required);
|
|
66
|
|
- this.entityForm.get('url').updateValueAndValidity({emitEvent: false});
|
|
67
|
|
- this.entityForm.get('file').updateValueAndValidity({emitEvent: false});
|
|
68
|
|
- } else {
|
|
69
|
|
- this.entityForm.get('file').clearValidators();
|
|
70
|
|
- this.entityForm.get('url').setValidators([Validators.required, Validators.pattern('(.|\\s)*\\S(.|\\s)*')]);
|
|
71
|
|
- this.entityForm.get('file').updateValueAndValidity({emitEvent: false});
|
|
72
|
|
- this.entityForm.get('url').updateValueAndValidity({emitEvent: false});
|
|
73
|
|
- }
|
|
74
|
|
- });
|
|
|
59
|
+ if (this.isAdd) {
|
|
|
60
|
+ this.entityForm.get('isURL').valueChanges.pipe(
|
|
|
61
|
+ takeUntil(this.destroy$)
|
|
|
62
|
+ ).subscribe((isURL) => {
|
|
|
63
|
+ if (isURL === false) {
|
|
|
64
|
+ this.entityForm.get('url').clearValidators();
|
|
|
65
|
+ this.entityForm.get('file').setValidators(Validators.required);
|
|
|
66
|
+ this.entityForm.get('url').updateValueAndValidity({emitEvent: false});
|
|
|
67
|
+ this.entityForm.get('file').updateValueAndValidity({emitEvent: false});
|
|
|
68
|
+ } else {
|
|
|
69
|
+ this.entityForm.get('file').clearValidators();
|
|
|
70
|
+ this.entityForm.get('url').setValidators([Validators.required, Validators.pattern('(.|\\s)*\\S(.|\\s)*')]);
|
|
|
71
|
+ this.entityForm.get('file').updateValueAndValidity({emitEvent: false});
|
|
|
72
|
+ this.entityForm.get('url').updateValueAndValidity({emitEvent: false});
|
|
|
73
|
+ }
|
|
|
74
|
+ });
|
|
|
75
|
+ combineLatest([
|
|
|
76
|
+ this.entityForm.get('title').valueChanges.pipe(startWith(''), takeUntil(this.destroy$)),
|
|
|
77
|
+ this.entityForm.get('version').valueChanges.pipe(startWith(''), takeUntil(this.destroy$))
|
|
|
78
|
+ ]).pipe(
|
|
|
79
|
+ filter(() => this.entityForm.get('tag').pristine),
|
|
|
80
|
+ takeUntil(this.destroy$)
|
|
|
81
|
+ ).subscribe(([title, version]) => {
|
|
|
82
|
+ let tag = `${title} ${version}`.trim();
|
|
|
83
|
+ if (tag === '') {
|
|
|
84
|
+ tag = '';
|
|
|
85
|
+ }
|
|
|
86
|
+ this.entityForm.get('tag').patchValue(tag);
|
|
|
87
|
+ });
|
|
|
88
|
+ }
|
|
75
|
89
|
}
|
|
76
|
90
|
|
|
77
|
91
|
ngOnDestroy() {
|
|
...
|
...
|
@@ -92,6 +106,7 @@ export class OtaUpdateComponent extends EntityComponent<OtaPackage> implements O |
|
92
|
106
|
const form = this.fb.group({
|
|
93
|
107
|
title: [entity ? entity.title : '', [Validators.required, Validators.maxLength(255)]],
|
|
94
|
108
|
version: [entity ? entity.version : '', [Validators.required, Validators.maxLength(255)]],
|
|
|
109
|
+ tag: [entity ? entity.tag : '', [Validators.maxLength(255)]],
|
|
95
|
110
|
type: [entity?.type ? entity.type : OtaUpdateType.FIRMWARE, Validators.required],
|
|
96
|
111
|
deviceProfileId: [entity ? entity.deviceProfileId : null, Validators.required],
|
|
97
|
112
|
checksumAlgorithm: [entity && entity.checksumAlgorithm ? entity.checksumAlgorithm : ChecksumAlgorithm.SHA256],
|
|
...
|
...
|
@@ -119,6 +134,7 @@ export class OtaUpdateComponent extends EntityComponent<OtaPackage> implements O |
|
119
|
134
|
this.entityForm.patchValue({
|
|
120
|
135
|
title: entity.title,
|
|
121
|
136
|
version: entity.version,
|
|
|
137
|
+ tag: entity.tag,
|
|
122
|
138
|
type: entity.type,
|
|
123
|
139
|
deviceProfileId: entity.deviceProfileId,
|
|
124
|
140
|
checksumAlgorithm: entity.checksumAlgorithm,
|
...
|
...
|
|
