Merge branch 'main' into e2e/refactoring-api-tests

# Conflicts:
#	tests/e2e/tests/regression/browser/stream-key.e2e.ts
#	tests/e2e/tests/regression/workbench/context.e2e.ts

Author: vlad-dargel

.dockerignore

@@ -5,7 +5,7 @@
 
 coverage
 dll
-node_modules
+**/node_modules
 release
 
 redisinsight/dist

redisinsight/api/src/modules/bulk-actions/models/runners/simple/abstract.bulk-action.simple.runner.ts

@@ -42,11 +42,15 @@ export abstract class AbstractBulkActionSimpleRunner extends AbstractBulkActionR
    */
   async runIteration() {
     const keys = await this.getKeysToProcess();
+    this.progress.addScanned(this.bulkAction.getFilter().getCount());
+
     if (keys.length) {
       const commands = this.prepareCommands(keys) as string[][];
       const res = await this.node.pipeline(commands).exec();
       this.processIterationResults(keys, res);
     }
+
+    this.bulkAction.changeState();
   }
 
   /**
@@ -74,7 +78,6 @@ export abstract class AbstractBulkActionSimpleRunner extends AbstractBulkActionR
    * @param res
    */
   processIterationResults(keys, res: (string | number | null)[][]) {
-    this.progress.addScanned(this.bulkAction.getFilter().getCount());
     this.summary.addProcessed(res.length);
 
     const errors = [];
@@ -88,6 +91,5 @@ export abstract class AbstractBulkActionSimpleRunner extends AbstractBulkActionR
     });
 
     this.summary.addErrors(errors);
-    this.bulkAction.changeState();
   }
 }

redisinsight/api/src/modules/profiler/models/redis.observer.spec.ts

@@ -53,15 +53,14 @@ describe('RedisObserver', () => {
       expect(redisObserver['status']).toEqual(RedisObserverStatus.Connected);
       expect(redisObserver['redis']).toEqual(nodeClient);
     });
-    it('init error due to redis connection', async () => {
-      try {
-        getRedisClientFn.mockRejectedValueOnce(new Error('error'));
-        await redisObserver.init(getRedisClientFn);
-        fail();
-      } catch (e) {
+    it('init error due to redis connection', (done) => {
+      getRedisClientFn.mockRejectedValueOnce(new Error('error'));
+      redisObserver.init(getRedisClientFn);
+      redisObserver.on('connect_error', () => {
         expect(redisObserver['status']).toEqual(RedisObserverStatus.Error);
         expect(redisObserver['redis']).toEqual(undefined);
-      }
+        done();
+      });
     });
   });
 
@@ -197,28 +196,26 @@ describe('RedisObserver', () => {
       expect(redisObserver['status']).toEqual(RedisObserverStatus.Ready);
     });
 
