Merge pull request #4059 from RedisInsight/fe/feature/PR-4025

check PR 4025

Author: mariasergeenko

redisinsight/ui/src/utils/formatters/valueFormatters.tsx

@@ -96,7 +96,7 @@ const formattingBuffer = (
     }
     case KeyValueFormat.PHP: {
       try {
-        const decoded = unserialize(Buffer.from(reply.data), {}, { strict: false, encoding: 'binary' })
+        const decoded = unserialize(bufferToUTF8(reply), {}, { strict: false, encoding: 'utf8' })
         const value = JSONBigInt.stringify(decoded)
         return JSONViewer({ value, ...props })
       } catch (e) {
@@ -216,7 +216,7 @@ const bufferToSerializedFormat = (
     }
     case KeyValueFormat.PHP: {
       try {
-        const decoded = unserialize(Buffer.from(value.data), {}, { strict: false, encoding: 'binary' })
+        const decoded = unserialize(bufferToUTF8(value), {}, { strict: false, encoding: 'utf8' })
         const stringified = JSON.stringify(decoded)
         return reSerializeJSON(stringified, space)
       } catch (e) {

redisinsight/ui/src/utils/tests/formatters/valueFormatters.spec.ts

@@ -94,7 +94,7 @@ describe('bufferToSerializedFormat', () => {
 
   describe(KeyValueFormat.PHP, () => {
     describe('should properly serialize', () => {
-      const testValues = [[1], '""', 6677, true, { a: { b: [1, 2, '3'] } }].map((v) => ({
+      const testValues = [[1], '""', '反序列化', 6677, true, { a: { b: [1, 2, '3'] } }].map((v) => ({
         input: stringToBuffer(serialize(v)),
         expected: JSON.stringify(v)
       }))
@@ -156,7 +156,7 @@ describe('stringToSerializedBufferFormat', () => {
 
   describe(KeyValueFormat.PHP, () => {
     describe('should properly unserialize', () => {
-      const testValues = [[1], '""', 6677, true, { a: { b: [1, 2, '3'] } }].map((v) => ({
+      const testValues = [[1], '""', '反序列化', 6677, true, { a: { b: [1, 2, '3'] } }].map((v) => ({
         input: JSON.stringify(v),
         expected: stringToBuffer(serialize(v))
       }))

tests/e2e/tests/web/regression/browser/formatters.e2e.ts

@@ -0,0 +1,53 @@
+import { rte } from '../../../../helpers/constants';
+import { populateHashWithFields } from '../../../../helpers/keys';
+import { Common, DatabaseHelper } from '../../../../helpers';
+import { BrowserPage } from '../../../../pageObjects';
+import {
+    commonUrl,
+    ossStandaloneV8Config
+} from '../../../../helpers/conf';
+import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
+import { APIKeyRequests } from '../../../../helpers/api/api-keys';
+const apiKeyRequests = new APIKeyRequests();
+
+
+const browserPage = new BrowserPage();
+const databaseHelper = new DatabaseHelper();
+const databaseAPIRequests = new DatabaseAPIRequests();
+
+const keyName = `TestHashKey-${ Common.generateWord(10) }`;
+const keyToAddParameters = { fieldsCount: 1, keyName, fieldStartWith: 'hashField', fieldValueStartWith: 'hashValue' };
+
+fixture `Formatters`
+    .meta({
+        type: 'regression',
+        rte: rte.standalone
+    })
+    .page(commonUrl)
+    .beforeEach(async() => {
+        await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
+
+        await populateHashWithFields(ossStandaloneV8Config.host, ossStandaloneV8Config.port, keyToAddParameters);
+    })
+    .afterEach(async() => {
+        // Clear keys and database
+        await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV8Config.databaseName);
+        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
+    });
+
+test.before(async t => {
+    await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
+
+})('Verify that UTF8 in PHP serialized', async t => {
+    const phpValueChinese = '测试';
+    const phpValueCRussian = 'Привет мир!';
+    const setValue =`SET ${keyName} "a:3:{s:4:\\"name\\";s:6:\\"${phpValueChinese}\\";s:3:\\"age\\";i:30;s:7:\\"message\\";s:20:\\"${phpValueCRussian}\\";}"\n`;
+
+    await browserPage.Cli.sendCommandInCli(setValue);
+    await t.click(browserPage.refreshKeysButton);
+
+    await browserPage.openKeyDetailsByKeyName(keyName);
+    await browserPage.selectFormatter('PHP serialized');
+    await t.expect(await browserPage.getStringKeyValue()).contains(phpValueChinese, 'data is not serialized in php');
+    await t.expect(await browserPage.getStringKeyValue()).contains(phpValueCRussian, 'data is not serialized in php');
+});