Browse Source

UI: Refactoring

pull/8597/head
Artem Dzhereleiko 3 years ago
parent
commit
41a3e6c22e
  1. 6
      ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
  2. 4
      ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
  3. 4
      ui-ngx/src/app/modules/home/components/queue/queue-form.component.html
  4. 4
      ui-ngx/src/assets/locale/locale.constant-en_US.json

6
ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts

@ -14,7 +14,7 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { Component, forwardRef, Input, OnDestroy } from '@angular/core'; import { Component, forwardRef, Input, OnDestroy, OnInit } from '@angular/core';
import { import {
AbstractControl, AbstractControl,
ControlValueAccessor, ControlValueAccessor,
@ -53,7 +53,7 @@ import { takeUntil } from 'rxjs/operators';
} }
] ]
}) })
export class TenantProfileQueuesComponent implements ControlValueAccessor, Validator, OnDestroy { export class TenantProfileQueuesComponent implements ControlValueAccessor, Validator, OnInit, OnDestroy {
tenantProfileQueuesFormGroup: UntypedFormGroup; tenantProfileQueuesFormGroup: UntypedFormGroup;
newQueue = false; newQueue = false;
@ -115,7 +115,7 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, Valid
} }
writeValue(queues: Array<QueueInfo> | null): void { writeValue(queues: Array<QueueInfo> | null): void {
if (queues.length === this.queuesFormArray.length) { if (queues?.length === this.queuesFormArray.length) {
this.queuesFormArray.patchValue(queues, {emitEvent: false}); this.queuesFormArray.patchValue(queues, {emitEvent: false});
} else { } else {
const queuesControls: Array<AbstractControl> = []; const queuesControls: Array<AbstractControl> = [];

4
ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html

@ -338,10 +338,10 @@
formControlName="maxOtaPackagesInBytes" formControlName="maxOtaPackagesInBytes"
type="number"> type="number">
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxOtaPackagesInBytes').hasError('required')"> <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxOtaPackagesInBytes').hasError('required')">
{{ 'tenant-profile.maximum-ota-packages-sum-data-size-required' | translate}} {{ 'tenant-profile.maximum-ota-package-sum-data-size-required' | translate}}
</mat-error> </mat-error>
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxOtaPackagesInBytes').hasError('min')"> <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxOtaPackagesInBytes').hasError('min')">
{{ 'tenant-profile.maximum-ota-packages-sum-data-size-range' | translate}} {{ 'tenant-profile.maximum-ota-package-sum-data-size-range' | translate}}
</mat-error> </mat-error>
<mat-hint></mat-hint> <mat-hint></mat-hint>
</mat-form-field> </mat-form-field>

4
ui-ngx/src/app/modules/home/components/queue/queue-form.component.html

@ -37,7 +37,7 @@
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent> <ng-template matExpansionPanelContent>
<div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="16px" formGroupName="submitStrategy"> <div fxFlex fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="16px" formGroupName="submitStrategy">
<div fxFlex> <div fxFlex>
<label class="group-label" translate>queue.submit-strategy</label> <label class="group-label" translate>queue.submit-strategy</label>
<mat-radio-group fxFlex fxLayout="column" formControlName="type" required> <mat-radio-group fxFlex fxLayout="column" formControlName="type" required>
@ -75,7 +75,7 @@
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent> <ng-template matExpansionPanelContent>
<div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="16px" formGroupName="processingStrategy"> <div fxFlex fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="16px" formGroupName="processingStrategy">
<div fxFlex> <div fxFlex>
<label class="group-label" translate>queue.processing-strategy</label> <label class="group-label" translate>queue.processing-strategy</label>
<mat-radio-group fxFlex fxLayout="column" formControlName="type" required> <mat-radio-group fxFlex fxLayout="column" formControlName="type" required>

4
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -3600,8 +3600,8 @@
"maximum-resources-sum-data-size-required": "Resource files sum size is required.", "maximum-resources-sum-data-size-required": "Resource files sum size is required.",
"maximum-resources-sum-data-size-range": "Resource files sum size can`t be negative", "maximum-resources-sum-data-size-range": "Resource files sum size can`t be negative",
"maximum-ota-packages-sum-data-size": "OTA package files sum size", "maximum-ota-packages-sum-data-size": "OTA package files sum size",
"maximum-ota-packages-sum-data-size-required": "OTA package files sum size is required.", "maximum-ota-package-sum-data-size-required": "OTA package files sum size is required.",
"maximum-ota-packages-sum-data-size-range": "OTA package files sum size can`t be negative", "maximum-ota-package-sum-data-size-range": "OTA package files sum size can`t be negative",
"rest-requests-for-tenant": "REST requests for tenant", "rest-requests-for-tenant": "REST requests for tenant",
"transport-tenant-telemetry-msg-rate-limit": "Transport tenant telemetry messages", "transport-tenant-telemetry-msg-rate-limit": "Transport tenant telemetry messages",
"transport-tenant-telemetry-data-points-rate-limit": "Transport tenant telemetry data points", "transport-tenant-telemetry-data-points-rate-limit": "Transport tenant telemetry data points",

Loading…
Cancel
Save