Merge pull request #15012 from thingsboard/lts-4.2

LTS 4.2 to LTS 4.3

ui-ngx/patches/ngx-hm-carousel+19.0.0.patch

@@ -0,0 +1,31 @@
+diff --git a/node_modules/ngx-hm-carousel/fesm2022/ngx-hm-carousel.mjs b/node_modules/ngx-hm-carousel/fesm2022/ngx-hm-carousel.mjs
+index 117f782..70e49a7 100644
+--- a/node_modules/ngx-hm-carousel/fesm2022/ngx-hm-carousel.mjs
++++ b/node_modules/ngx-hm-carousel/fesm2022/ngx-hm-carousel.mjs
+@@ -1,5 +1,5 @@
+ import * as i0 from '@angular/core';
+-import { Directive, inject, ViewContainerRef, TemplateRef, input, PLATFORM_ID, DestroyRef, Renderer2, NgZone, ChangeDetectorRef, viewChild, ElementRef, contentChildren, contentChild, computed, signal, effect, forwardRef, Component, ChangeDetectionStrategy } from '@angular/core';
++import { Directive, inject, ViewContainerRef, TemplateRef, input, PLATFORM_ID, DestroyRef, Renderer2, NgZone, ChangeDetectorRef, viewChild, ElementRef, contentChildren, contentChild, computed, signal, effect, forwardRef, Component, ChangeDetectionStrategy, afterNextRender } from '@angular/core';
+ import { DOCUMENT, isPlatformBrowser, NgTemplateOutlet, AsyncPipe } from '@angular/common';
+ import { toObservable, takeUntilDestroyed } from '@angular/core/rxjs-interop';
+ import { NG_VALUE_ACCESSOR } from '@angular/forms';
+@@ -340,7 +340,7 @@ class NgxHmCarouselComponent {
+                 });
+             });
+         });
+-        const effectRef = effect(() => {
++        afterNextRender(() => {
+             this.rootElm = this.container().nativeElement;
+             this.containerElm = this.rootElm.children[0];
+             this.init();
+@@ -365,10 +365,6 @@ class NgxHmCarouselComponent {
+             ])
+                 .pipe(takeUntilDestroyed(this._destroyRef))
+                 .subscribe();
+-            // only exec once
+-            effectRef.destroy();
+-        }, {
+-            allowSignalWrites: true,
+         });
+     }
+     ngOnDestroy() {

ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/marker-image-settings.component.ts

@@ -82,11 +82,12 @@ export class MarkerImageSettingsComponent implements ControlValueAccessor {
         renderer: this.renderer,
         componentType: MarkerImageSettingsPanelComponent,
         hostView: this.viewContainerRef,
-        preferredPlacement: 'left',
+        preferredPlacement: 'leftOnly',
         context: {
           markerImageSettings: this.modelValue,
         },
-        isModal: true
+        isModal: true,
+        overlayStyle: {padding: '10px'}
       });
       markerImageSettingsPanelPopover.tbComponentRef.instance.popover = markerImageSettingsPanelPopover;
       markerImageSettingsPanelPopover.tbComponentRef.instance.markerImageSettingsApplied.subscribe((markerImageSettings) => {

ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/shape-fill-image-settings.component.ts

@@ -82,11 +82,12 @@ export class ShapeFillImageSettingsComponent implements ControlValueAccessor {
         renderer: this.renderer,
         componentType: ShapeFillImageSettingsPanelComponent,
         hostView: this.viewContainerRef,
-        preferredPlacement: 'left',
+        preferredPlacement: 'leftOnly',
         context: {
           shapeFillImageSettings: this.modelValue,
         },
-        isModal: true
+        isModal: true,
+        overlayStyle: {padding: '10px'}
       }).tbComponentRef.instance.shapeFillImageSettingsApplied.subscribe((shapeFillImageSettings) => {
         this.modelValue = shapeFillImageSettings;
         this.propagateChange(this.modelValue);

ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts

@@ -48,7 +48,7 @@ export class EditorPanelComponent implements OnInit {
   tinyMceOptions: Partial<EditorOptions> = {
     base_url: '/assets/tinymce',
     suffix: '.min',
-    plugins: ['link', 'table', 'image', 'imagetools', 'lists', 'fullscreen'],
+    plugins: ['link', 'table', 'image', 'lists', 'fullscreen'],
     menubar: 'edit insert view format',
     toolbar: ['fontfamily fontsize | bold italic underline strikethrough forecolor backcolor',
       'alignleft aligncenter alignright alignjustify | bullist | link table image | fullscreen'],

ui-ngx/src/app/modules/login/pages/login/login.component.ts

@@ -76,7 +76,7 @@ export class LoginComponent extends PageComponent implements OnInit {
   getOAuth2Uri(oauth2Client: OAuth2ClientLoginInfo): string {
     let result = "";
     if (this.authService.redirectUrl) {
-      result += "?prevUri=" + this.authService.redirectUrl;
+      result += "?prevUri=" + encodeURIComponent(this.authService.redirectUrl);
     }
     return oauth2Client.url + result;
   }