Fix conflicts

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java

@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
 import jakarta.annotation.Nullable;
+import java.util.Objects;
 
 @Slf4j
 @RuleNode(
@@ -57,7 +58,7 @@ public class TbCheckAlarmStatusNode implements TbNode {
     public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException {
         try {
             Alarm alarm = JacksonUtil.fromString(msg.getData(), Alarm.class);
-
+            Objects.requireNonNull(alarm, "alarm is null");
             ListenableFuture<Alarm> latest = ctx.getAlarmService().findAlarmByIdAsync(ctx.getTenantId(), alarm.getId());
 
             Futures.addCallback(latest, new FutureCallback<>() {
@@ -78,7 +79,11 @@ public class TbCheckAlarmStatusNode implements TbNode {
                 }
             }, ctx.getDbCallbackExecutor());
         } catch (Exception e) {
-            log.error("Failed to parse alarm: [{}]", msg.getData());
+            if (e instanceof IllegalArgumentException || e instanceof NullPointerException) {
+                log.debug("[{}][{}] Failed to parse alarm: [{}] error [{}]", ctx.getTenantId(), ctx.getRuleChainName(), msg.getData(), e.getMessage());
+            } else {
+                log.error("[{}][{}] Failed to parse alarm: [{}]", ctx.getTenantId(), ctx.getRuleChainName(), msg.getData(), e);
+            }
             throw new TbNodeException(e);
         }
     }

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java

@@ -38,8 +38,10 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -158,6 +160,19 @@ class TbCheckAlarmStatusNodeTest {
         assertThat(value).isInstanceOf(TbNodeException.class).hasMessage("No such alarm found.");
     }
 
+    @Test
+    void givenUnparseableAlarm_whenOnMsg_then_Failure() {
+        String msgData = "{\"Number\":1113718,\"id\":8.1}";
+        TbMsg msg = getTbMsg(msgData);
+        willReturn("Default Rule Chain").given(ctx).getRuleChainName();
+
+        assertThatThrownBy(() -> node.onMsg(ctx, msg))
+                .as("onMsg")
+                .isInstanceOf(TbNodeException.class)
+                .hasCauseInstanceOf(IllegalArgumentException.class)
+                .hasMessage("java.lang.IllegalArgumentException: The given string value cannot be transformed to Json object: {\"Number\":1113718,\"id\":8.1}");
+    }
+
     private TbMsg getTbMsg(String msgData) {
         return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, msgData);
     }

rule-engine/rule-engine-components/src/test/resources/logback-test.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.thingsboard.rule.engine.filter.TbCheckAlarmStatusNode" level="DEBUG"/>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>

ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.html

@@ -85,12 +85,11 @@
       </div>
     </div>
     <div *ngIf="linkType === ImageLinkType.none" class="tb-image-select-buttons-container">
-      <button #browseGalleryButton
-              mat-stroked-button
+      <button mat-stroked-button
               type="button"
               color="primary"
               class="tb-image-select-button"
-              (click)="toggleGallery($event, browseGalleryButton)">
+              (click)="toggleGallery($event)">
         <tb-icon matButtonIcon>filter</tb-icon>
         <span translate>image.browse-from-gallery</span>
       </button>

ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.ts

@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, Renderer2, ViewContainerRef } from '@angular/core';
+import { ChangeDetectorRef, Component, forwardRef, Input, OnDestroy } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -24,10 +24,13 @@ import { DndDropEvent } from 'ngx-drag-drop';
 import { isUndefined } from '@core/utils';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { ImageLinkType } from '@shared/components/image/gallery-image-input.component';
-import { TbPopoverService } from '@shared/components/popover.service';
-import { MatButton } from '@angular/material/button';
-import { ImageGalleryComponent } from '@shared/components/image/image-gallery.component';
-import { prependTbImagePrefixToUrls, removeTbImagePrefixFromUrls } from '@shared/models/resource.models';
+import {
+  ImageResourceInfo,
+  prependTbImagePrefixToUrls,
+  removeTbImagePrefixFromUrls
+} from '@shared/models/resource.models';
+import { MatDialog } from '@angular/material/dialog';
+import { ImageGalleryDialogComponent } from '@shared/components/image/image-gallery-dialog.component';
 
 @Component({
   selector: 'tb-multiple-gallery-image-input',
@@ -66,10 +69,8 @@ export class MultipleGalleryImageInputComponent extends PageComponent implements
   private propagateChange = null;
 
   constructor(protected store: Store<AppState>,
-              private cd: ChangeDetectorRef,
-              private renderer: Renderer2,
-              private viewContainerRef: ViewContainerRef,
-              private popoverService: TbPopoverService) {
+              private dialog: MatDialog,
+              private cd: ChangeDetectorRef) {
     super(store);
   }
 
@@ -130,31 +131,21 @@ export class MultipleGalleryImageInputComponent extends PageComponent implements
     this.updateModel();
   }
 
-  toggleGallery($event: Event, browseGalleryButton: MatButton) {
+  toggleGallery($event: Event) {
     if ($event) {
       $event.stopPropagation();
     }
-    const trigger = browseGalleryButton._elementRef.nativeElement;
-    if (this.popoverService.hasPopover(trigger)) {
-      this.popoverService.hidePopover(trigger);
-    } else {
-      const ctx: any = {
-        pageMode: false,
-        popoverMode: true,
-        mode: 'grid',
-        selectionMode: true
-      };
-      const imageGalleryPopover = this.popoverService.displayPopover(trigger, this.renderer,
-        this.viewContainerRef, ImageGalleryComponent, 'top', true, null,
-        ctx,
-        {},
-        {}, {}, true);
-      imageGalleryPopover.tbComponentRef.instance.imageSelected.subscribe((image) => {
-        imageGalleryPopover.hide();
+    this.dialog.open<ImageGalleryDialogComponent, any,
+      ImageResourceInfo>(ImageGalleryDialogComponent, {
+      autoFocus: false,
+      disableClose: false,
+      panelClass: ['tb-dialog', 'tb-fullscreen-dialog']
+    }).afterClosed().subscribe((image) => {
+      if (image) {
         this.imageUrls.push(image.link);
         this.updateModel();
-      });
-    }
+      }
+    });
   }
 
   imageDragStart(index: number) {