diff --git a/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.html b/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.html index 6802768303..be3a2ead31 100644 --- a/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.html +++ b/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.html @@ -93,17 +93,17 @@
ota-update.warning-after-save-no-edit
- - Upload binary file - Use external URL + + Upload binary file + Use external URL
-
+
@@ -143,12 +143,12 @@
-
+
ota-update.direct-url + [required]="entityForm.get('isURL').value"> ota-update.direct-url-required diff --git a/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.ts b/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.ts index 0c2d82e171..9fd51302e1 100644 --- a/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.ts +++ b/ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.ts @@ -56,11 +56,11 @@ export class OtaUpdateComponent extends EntityComponent implements O ngOnInit() { super.ngOnInit(); - this.entityForm.get('resource').valueChanges.pipe( + this.entityForm.get('isURL').valueChanges.pipe( filter(() => this.isAdd), takeUntil(this.destroy$) - ).subscribe((resource) => { - if (resource === 'file') { + ).subscribe((isURL) => { + if (isURL === false) { this.entityForm.get('url').clearValidators(); this.entityForm.get('file').setValidators(Validators.required); this.entityForm.get('url').updateValueAndValidity({emitEvent: false}); @@ -97,7 +97,7 @@ export class OtaUpdateComponent extends EntityComponent implements O checksumAlgorithm: [entity && entity.checksumAlgorithm ? entity.checksumAlgorithm : ChecksumAlgorithm.SHA256], checksum: [entity ? entity.checksum : '', Validators.maxLength(1020)], url: [entity ? entity.url : ''], - resource: ['file'], + isURL: [false], additionalInfo: this.fb.group( { description: [entity && entity.additionalInfo ? entity.additionalInfo.description : ''], @@ -127,7 +127,7 @@ export class OtaUpdateComponent extends EntityComponent implements O dataSize: entity.dataSize, contentType: entity.contentType, url: entity.url, - resource: isNotEmptyStr(entity.url) ? 'url' : 'file', + isURL: isNotEmptyStr(entity.url), additionalInfo: { description: entity.additionalInfo ? entity.additionalInfo.description : '' } @@ -172,12 +172,11 @@ export class OtaUpdateComponent extends EntityComponent implements O } prepareFormValue(formValue: any): any { - if (formValue.resource === 'url') { + if (formValue.isURL) { delete formValue.file; } else { delete formValue.url; } - delete formValue.resource; delete formValue.generateChecksum; return super.prepareFormValue(formValue); } diff --git a/ui-ngx/src/app/shared/models/ota-package.models.ts b/ui-ngx/src/app/shared/models/ota-package.models.ts index f8b99f317f..a27330235a 100644 --- a/ui-ngx/src/app/shared/models/ota-package.models.ts +++ b/ui-ngx/src/app/shared/models/ota-package.models.ts @@ -99,6 +99,7 @@ export interface OtaPackageInfo extends BaseData { contentType: string; dataSize?: number; additionalInfo?: any; + isURL?: boolean; } export interface OtaPackage extends OtaPackageInfo {