Merge branch 'master' into develop/3.6.4

dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java

@@ -222,7 +222,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
         } else {
             var requiredNotificationTypes = List.of(NotificationType.EDGE_CONNECTION, NotificationType.EDGE_COMMUNICATION_FAILURE);
             var existingNotificationTypes = notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(
-                            tenantId, requiredNotificationTypes, new PageLink(1))
+                            tenantId, requiredNotificationTypes, new PageLink(2))
                     .getData()
                     .stream()
                     .map(NotificationTemplate::getNotificationType)

ui-ngx/package.json

@@ -14,17 +14,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.2.9",
+    "@angular/animations": "^15.2.10",
     "@angular/cdk": "^15.2.9",
-    "@angular/common": "^15.2.9",
-    "@angular/compiler": "^15.2.9",
-    "@angular/core": "^15.2.9",
+    "@angular/common": "^15.2.10",
+    "@angular/compiler": "^15.2.10",
+    "@angular/core": "^15.2.10",
     "@angular/flex-layout": "^15.0.0-beta.42",
-    "@angular/forms": "^15.2.9",
+    "@angular/forms": "^15.2.10",
     "@angular/material": "^15.2.9",
-    "@angular/platform-browser": "^15.2.9",
-    "@angular/platform-browser-dynamic": "^15.2.9",
-    "@angular/router": "^15.2.9",
+    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/router": "^15.2.10",
     "@auth0/angular-jwt": "^5.1.2",
     "@date-io/core": "1.3.7",
     "@date-io/date-fns": "1.3.7",
@@ -62,7 +62,7 @@
     "html2canvas": "^1.4.1",
     "jquery": "^3.6.3",
     "jquery.terminal": "^2.35.3",
-    "js-beautify": "^1.14.7",
+    "js-beautify": "1.14.7",
     "json-schema-defaults": "^0.4.0",
     "jstree": "^3.3.15",
     "jstree-bootstrap-theme": "^1.0.1",
@@ -112,16 +112,16 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~15.0.0",
-    "@angular-devkit/build-angular": "^15.2.8",
+    "@angular-devkit/build-angular": "^15.2.10",
     "@angular-eslint/builder": "15.2.1",
     "@angular-eslint/eslint-plugin": "15.2.1",
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^15.2.8",
-    "@angular/compiler-cli": "^15.2.9",
-    "@angular/language-service": "^15.2.9",
-    "@ngtools/webpack": "15.2.1",
+    "@angular/cli": "^15.2.10",
+    "@angular/compiler-cli": "^15.2.10",
+    "@angular/language-service": "^15.2.10",
+    "@ngtools/webpack": "15.2.10",
     "@types/ace-diff": "^2.1.1",
     "@types/canvas-gauges": "^2.1.4",
     "@types/flot": "^0.0.32",
@@ -130,7 +130,7 @@
     "@types/jasminewd2": "^2.0.10",
     "@types/jquery": "^3.5.16",
     "@types/js-beautify": "^1.13.3",
-    "@types/leaflet": "^1.8.0",
+    "@types/leaflet": "~1.8.0",
     "@types/leaflet-polylinedecorator": "^1.6.1",
     "@types/leaflet-providers": "^1.2.1",
     "@types/leaflet.gridlayer.googlemutant": "^0.4.6",
@@ -166,11 +166,14 @@
     "raw-loader": "^4.0.2",
     "ts-node": "^10.9.1",
     "typescript": "~4.9.5",
-    "webpack": "^5.77.0"
+    "webpack": "5.77.0"
   },
   "resolutions": {
     "@types/react": "17.0.37",
     "ace-builds": "1.4.13",
-    "@date-io/core": "1.3.7"
+    "@date-io/core": "1.3.7",
+    "rc-virtual-list": "3.4.13",
+    "read-package-json": "6.0.0",
+    "cacache": "17.0.4"
   }
 }