Merge pull request #958 from RedisInsight/main

new rc

Author: egor-zalenski

.circleci/config.yml

@@ -1122,10 +1122,10 @@ workflows:
           report: true
           requires:
             - Build app - Linux (stage)
-      # e2e desktop tests on exe build
-      - e2e-exe:
-          name: E2ETest (exe) - Nightly
-          parallelism: 4
-          report: true
-          requires:
-            - Build app - Windows (stage)
+      # # e2e desktop tests on exe build
+      # - e2e-exe:
+      #     name: E2ETest (exe) - Nightly
+      #     parallelism: 4
+      #     report: true
+      #     requires:
+      #       - Build app - Windows (stage)

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

@@ -6,7 +6,6 @@ import {
   EuiText,
   EuiSpacer,
 } from '@elastic/eui'
-import cx from 'classnames'
 import parse from 'html-react-parser'
 
 import { IConsent } from '../ConsentsSettings'
@@ -57,7 +56,7 @@ const ConsentOption = (props: Props) => {
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiText className={cx({ [styles.disabled]: consent?.disabled, [styles.smallText]: true })}>
+          <EuiText className={styles.smallText}>
             {parse(consent.label)}
           </EuiText>
           {!isSettingsPage && consent.description && (

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

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

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

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

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

@@ -62,7 +62,6 @@ $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,7 +98,6 @@
   --browserComponentActive: #{$browserComponentActive};
   --browserTreeNodeOpen: #{$browserTreeNodeOpen};
   --defaultGreenColor: #{$defaultGreenColor};
-  --disabledLabelColor: #{$disabledLabelColor};
 
   --iconsDefaultColor: #{$iconsDefaultColor};
   --iconsDefaultHoverColor: #{$iconsDefaultHoverColor};

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

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