Merge branch 'main' into fe/bugfix/RI-3725_Redisearch_light_module_not_loaded

Author: egor-zalenski

redisinsight/api/test/api/database-analysis/POST-instance-id-analysis.test.ts

@@ -1,4 +1,4 @@
-import { expect, describe, deps, before, getMainCheckFn } from '../deps';
+import { expect, describe, deps, before, getMainCheckFn, requirements } from '../deps';
 import { analysisSchema } from './constants';
 const { localDb, request, server, constants, rte } = deps;
 
@@ -12,6 +12,9 @@ const mainCheckFn = getMainCheckFn(endpoint);
 let repository;
 
 describe('POST /instance/:instanceId/analysis', () => {
+  // todo: skip for RE for now since scan 0 count 10000 might return cursor and 0 keys multiple times
+  requirements('!rte.re');
+
   before(async() => {
       repository = await localDb.getRepository(localDb.repositories.DATABASE_ANALYSIS);
 

redisinsight/api/test/api/keys/POST-instance-id-keys.test.ts

@@ -331,7 +331,7 @@ describe('POST /instance/:instanceId/keys', () => {
         },
         {
           name: 'Should search by with ? in the end (without keys info)',
-          query: {
+          data: {
             cursor: '0',
             match: `${constants.TEST_RUN_ID}_str_key_10?`,
             keysInfo: 'false',
@@ -922,7 +922,7 @@ describe('POST /instance/:instanceId/keys', () => {
         [
           {
             name: 'Should filter by type (string)',
-            query: {
+            data: {
               cursor: '0',
               type: 'string',
               count: 200,

redisinsight/api/test/api/ws/bulk-actions/bulk-actions-create.test.ts

@@ -37,7 +37,7 @@ describe('bulk-actions', function () {
     it('should not crash on 100 the same concurrent bulk-actions create events', async () => {
       let errors = 0;
       let created = 0;
-      await Promise.all((new Array(100).fill(1)).map(() => new Promise((res, rej) => {
+      await Promise.all((new Array(10).fill(1)).map(() => new Promise((res, rej) => {
         client.emit('create', createDto, (ack, err) => {
           if (ack.status === 'error') {
             errors += 1;
@@ -60,7 +60,7 @@ describe('bulk-actions', function () {
         client.on('exception', rej);
       })));
 
-      expect(errors).to.eq(99);
+      expect(errors).to.eq(9);
       expect(created).to.eq(1);
     });
   });

redisinsight/api/test/api/ws/monitor/monitor.test.ts

@@ -22,7 +22,7 @@ describe('monitor', function () {
   describe('Connection edge cases', () => {
     it('should not crash on 100 concurrent monitor connections to the same db', async () => {
       const client = await getMonitorClient(constants.TEST_INSTANCE_ID);
-      await Promise.all((new Array(100).fill(1)).map(() => new Promise((res, rej) => {
+      await Promise.all((new Array(10).fill(1)).map(() => new Promise((res, rej) => {
         client.emit('monitor', { logFileId: constants.getRandomString() }, (ack) => {
           expect(ack).to.eql({ status: 'ok' });
           res(ack);

redisinsight/api/test/api/ws/pub-sub/pub-sub.test.ts

@@ -45,7 +45,7 @@ describe('pub-sub', function () {
 
   describe('Connection edge cases', () => {
     it('should not crash on 100 concurrent pub-sub connections to the same db', async () => {
-      await Promise.all((new Array(100).fill(1)).map(() => new Promise((res, rej) => {
+      await Promise.all((new Array(10).fill(1)).map(() => new Promise((res, rej) => {
         client.emit('subscribe', { subscriptions: [pSubscription, subscription] }, (ack) => {
           expect(ack).to.eql({ status: 'ok' });
           res(ack);

redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx

@@ -75,8 +75,10 @@ const KeyList = forwardRef((props: Props, ref) => {
   const { keyList: { scrollTopPosition } } = useSelector(appContextBrowser)
 
   const [, rerender] = useState({})
+  const [firstDataLoaded, setFirstDataLoaded] = useState(!!keysState.keys.length)
 
   const itemsRef = useRef(keysState.keys)
+  const isNotRendered = useRef(true)
   const renderedRowsIndexesRef = useRef({ startIndex: 0, lastIndex: 0 })
 
   const dispatch = useDispatch()
@@ -99,6 +101,12 @@ const KeyList = forwardRef((props: Props, ref) => {
 
   useEffect(() => {
     itemsRef.current = [...keysState.keys]
+
+    if (!isNotRendered.current && !loading) {
+      setFirstDataLoaded(true)
+    }
+
+    isNotRendered.current = false
     if (itemsRef.current.length === 0) {
       rerender({})
       return
@@ -135,6 +143,9 @@ const KeyList = forwardRef((props: Props, ref) => {
   }
 
   const getNoItemsMessage = () => {
+    if (isNotRendered.current) {
+      return ''
+    }
     if (total === 0) {
       return NoKeysToDisplayText(Pages.workbench(instanceId), onNoKeysLinkClick)
     }
@@ -371,7 +382,7 @@ const KeyList = forwardRef((props: Props, ref) => {
               columns={columns}
               loadMoreItems={onLoadMoreItems}
               onWheel={onWheelSearched}
-              loading={loading}
+              loading={loading || !firstDataLoaded}
               items={itemsRef.current}
               totalItemsCount={keysState.total ? keysState.total : Infinity}
               scanned={isSearched || isFiltered ? keysState.scanned : 0}