-    it('connect fail due to NOPERM', async () => {
-      try {
-        nodeClient.send_command.mockRejectedValueOnce(NO_PERM_ERROR);
-        await redisObserver.init(getRedisClientFn);
-        fail();
-      } catch (e) {
-        expect(e).toBeInstanceOf(ForbiddenException);
+    it('connect fail due to NOPERM', (done) => {
+      nodeClient.send_command.mockRejectedValueOnce(NO_PERM_ERROR);
+      redisObserver.init(getRedisClientFn);
+      redisObserver.on('connect_error', (e) => {
         expect(redisObserver['shardsObservers']).toEqual([]);
         expect(redisObserver['status']).toEqual(RedisObserverStatus.Error);
-      }
+        expect(e).toBeInstanceOf(ForbiddenException);
+        done();
+      });
     });
 
-    it('connect fail due an error', async () => {
-      try {
-        nodeClient.send_command.mockRejectedValueOnce(new Error('some error'));
-        await redisObserver.init(getRedisClientFn);
-        fail();
-      } catch (e) {
+    it('connect fail due an error', (done) => {
+      nodeClient.send_command.mockRejectedValueOnce(new Error('some error'));
+      redisObserver.init(getRedisClientFn);
+      redisObserver.on('connect_error', (e) => {
         expect(e).toBeInstanceOf(ServiceUnavailableException);
         expect(redisObserver['shardsObservers']).toEqual([]);
         expect(redisObserver['status']).toEqual(RedisObserverStatus.Error);
-      }
+        done();
+      });
     });
 
     it('connect to cluster', async () => {

redisinsight/api/src/modules/profiler/models/redis.observer.ts

@@ -41,7 +41,9 @@ export class RedisObserver extends EventEmitter2 {
       .catch((err) => {
         this.status = RedisObserverStatus.Error;
         this.emit('connect_error', err);
-        return Promise.reject(err);
+        // todo: rethink error handling for profiler
+        // prevent unhandled rejection
+        // return Promise.reject(err);
       });
   }
 

redisinsight/ui/index.html.ejs

@@ -12,9 +12,9 @@
   <!-- Dependencies -->
   <% if (webpackConfig.mode=='production' ) { %>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react/18.2.0/umd/react.production.min.js"
-      integrity="sha256-yUhvEmYVhZ/GGshIQKArLvySDSh6cdmdcIx0spR3UP4=" crossorigin="anonymous"></script>
+      integrity="sha512-8Q6Y9XnTbOE+JNvjBQwJ2H8S+UV4uA6hiRykhdtIyDYZ2TprdNmWOUaKdGzOhyr4dCyk287OejbPvwl7lrfqrQ==" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/18.2.0/umd/react-dom.production.min.js"
-      integrity="sha256-vFt3l+illeNlwThbDUdoPTqF81M8WNSZZZt3HEjsbSU=" crossorigin="anonymous"></script>
+      integrity="sha512-MOCpqoRoisCTwJ8vQQiciZv0qcpROCidek3GTFS6KTk2+y7munJIlKCVkFCYY+p3ErYFXCjmFjnfTTRSC1OHWQ==" crossorigin="anonymous"></script>
     <% } else { %>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react/18.2.0/umd/react.development.js"
         integrity="sha512-m7nhpWHotpucPI37I4lPovL28Bm2BhAMV8poF3F8Z9oOEZ3jlxGzkgvG0EMt1mVL1xydr1erlBbmN90js/ssUw==" crossorigin="anonymous"></script>

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

@@ -17,10 +17,17 @@ interface Props {
   onChangeAgreement: (checked: boolean, name: string) => void
   checked: boolean
   isSettingsPage?: boolean
+  withoutSpacer?: boolean
 }
 
 const ConsentOption = (props: Props) => {
-  const { consent, onChangeAgreement, checked, isSettingsPage = false } = props
+  const {
+    consent,
+    onChangeAgreement,
+    checked,
+    isSettingsPage = false,
+    withoutSpacer = false
+  } = props
   return (
     <EuiFlexItem key={consent.agreementName}>
       {isSettingsPage && consent.description && (
@@ -52,7 +59,7 @@ const ConsentOption = (props: Props) => {
           )}
         </EuiFlexItem>
       </EuiFlexGroup>
-      <EuiSpacer size="l" />
+      {!withoutSpacer && (<EuiSpacer size="l" />)}
     </EuiFlexItem>
   )
 }

redisinsight/ui/src/components/consents-settings/ConsentsNotifications/ConsentsNotifications.spec.tsx

@@ -7,7 +7,7 @@ import {
   mockedStore,
   cleanup,
   clearStoreActions,
-  waitFor,
+  act,
 } from 'uiSrc/utils/test-utils'
 import { updateUserConfigSettings } from 'uiSrc/slices/user/user-settings'
 import ConsentsNotifications from './ConsentsNotifications'
@@ -83,8 +83,9 @@ describe('ConsentsNotifications', () => {
 
   describe('update settings', () => {
     it('option change should call "updateUserConfigSettingsAction"', async () => {
-      await waitFor(() => {
-        render(<ConsentsNotifications />)
+      render(<ConsentsNotifications />)
+
+      await act(() => {
         screen.getAllByTestId(/switch-option/).forEach(async (el) => {
           fireEvent.click(el)
         })

redisinsight/ui/src/components/consents-settings/ConsentsPrivacy/ConsentsPrivacy.spec.tsx

@@ -7,7 +7,7 @@ import {
   mockedStore,
   cleanup,
   clearStoreActions,
-  waitFor,
+  act,
 } from 'uiSrc/utils/test-utils'
 import { updateUserConfigSettings } from 'uiSrc/slices/user/user-settings'
 import ConsentsPrivacy from './ConsentsPrivacy'
@@ -83,8 +83,9 @@ describe('ConsentsPrivacy', () => {
 
   describe('update settings', () => {
     it('option change should call "updateUserConfigSettingsAction"', async () => {
-      await waitFor(() => {
-        render(<ConsentsPrivacy />)
+      render(<ConsentsPrivacy />)
+
+      await act(() => {
         screen.getAllByTestId(/switch-option/).forEach(async (el) => {
           fireEvent.click(el)
         })

redisinsight/ui/src/components/consents-settings/ConsentsSettings.spec.tsx

@@ -6,8 +6,6 @@ import {
   fireEvent,
   mockedStore,
   cleanup,
-  clearStoreActions,
-  act,
 } from 'uiSrc/utils/test-utils'
 import ConsentsSettings from './ConsentsSettings'
 
@@ -94,27 +92,4 @@ describe('ConsentsSettings', () => {
     })
     expect(screen.getByTestId(BTN_SUBMIT)).not.toBeDisabled()
   })
-  describe('liveEditMode', () => {
-    it('btn submit should not render', () => {
-      const { queryByTestId } = render(<ConsentsSettings liveEditMode />)
-      expect(queryByTestId(BTN_SUBMIT)).not.toBeInTheDocument()
-    })
-
-    it('option change should call "updateUserConfigSettingsAction"', async () => {
-      const { queryByTestId } = render(<ConsentsSettings liveEditMode />)
-
-      await act(() => {
-        screen.getAllByTestId(/switch-option/).forEach(async (el) => {
-          fireEvent.click(el)
-        })
-      })
-
-      const expectedActions = [{}].fill(updateUserConfigSettings(), 0)
-      expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual(
-        clearStoreActions(expectedActions)
-      )
-
-      expect(queryByTestId(BTN_SUBMIT)).not.toBeInTheDocument()
-    })
-  })
 })

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

@@ -21,6 +21,7 @@ import cx from 'classnames'
 
 import { compareConsents } from 'uiSrc/utils'
 import { updateUserConfigSettingsAction, userSettingsSelector } from 'uiSrc/slices/user/user-settings'
+import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import ConsentOption from './ConsentOption'
 
 import styles from './styles.module.scss'
@@ -152,14 +153,14 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
   const checkIsRecommended = () => {
     let recommended = true
     forEach(privacyConsents, (consent) => {
-      if (!formik.values[consent.agreementName]) {
+      if (!formik.values[consent?.agreementName]) {
         recommended = false
         return false
       }
     })
 
     forEach(notificationConsents, (consent) => {
-      if (!formik.values[consent.agreementName]) {
+      if (!formik.values[consent?.agreementName]) {
         recommended = false
         return false
       }
@@ -176,6 +177,14 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
     if (submitIsDisabled()) {
       return
     }
+    // have only one switcher in notificationConsents
+    if (notificationConsents.length) {
+      sendEventTelemetry({
+        event: values[notificationConsents[0]?.agreementName]
+          ? TelemetryEvent.SETTINGS_NOTIFICATION_MESSAGES_ENABLED
+          : TelemetryEvent.SETTINGS_NOTIFICATION_MESSAGES_DISABLED,
+      })
+    }
     dispatch(updateUserConfigSettingsAction({ agreements: values }, onSubmitted))
   }
 
@@ -222,7 +231,7 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
               <h1 className={styles.title}>Privacy Settings</h1>
             </EuiTitle>
             <EuiSpacer size="m" />
-            <EuiText size="s" color="subdued">
+            <EuiText className={styles.smallText} size="s" color="subdued">
               To optimize your experience, RedisInsight uses third-party tools.
               All data collected is anonymized and will not be used for any purpose without your consent.
             </EuiText>
@@ -261,7 +270,7 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
             ))
         }
       </div>
-      {!!requiredConsents.length && (
+      {requiredConsents.length ? (
         <>
           <EuiHorizontalRule margin="l" className={styles.requiredHR} />
           <EuiSpacer size="m" />
@@ -277,18 +286,22 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
           </EuiText>
           <EuiSpacer size="m" />
         </>
+      ) : (
+        <EuiSpacer size="l" />
       )}
 
-      {requiredConsents.map((consent: IConsent) => (
-        <ConsentOption
-          consent={consent}
-          checked={formik.values[consent.agreementName] ?? false}
-          onChangeAgreement={onChangeAgreement}
-          key={consent.agreementName}
-        />
-      ))}
-      {!requiredConsents.length && (<EuiSpacer size="l" />)}
-      <EuiFlexGroup justifyContent="flexEnd" responsive={false}>
+      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" responsive={false}>
+        <EuiFlexItem grow={false}>
+          {requiredConsents.map((consent: IConsent) => (
+            <ConsentOption
+              consent={consent}
+              checked={formik.values[consent.agreementName] ?? false}
+              onChangeAgreement={onChangeAgreement}
+              withoutSpacer
+              key={consent.agreementName}
+            />
+          ))}
+        </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiToolTip
             position="top"