Merge pull request #1863 from RedisInsight/fe/bugfix/RI-4310_Turn_off_decompression_by_checkbox

#RI-4310, #RI-4274

Author: egor-zalenski

redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.spec.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
 import { instance, mock } from 'ts-mockito'
-import { TEXT_DISABLED_COMPRESSED_VALUE } from 'uiSrc/constants'
+import { KeyValueCompressor, TEXT_DISABLED_COMPRESSED_VALUE } from 'uiSrc/constants'
 import { hashDataSelector } from 'uiSrc/slices/browser/hash'
+import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
 import { RedisResponseBufferType } from 'uiSrc/slices/interfaces'
 import { anyToBuffer, bufferToString } from 'uiSrc/utils'
 import { act, fireEvent, render, screen, waitForEuiToolTipVisible } from 'uiSrc/utils/test-utils'
@@ -31,6 +32,13 @@ jest.mock('uiSrc/slices/browser/hash', () => {
   })
 })
 
+jest.mock('uiSrc/slices/instances/instances', () => ({
+  ...jest.requireActual('uiSrc/slices/instances/instances'),
+  connectedInstanceSelector: jest.fn().mockReturnValue({
+    compressor: null,
+  }),
+}))
+
 describe('HashDetails', () => {
   it('should render', () => {
     expect(render(<HashDetails {...instance(mockedProps)} />)).toBeTruthy()
@@ -106,6 +114,11 @@ describe('HashDetails', () => {
         ]
       })
       hashDataSelector.mockImplementation(hashDataSelectorMock)
+
+      connectedInstanceSelector.mockImplementation(() => ({
+        compressor: KeyValueCompressor.GZIP,
+      }))
+
       const { queryByTestId } = render(<HashDetails {...instance(mockedProps)} />)
       const editBtn = queryByTestId(/edit-hash-button/)
 

redisinsight/ui/src/pages/browser/components/list-details/ListDetails.spec.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
 import { mock } from 'ts-mockito'
-import { TEXT_DISABLED_COMPRESSED_VALUE } from 'uiSrc/constants'
+import { KeyValueCompressor, TEXT_DISABLED_COMPRESSED_VALUE } from 'uiSrc/constants'
 import { listDataSelector } from 'uiSrc/slices/browser/list'
+import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
 import { anyToBuffer } from 'uiSrc/utils'
 import { act, fireEvent, render, screen, waitForEuiToolTipVisible } from 'uiSrc/utils/test-utils'
 import { GZIP_COMPRESSED_VALUE_1, DECOMPRESSED_VALUE_STR_1 } from 'uiSrc/utils/tests/decompressors'
@@ -35,6 +36,13 @@ jest.mock('uiSrc/slices/browser/list', () => {
   }
 })
 
+jest.mock('uiSrc/slices/instances/instances', () => ({
+  ...jest.requireActual('uiSrc/slices/instances/instances'),
+  connectedInstanceSelector: jest.fn().mockReturnValue({
+    compressor: null,
+  }),
+}))
+
 describe('ListDetails', () => {
   it('should render', () => {
     expect(render(<ListDetails {...mockedProps} />)).toBeTruthy()
@@ -102,6 +110,10 @@ describe('ListDetails', () => {
       })
       listDataSelector.mockImplementation(listDataSelectorMock)
 
+      connectedInstanceSelector.mockImplementation(() => ({
+        compressor: KeyValueCompressor.GZIP,
+      }))
+
       const { queryByTestId } = render(<ListDetails {...(mockedProps)} />)
       const editBtn = queryByTestId(/edit-list-button-/)
 

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DbCompressor.tsx

@@ -52,7 +52,7 @@ const DbCompressor = (props: Props) => {
     const isChecked = e.target.checked
     if (!isChecked) {
       // Reset db field to initial value
-      formik.setFieldValue('compressor', null)
+      formik.setFieldValue('compressor', NONE)
     }
     formik.handleChange(e)
   }

redisinsight/ui/src/utils/decompressors/decompressors.ts

@@ -1,11 +1,11 @@
-import { forIn, isUndefined } from 'lodash'
+import { forIn } from 'lodash'
 import { unzip } from 'gzip-js'
 import { decompress as decompressFzstd } from 'fzstd'
 import { decompress as decompressLz4 } from 'lz4js'
 import { decompress as decompressSnappy } from '@stablelib/snappy'
 import { COMPRESSOR_MAGIC_SYMBOLS, ICompressorMagicSymbols, KeyValueCompressor } from 'uiSrc/constants'
 import { RedisResponseBuffer, RedisString } from 'uiSrc/slices/interfaces'
-import { anyToBuffer, Nullable } from 'uiSrc/utils'
+import { anyToBuffer, isEqualBuffers, Nullable } from 'uiSrc/utils'
 
 const decompressingBuffer = (
   reply: RedisResponseBuffer,
@@ -24,7 +24,7 @@ const decompressingBuffer = (
 
         return {
           compressor,
-          isCompressed: !!compressorByValue,
+          isCompressed: compressor === compressorByValue,
           value: anyToBuffer(value),
         }
       }
@@ -33,28 +33,31 @@ const decompressingBuffer = (
 
         return {
           compressor,
-          isCompressed: !!compressorByValue,
+          isCompressed: compressor === compressorByValue,
           value: anyToBuffer(value),
         }
       }
       case KeyValueCompressor.LZ4: {
         const value = decompressLz4(Buffer.from(reply))
         return {
           compressor,
-          isCompressed: !!compressorByValue,
+          isCompressed: compressor === compressorByValue,
           value: anyToBuffer(value),
         }
       }
       case KeyValueCompressor.SNAPPY: {
-        const value = decompressSnappy(Buffer.from(reply))
+        const value = anyToBuffer(decompressSnappy(Buffer.from(reply)))
+
         return {
+          value,
           compressor,
-          isCompressed: !!compressorByValue,
-          value: anyToBuffer(value),
+          // SNAPPY compressor don't have "magic numbers"
+          // for detect is value was compressed we should compare reply and decompressed value
+          isCompressed: !isEqualBuffers(value, reply),
         }
       }
       default: {
-        return { value: reply, compressor: null, isCompressed: !!compressorByValue }
+        return { value: reply, compressor: null, isCompressed: false }
       }
     }
   } catch (error) {

redisinsight/ui/src/utils/tests/decompressors/decompressors.spec.ts

@@ -83,15 +83,15 @@ const defaultValues = [
     compressorInit: KeyValueCompressor.SNAPPY,
     output: DECOMPRESSED_VALUE_1,
     outputStr: DECOMPRESSED_VALUE_STR_1,
-    isCompressed: false,
+    isCompressed: true,
   },
   {
     input: SNAPPY_COMPRESSED_VALUE_2,
     compressor: KeyValueCompressor.SNAPPY,
     compressorInit: KeyValueCompressor.SNAPPY,
     output: DECOMPRESSED_VALUE_2,
     outputStr: DECOMPRESSED_VALUE_STR_2,
-    isCompressed: false,
+    isCompressed: true,
   },
   {
     input: GZIP_COMPRESSED_VALUE_1,
@@ -100,7 +100,7 @@ const defaultValues = [
     outputStr: DECOMPRESSED_VALUE_STR_1,
     compressorInit: KeyValueCompressor.LZ4,
     compressorByValue: KeyValueCompressor.GZIP,
-    isCompressed: true,
+    isCompressed: false,
   },
   {
     input: ZSTD_COMPRESSED_VALUE_1,
@@ -109,7 +109,7 @@ const defaultValues = [
     compressorByValue: KeyValueCompressor.ZSTD,
     output: ZSTD_COMPRESSED_VALUE_1,
     outputStr: DECOMPRESSED_VALUE_STR_1,
-    isCompressed: true,
+    isCompressed: false,
   },
 ].map((value) => ({
   ...value,