Merge pull request #1211 from RedisInsight/main

RC-2

Author: AlenaSY

redisinsight/ui/src/components/bottom-group-components/components/bottom-group-minimized/BottomGroupMinimized.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react'
 import cx from 'classnames'
-import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui'
+import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiHideFor, EuiShowFor } from '@elastic/eui'
 import { useDispatch, useSelector } from 'react-redux'
 import { useParams } from 'react-router-dom'
 import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
@@ -135,7 +135,12 @@ const BottomGroupMinimized = () => {
       >
         <>
           <EuiIcon type={SurveyIcon} className={styles.surveyIcon} />
-          <span>We need your opinion. Please take our survey.</span>
+          <EuiHideFor sizes={['xs', 's']}>
+            <span>We need your opinion. Please take our survey.</span>
+          </EuiHideFor>
+          <EuiShowFor sizes={['xs', 's']}>
+            <span>Survey</span>
+          </EuiShowFor>
         </>
       </a>
     </div>

redisinsight/ui/src/components/query-card/styles.module.scss

@@ -3,6 +3,7 @@
 @import '@elastic/eui/src/global_styling/index';
 
 .containerWrapper {
+  min-width: 420px;
   &:nth-of-type(even) {
     background-color: var(--euiColorEmptyShade) !important;
   }

redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx

@@ -105,7 +105,7 @@ const WBView = (props: Props) => {
                   scrollable={false}
                   className={styles.queryPanel}
                   initialSize={vertical[verticalPanelIds.firstPanelId] ?? 20}
-                  style={{ minHeight: '140px' }}
+                  style={{ minHeight: '140px', overflow: 'hidden' }}
                 >
                   <QueryWrapper
                     query={script}

tests/e2e/tests/critical-path/browser/filtering.e2e.ts

@@ -87,21 +87,21 @@ test
         await t.expect(browserPage.keysSummary.textContent).contains('Total', 'The filter is removed');
     });
 test
-.after(async() => {
+    .after(async() => {
     //Clear and delete database
-    await browserPage.deleteKeyByName(keyName);
-    await deleteStandaloneDatabaseApi(ossStandaloneConfig);
-})('Verify that user can see filtering per key name starts when he press Enter or clicks the control to filter per key name', async t => { //Check filtering labes
-    keyName = chance.word({ length: 10 });
-    //Add new key
-    await browserPage.addStringKey(keyName);
-    //Check the filtering starts by press Enter
-    await t.typeText(browserPage.filterByPatterSearchInput, 'InvalidText');
-    await t.pressKey('enter');
-    await t.expect(browserPage.searchAdvices.visible).ok('The filtering is set');
-    //Check the filtering starts by clicks the control
-    await common.reloadPage();
-    await t.typeText(browserPage.filterByPatterSearchInput, 'InvalidText');
-    await t.click(browserPage.searchButton);
-    await t.expect(browserPage.searchAdvices.visible).ok('The filtering is set');
-});
+        await browserPage.deleteKeyByName(keyName);
+        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
+    })('Verify that user can see filtering per key name starts when he press Enter or clicks the control to filter per key name', async t => { //Check filtering labes
+        keyName = chance.word({ length: 10 });
+        //Add new key
+        await browserPage.addStringKey(keyName);
+        //Check the filtering starts by press Enter
+        await t.typeText(browserPage.filterByPatterSearchInput, 'InvalidText');
+        await t.pressKey('enter');
+        await t.expect(browserPage.searchAdvices.visible).ok('The filtering is set');
+        //Check the filtering starts by clicks the control
+        await common.reloadPage();
+        await t.typeText(browserPage.filterByPatterSearchInput, 'InvalidText');
+        await t.click(browserPage.searchButton);
+        await t.expect(browserPage.searchAdvices.visible).ok('The filtering is set');
+    });

tests/e2e/tests/regression/browser/survey-link.e2e.ts

@@ -1,12 +1,11 @@
 import { acceptLicenseTermsAndAddDatabaseApi } from '../../../helpers/database';
 import { env, rte } from '../../../helpers/constants';
-import { BrowserPage, SlowLogPage, MyRedisDatabasePage } from '../../../pageObjects';
+import { BrowserPage, MyRedisDatabasePage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { Common } from '../../../helpers/common';
 import { deleteAllDatabasesApi } from '../../../helpers/api/api-database';
 
 const browserPage = new BrowserPage();
-const slowLogPage = new SlowLogPage();
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const common = new Common();
 const externalPageLink = 'https://www.surveymonkey.com/r/redisinsight';
@@ -32,7 +31,7 @@ test('Verify that user can use survey link', async t => {
     await t.click(myRedisDatabasePage.workbenchButton);
     await t.expect(browserPage.userSurveyLink.visible).ok('Survey Link is not displayed');
     // Slow Log page
-    await t.click(slowLogPage.slowLogPageButton);
+    await t.click(myRedisDatabasePage.analysisPageButton);
     await t.expect(browserPage.userSurveyLink.visible).ok('Survey Link is not displayed');
     // PubSub page
     await t.click(myRedisDatabasePage.pubSubButton);