Merge pull request #15378 from vvlladd28/merge/7-04-26/master

Merge rc to master

ui-ngx/src/app/modules/common/modules-map.ts

@@ -16,6 +16,7 @@
 
 import * as AngularAnimations from '@angular/animations';
 import * as AngularCore from '@angular/core';
+import * as AngularCoreRxjsInterop from '@angular/core/rxjs-interop';
 import * as AngularCommon from '@angular/common';
 import * as AngularForms from '@angular/forms';
 import * as AngularPlatformBrowser from '@angular/platform-browser';
@@ -355,6 +356,7 @@ class ModulesMap implements IModulesMap {
   private modulesMap: {[key: string]: any} = {
     '@angular/animations': AngularAnimations,
     '@angular/core': this.angularCoreModule20to18Patch(AngularCore),
+    '@angular/core/rxjs-interop': AngularCoreRxjsInterop,
     '@angular/common': AngularCommon,
     '@angular/common/http': HttpClientModule,
     '@angular/forms': AngularForms,

ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html

@@ -142,6 +142,7 @@
                                       placeholder="{{ 'alarm-rule.alarm-rule-relation-types-list' | translate }}"
                                       hint="{{ 'alarm-rule.alarm-rule-relation-types-list-hint' | translate }}"
                                       [predefinedValues]="predefinedTypeValues"
+                                      subscriptSizing="dynamic"
                                       allowUserValue
                                       formControlName="propagateRelationTypes">
                 </tb-string-items-list>

ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html

@@ -37,7 +37,7 @@
           }
         </div>
         <span class="flex-1"></span>
-        @if (attributeScope !== attributeScopeTypes.CLIENT_SCOPE) {
+        @if (attributeScope !== attributeScopeTypes.CLIENT_SCOPE && !disableAddTelemetry) {
           <button mat-icon-button
                   [disabled]="isLoading$ | async"
                   (click)="addAttribute($event)"

ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts

@@ -90,6 +90,7 @@ import { Filters } from '@shared/models/query/query.models';
 import { hidePageSizePixelValue } from '@shared/models/constants';
 import { DeleteTimeseriesPanelComponent } from '@home/components/attribute/delete-timeseries-panel.component';
 import { FormBuilder } from '@angular/forms';
+import { coerceBoolean } from '@shared/decorators/coercion';
 import { AggregationType, defaultTimewindow } from '@shared/models/time/time.models';
 import { TimeService } from '@core/services/time.service';
 
@@ -145,6 +146,10 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     return this.disableAttributeScopeSelectionValue;
   }
 
+  @Input()
+  @coerceBoolean()
+  disableAddTelemetry: boolean;
+
   @Input()
   set disableAttributeScopeSelection(value: boolean) {
     this.disableAttributeScopeSelectionValue = coerceBooleanProperty(value);

ui-ngx/src/app/modules/home/models/widget-component.models.ts

@@ -68,7 +68,7 @@ import {
   formatValue,
   getEntityDetailsPageURL,
   hasDatasourceLabelsVariables,
-  isDefined
+  isDefined, isDefinedAndNotNull
 } from '@core/utils';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -555,7 +555,9 @@ export class LabelVariablePattern {
         const entityInfo = this.ctx.defaultSubscription.getFirstEntityInfo();
         label = createLabelFromSubscriptionEntityInfo(entityInfo, label);
       } else {
-        const datasource = this.ctx.defaultSubscription?.firstDatasource ?? (this.ctx as any).mapInstance?.getData()[0];
+        const datasource = isDefinedAndNotNull(this.ctx.defaultSubscription)
+          ? this.ctx.defaultSubscription.firstDatasource ?? undefined
+          : (this.ctx as any).mapInstance?.getData()[0];
         label = createLabelFromDatasource(datasource, label);
       }
     }

ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html

@@ -30,6 +30,7 @@
     label="{{ 'attribute.latest-telemetry' | translate }}" #telemetryTab="matTab">
     <tb-attribute-table [defaultAttributeScope]="latestTelemetryTypes.LATEST_TELEMETRY"
                         disableAttributeScopeSelection
+                        disableAddTelemetry
                         [active]="telemetryTab.isActive"
                         [entityId]="entity.id"
                         [entityName]="entity.name">

ui-ngx/src/assets/locale/locale.constant-da_DK.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Håndtér funktion for tomt resultat",
       "handle-error-function": "Håndtér fejlfunktion",
       "handle-non-mobile-fallback-function": "Håndtér fallbackfunktion for ikke-mobil",
-      "save-to-gallery": "Gem i galleri",
+      "save-to-gallery": "Gem i 'Billedgalleri'",
       "provision-type": "Provisioneringstype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-de_DE.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Funktion zum Verarbeiten eines leeren Ergebnisses",
       "handle-error-function": "Funktion zum Verarbeiten eines Fehlers",
       "handle-non-mobile-fallback-function": "Fallback-Funktion für Nicht-Mobile",
-      "save-to-gallery": "In Galerie speichern",
+      "save-to-gallery": "In 'Bildergalerie' speichern",
       "provision-type": "Provisioning-Typ",
       "auto": "Auto",
       "wi-fi": "WLAN",

ui-ngx/src/assets/locale/locale.constant-el_GR.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Συνάρτηση χειρισμού κενού αποτελέσματος",
       "handle-error-function": "Συνάρτηση χειρισμού σφάλματος",
       "handle-non-mobile-fallback-function": "Συνάρτηση εναλλακτικής διαχείρισης για μη κινητά",
-      "save-to-gallery": "Αποθήκευση στη συλλογή",
+      "save-to-gallery": "Αποθήκευση στη 'Συλλογή εικόνων'",
       "provision-type": "Τύπος παροχής",
       "auto": "Αυτόματο",
       "wi-fi": "Wi-Fi",

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

@@ -7501,7 +7501,7 @@
           "handle-empty-result-function": "Handle empty result function",
           "handle-error-function": "Handle error function",
           "handle-non-mobile-fallback-function": "Handle Non-Mobile fallback function",
-          "save-to-gallery": "Save to gallery",
+          "save-to-gallery": "Save to 'Image gallery'",
           "provision-type": "Provision type",
           "auto": "Auto",
           "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-es_ES.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Gestionar función de resultado vacío",
       "handle-error-function": "Gestionar función de error",
       "handle-non-mobile-fallback-function": "Gestionar función de alternativa para no móvil",
-      "save-to-gallery": "Guardar en la galería",
+      "save-to-gallery": "Guardar en la 'Galería de imágenes'",
       "provision-type": "Tipo de aprovisionamiento",
       "auto": "Automático",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-fr_FR.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Gérer la fonction de résultat vide",
       "handle-error-function": "Gérer la fonction d’erreur",
       "handle-non-mobile-fallback-function": "Gérer la fonction de repli non mobile",
-      "save-to-gallery": "Enregistrer dans la galerie",
+      "save-to-gallery": "Enregistrer dans la 'Galerie d'images'",
       "provision-type": "Type de provisionnement",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-hi_IN.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "खाली परिणाम फ़ंक्शन को हैंडल करें",
       "handle-error-function": "त्रुटि फ़ंक्शन को हैंडल करें",
       "handle-non-mobile-fallback-function": "नॉन-मोबाइल फ़ॉलबैक फ़ंक्शन को हैंडल करें",
-      "save-to-gallery": "गैलरी में सहेजें",
+      "save-to-gallery": "'इमेज गैलरी' में सहेजें",
       "provision-type": "प्रोविजन प्रकार",
       "auto": "स्वचालित",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-it_IT.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Funzione per gestire il risultato vuoto",
       "handle-error-function": "Funzione per gestire l'errore",
       "handle-non-mobile-fallback-function": "Funzione per gestire il fallback Non-Mobile",
-      "save-to-gallery": "Salva nella galleria",
+      "save-to-gallery": "Salva nella 'Galleria Immagini'",
       "provision-type": "Tipo di provision",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-ja_JP.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "空結果処理関数",
       "handle-error-function": "エラー処理関数",
       "handle-non-mobile-fallback-function": "非モバイルフォールバック処理関数",
-      "save-to-gallery": "ギャラリーに保存",
+      "save-to-gallery": "'画像ギャラリー'に保存",
       "provision-type": "プロビジョニングタイプ",
       "auto": "自動",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-nl_NL.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Leegresultaatfunctie afhandelen",
       "handle-error-function": "Foutfunctie afhandelen",
       "handle-non-mobile-fallback-function": "Non-Mobile-terugvalfunctie afhandelen",
-      "save-to-gallery": "Opslaan in galerij",
+      "save-to-gallery": "Opslaan in 'Afbeeldingsgalerij'",
       "provision-type": "Provisioningtype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-no_NO.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Håndter funksjon for tomt resultat",
       "handle-error-function": "Håndter feilfunksjon",
       "handle-non-mobile-fallback-function": "Håndter fallback-funksjon for ikke-mobil",
-      "save-to-gallery": "Lagre i galleri",
+      "save-to-gallery": "Lagre i 'Bildegalleriet'",
       "provision-type": "Klargjøringstype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-pt_BR.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Função para tratar resultado vazio",
       "handle-error-function": "Função para tratar erro",
       "handle-non-mobile-fallback-function": "Função de fallback para ambiente não mobile",
-      "save-to-gallery": "Salvar na galeria",
+      "save-to-gallery": "Salvar na 'Galeria de Imagens'",
       "provision-type": "Tipo de provisionamento",
       "auto": "Automático",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-tr_TR.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Boş sonuç fonksiyonunu işle",
       "handle-error-function": "Hata fonksiyonunu işle",
       "handle-non-mobile-fallback-function": "Mobil olmayan geri dönüş fonksiyonunu işle",
-      "save-to-gallery": "Galeriye kaydet",
+      "save-to-gallery": "'Resim Galerisi'ne kaydet",
       "provision-type": "Sağlama türü",
       "auto": "Otomatik",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-uk_UA.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "Функція обробки порожнього результату",
       "handle-error-function": "Функція обробки помилки",
       "handle-non-mobile-fallback-function": "Функція обробки резервної ситуації для не мобільних пристроїв",
-      "save-to-gallery": "Зберегти в галерею",
+      "save-to-gallery": "Зберегти в 'Галерею зображень'",
       "provision-type": "Тип налаштування",
       "auto": "Авто",
       "wi-fi": "Wi-Fi",

ui-ngx/src/assets/locale/locale.constant-zh_CN.json

@@ -7466,7 +7466,7 @@
       "handle-empty-result-function": "处理空结果函数",
       "handle-error-function": "处理错误函数",
       "handle-non-mobile-fallback-function": "处理非移动端回退函数",
-      "save-to-gallery": "保存到相册",
+      "save-to-gallery": "保存到'图片库'",
       "provision-type": "配网类型",
       "auto": "自动",
       "wi-fi": "Wi-Fi",