Merge pull request #955 from RedisInsight/main

new RC

Author: AmirAllayarovSofteq

redisinsight/ui/src/components/consents-settings/ConsentOption/ConsentOption.tsx

@@ -6,6 +6,7 @@ import {
   EuiText,
   EuiSpacer,
 } from '@elastic/eui'
+import cx from 'classnames'
 import parse from 'html-react-parser'
 
 import { IConsent } from '../ConsentsSettings'
@@ -32,7 +33,12 @@ const ConsentOption = (props: Props) => {
     <EuiFlexItem key={consent.agreementName}>
       {isSettingsPage && consent.description && (
         <>
-          <EuiText size="s" className={styles.smallText} color="subdued" style={{ marginTop: '12px' }}>
+          <EuiText
+            size="s"
+            className={styles.smallText}
+            color="subdued"
+            style={{ marginTop: '12px' }}
+          >
             {parse(consent.description)}
           </EuiText>
           <EuiSpacer size="m" />
@@ -51,9 +57,16 @@ const ConsentOption = (props: Props) => {
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiText className={styles.label}>{parse(consent.label)}</EuiText>
+          <EuiText className={cx({ [styles.disabled]: consent?.disabled, [styles.smallText]: true })}>
+            {parse(consent.label)}
+          </EuiText>
           {!isSettingsPage && consent.description && (
-            <EuiText size="s" className={styles.smallText} color="subdued" style={{ marginTop: '12px' }}>
+            <EuiText
+              size="s"
+              className={styles.smallText}
+              color="subdued"
+              style={{ marginTop: '12px' }}
+            >
               {parse(consent.description)}
             </EuiText>
           )}

redisinsight/ui/src/components/consents-settings/styles.module.scss

@@ -96,6 +96,10 @@
   }
 }
 
+.smallText.disabled {
+  color: var(--disabledLabelColor) !important;
+}
+
 :global(.euiOverlayMask) {
   background: none !important;
 }

redisinsight/ui/src/styles/components/_switch.scss

@@ -18,11 +18,7 @@
     }
   }
   .euiSwitch__button:disabled {
-    opacity: 50%;
-
-    .euiSwitch__icon {
-      display: none;
-    }
+    opacity: 0.5;
   }
 }
 

redisinsight/ui/src/styles/themes/dark_theme/_dark_theme.lazy.scss

@@ -96,6 +96,7 @@
   --browserComponentActive: #{$browserComponentActive};
   --browserTreeNodeOpen: #{$browserTreeNodeOpen};
   --defaultGreenColor: #{$defaultGreenColor};
+  --disabledLabelColor: #{$disabledLabelColor};
 
   --iconsDefaultColor: #{$iconsDefaultColor};
   --iconsDefaultHoverColor: #{$iconsDefaultHoverColor};

redisinsight/ui/src/styles/themes/dark_theme/_theme_color.scss

@@ -62,6 +62,7 @@ $iconsDefaultHoverColor: #dfe5ef;
 $separatorColor: #3d3d3d;
 $separatorNavigationColor: #465282;
 $separatorDropdownColor: #8b90a3;
+$disabledLabelColor: #898A90;
 
 $buttonSecondaryHoverColor: #364da8;
 $buttonSecondaryTextColor: #dfe5ef;

redisinsight/ui/src/styles/themes/light_theme/_light_theme.lazy.scss

@@ -98,6 +98,7 @@
   --browserComponentActive: #{$browserComponentActive};
   --browserTreeNodeOpen: #{$browserTreeNodeOpen};
   --defaultGreenColor: #{$defaultGreenColor};
+  --disabledLabelColor: #{$disabledLabelColor};
 
   --iconsDefaultColor: #{$iconsDefaultColor};
   --iconsDefaultHoverColor: #{$iconsDefaultHoverColor};

redisinsight/ui/src/styles/themes/light_theme/_theme_color.scss

@@ -59,6 +59,7 @@ $iconsDefaultHoverColor: #173369;
 $separatorColor: #cdd7e6;
 $separatorNavigationColor: #465282;
 $separatorDropdownColor: #8b90a3;
+$disabledLabelColor: #527298;
 
 $buttonSecondaryHoverColor: #2848d7;
 $buttonSecondaryTextColor: #243dac;

tests/e2e/tests/regression/workbench/workbench-pipeline.e2e.ts

@@ -11,7 +11,7 @@ const settingsPage = new SettingsPage();
 
 const getPageUrl = ClientFunction(() => window.location.href);
 const externalPageLink = 'https://redis.io/docs/manual/pipelining/';
-const pipelineValues = ['-5', '5', '4'];
+const pipelineValues = ['-5', '5', '4', '20'];
 const commandForSend = '100 scan 0 match * count 5000';
 
 fixture `Workbench Pipeline`
@@ -45,24 +45,23 @@ test('Verify that user can enter only numbers >0 in "Commands in pipeline" input
     await t.expect(settingsPage.commandsInPipelineInput.value).eql(pipelineValues[1], 'Value is incorrect');
 });
 test('Verify that only chosen in pipeline number of commands is loading at the same time in Workbench', async t => {
-    await settingsPage.changeCommandsInPipeline(pipelineValues[2]);
+    await settingsPage.changeCommandsInPipeline(pipelineValues[1]);
     // Go to Workbench page
     await t.click(myRedisDatabasePage.workbenchButton);
     await workbenchPage.sendCommandInWorkbench(commandForSend, 0.01);
     // Verify that only selected pipeline number of commands are loaded at the same time
-    await t.expect(workbenchPage.loadedCommand.count).eql(Number(pipelineValues[2]), 'The number of sending commands is incorrect');
+    await t.expect(workbenchPage.loadedCommand.count).eql(Number(pipelineValues[1]), 'The number of sending commands is incorrect');
 });
-test('Verify that user can see spinner over Run button and grey preloader for each command', async t => {
-    let commandForSend = '300 scan 0 match * count 5000';
-    await settingsPage.changeCommandsInPipeline(pipelineValues[2]);
+test.skip('Verify that user can see spinner over Run button and grey preloader for each command', async t => {
+    await settingsPage.changeCommandsInPipeline(pipelineValues[3]);
     // Go to Workbench page
     await t.click(myRedisDatabasePage.workbenchButton);
     await workbenchPage.sendCommandInWorkbench(commandForSend, 0.01);
     // Verify that user can`t start new commands from the Workbench while command(s) is executing
     await t.expect(workbenchPage.submitCommandButton.withAttribute('disabled').exists).ok('Run button is not disabled', { timeout: 5000 });
     // Verify that user can see spinner over the disabled and shrunk Run button
     await t.expect(workbenchPage.runButtonSpinner.exists).ok('Loading spinner is not displayed for Run button', { timeout: 5000 });
-    await t.expect(workbenchPage.queryCardContainer.find(workbenchPage.cssDeleteCommandButton).withAttribute('disabled').count).eql(4, 'The number of commands is incorrect');
+    await t.expect(workbenchPage.queryCardContainer.find(workbenchPage.cssDeleteCommandButton).withAttribute('disabled').count).eql(Number(pipelineValues[3]), 'The number of commands is incorrect');
 });
 test('Verify that user can interact with the Editor while command(s) in progress', async t => {
     const valueInEditor = '100';