Merge pull request #2794 from RedisInsight/bugfix/feature/RI-5165-fix-ssh-passphrase-validation,RI-5166-win-logger

force update file-stream-rotator in the winston-daily-rotate-file to …

Author: vlad-dargel

redisinsight/api/package.json

@@ -42,7 +42,8 @@
     "word-wrap": "1.2.4",
     "mocha/minimatch": "^3.0.5",
     "@nestjs/platform-socket.io/socket.io": "^4.7.1",
-    "**/semver": "^7.5.2"
+    "**/semver": "^7.5.2",
+    "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
   },
   "dependencies": {
     "@nestjs/common": "^9.0.11",

redisinsight/api/yarn.lock

@@ -3919,12 +3919,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-stream-rotator@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz#007019e735b262bb6c6f0197e58e5c87cb96cec3"
-  integrity sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ==
-  dependencies:
-    moment "^2.29.1"
+file-stream-rotator@^0.6.1, file-stream-rotator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-stream-rotator/-/file-stream-rotator-1.0.0.tgz#de58379321a1ea6d2938ed5f5a2eff3b7f8b2780"
+  integrity sha512-qg5mQO7o+vhS7NPqkrkfJS8qqhz0d17Tnewmb5sUTUKwYe27LKaDtbTuRAtQWkBn6jROuFPVIDF5DtckzokFTQ==
 
 file-type@^16.5.4:
   version "16.5.4"
@@ -6201,11 +6199,6 @@ mocha@^8.4.0:
     yargs-parser "20.2.4"
     yargs-unparser "2.0.0"
 
-moment@^2.29.1:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
 [email protected]:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"

redisinsight/ui/src/utils/comparisons/diff.ts

@@ -23,7 +23,7 @@ export const getFormUpdates = (obj1: UnknownObject = {}, obj2: UnknownObject = {
     obj1,
     (result: UnknownObject, value, key) => {
       if (isObject(value)) {
-        const diff = getFormUpdates(value, obj2[key])
+        const diff = getFormUpdates(value, obj2[key] || {})
 
         if (Object.keys(diff).length) {
           result[key] = diff