Merge pull request #6643 from ArtemDzhereleiko/AD/queues/improvement

[3.4] UI: Improvement for queues

ui-ngx/src/app/core/services/menu.service.ts

@@ -108,7 +108,7 @@ export class MenuService {
         name: 'admin.system-settings',
         type: 'toggle',
         path: '/settings',
-        height: '280px',
+        height: '320px',
         icon: 'settings',
         pages: [
           {

ui-ngx/src/app/modules/home/components/profile/tenant-profile-data.component.ts

@@ -95,7 +95,7 @@ export class TenantProfileDataComponent implements ControlValueAccessor, OnInit,
     if (this.tenantProfileDataFormGroup.valid) {
       tenantProfileData = this.tenantProfileDataFormGroup.getRawValue();
     }
-    this.propagateChange(tenantProfileData.configuration);
+    this.propagateChange(tenantProfileData?.configuration);
   }
 
 }

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

@@ -16,7 +16,7 @@
 
 -->
 
-<form [formGroup]="queueFormGroup" fxLayout="column" fxLayoutGap="0.5em">
+<form [formGroup]="queueFormGroup" fxLayout="column">
   <mat-form-field class="mat-block">
     <mat-label translate>admin.queue-name</mat-label>
     <input matInput formControlName="name" required>

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

@@ -17,6 +17,10 @@
   .queue-strategy {
     padding-bottom: 16px;
 
+    .mat-expansion-panel-header {
+      height: 50px;
+    }
+
     .mat-expansion-panel-body {
       padding-bottom: 0 !important;
     }

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

@@ -158,6 +158,8 @@ export class QueueFormComponent implements ControlValueAccessor, OnInit, OnDestr
     this.modelValue = value;
     if (isDefinedAndNotNull(this.modelValue)) {
       this.queueFormGroup.patchValue(this.modelValue, {emitEvent: false});
+      this.queueFormGroup.get('additionalInfo').get('description')
+        .patchValue(this.modelValue.additionalInfo?.description, {emitEvent: false});
       this.submitStrategyTypeChanged();
     }
     if (!this.disabled && !this.queueFormGroup.valid) {

ui-ngx/src/app/modules/home/pages/admin/queue/queues-table-config.resolver.ts

@@ -17,7 +17,12 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
 import { EntityTableColumn, EntityTableConfig } from '@home/models/entity/entities-table-config.models';
-import { QueueInfo, ServiceType } from '@shared/models/queue.models';
+import {
+  QueueInfo,
+  QueueProcessingStrategyTypesMap,
+  QueueSubmitStrategyTypesMap,
+  ServiceType
+} from '@shared/models/queue.models';
 import { select, Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { BroadcastService } from '@core/services/broadcast.service';
@@ -83,14 +88,14 @@ export class QueuesTableConfigResolver implements Resolve<EntityTableConfig<Queu
       new EntityTableColumn<QueueInfo>('partitions', 'admin.queue-partitions', '25%'),
       new EntityTableColumn<QueueInfo>('submitStrategy', 'admin.queue-submit-strategy', '25%',
         (entity: QueueInfo) => {
-          return entity.submitStrategy.type;
+          return this.translate.instant(QueueSubmitStrategyTypesMap.get(entity.submitStrategy.type).label);
         },
         () => ({}),
         false
       ),
       new EntityTableColumn<QueueInfo>('processingStrategy', 'admin.queue-processing-strategy', '25%',
         (entity: QueueInfo) => {
-          return entity.processingStrategy.type;
+          return this.translate.instant(QueueProcessingStrategyTypesMap.get(entity.processingStrategy.type).label);
         },
         () => ({}),
         false

ui-ngx/src/app/shared/models/queue.models.ts

@@ -75,7 +75,7 @@ export const QueueProcessingStrategyTypesMap = new Map<QueueProcessingStrategyTy
   [
     [QueueProcessingStrategyTypes.RETRY_FAILED_AND_TIMED_OUT, {
       label: 'queue.strategies.retry-failed-and-timeout-label',
-      hint: 'queue.strategies.retry-failed-and-timout-hint',
+      hint: 'queue.strategies.retry-failed-and-timeout-hint',
     }],
     [QueueProcessingStrategyTypes.SKIP_ALL_FAILURES, {
       label: 'queue.strategies.skip-all-failures-label',