Merge pull request #193 from RedisInsight/main

main to release

Author: vlad-dargel

.circleci/config.yml

@@ -36,7 +36,7 @@ aliases:
       not: *manual-build-conditions
 
 orbs:
-  node: circleci/node@5.2.0
+  node: circleci/node@5.3.0
   win: circleci/windows@5.0.0
   aws: circleci/aws-cli@4.1.3
 
@@ -48,8 +48,6 @@ executors:
     machine:
       image: ubuntu-2004:2023.04.2
       docker_layer_caching: true
-    environment:
-      DISPLAY: ":99"
   docker-node:
     docker:
       - image: cimg/node:20.15
@@ -91,7 +89,7 @@ jobs:
           paths:
             - ~/.cache/yarn
 
-  e2e-app-image:
+  e2e-linux:
     executor: linux-executor-dlc
     parameters:
       report:
@@ -116,10 +114,22 @@ jobs:
           command: |
             sudo apt-get install -y xvfb
             Xvfb :99 -screen 0 1920x1080x24 &
+      - run:
+          name: Install dependencies
+          command: cd tests/e2e && yarn install
+      - run:
+          name: Compile TypeScript
+          command: cd tests/e2e && yarn compile
+      - run:
+          name: Verify Compiled Files
+          command: ls -R tests/e2e/dist/tests/
       - run:
           name: Run e2e tests
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
+            cd tests/e2e/dist
+            export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.js" | circleci tests split --split-by=timings)
+            echo "Running tests: $TEST_FILES"
+            cd ../../..
             .circleci/e2e/test.app.sh
       - when:
           condition:
@@ -346,6 +356,9 @@ jobs:
     executor: linux-executor
     steps:
       - checkout
+      - node/install:
+          install-yarn: true
+          node-version: '20.15'
       - restore_cache:
           <<: *uiDepsCacheKey
       - run:
@@ -399,7 +412,7 @@ workflows:
           requires:
             - Start E2E Tests
 
-      - e2e-app-image:
+      - e2e-linux:
           name: E2ETest (linux)
           parallelism: 2
           requires:
@@ -508,7 +521,7 @@ workflows:
           name: Build extension - Windows (stage)
           <<: *stageFilter
       # e2e tests on linux build
-      - e2e-app-image:
+      - e2e-linux:
           name: E2ETest (linux)
           parallelism: 2
           requires:
@@ -546,7 +559,7 @@ workflows:
           <<: *prodFilter
 
       # e2e tests on linux build
-      - e2e-app-image:
+      - e2e-linux:
           name: E2ETest (Linux)
           parallelism: 2
           requires:

.circleci/e2e/test.app.sh

@@ -1,16 +1,14 @@
 #!/bin/bash
 set -e
 
-yarn --cwd tests/e2e install
-
-# create folder before tests run to prevent permissions issue
+# Create folder before tests run to prevent permissions issues
 mkdir -p tests/e2e/remote
 
-# run rte
+# Run RTE (Redis Test Environment)
 docker-compose -f tests/e2e/rte.docker-compose.yml build
 docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
-./tests/e2e/wait-for-redis.sh localhost 12000 && \
+./tests/e2e/wait-for-redis.sh localhost 12000
 
-# run tests
+# Run tests
 RI_SOCKETS_CORS=true \
 yarn --cwd tests/e2e dotenv -e .ci.env yarn --cwd tests/e2e test:ci

.eslintignore

@@ -34,7 +34,6 @@ node_modules
 .DS_Store
 
 # App packaged
-storybook-static
 dist
 backend_dist
 scripts
@@ -52,7 +51,6 @@ package.json
 *.scss.d.ts
 yarn.lock
 pnpm-lock.yaml
-!.storybook
 
 # E2E tests
-tests
+tests

.eslintrc.js

@@ -6,10 +6,12 @@ module.exports = {
     browser: true,
   },
   extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+    'airbnb-base',
     'airbnb-typescript',
-    'airbnb/hooks',
     'plugin:sonarjs/recommended',
-    'plugin:storybook/recommended',
     // TODO: in a separate pull request enable and fix all classes sorting issues for tailwind
     // 'plugin:tailwindcss/recommended',
   ],
@@ -47,21 +49,6 @@ module.exports = {
         code: 140,
       },
     ],
-    'jsx-a11y/label-has-associated-control': [
-      2,
-      {
-        labelComponents: [
-          'FormLabel',
-        ],
-        labelAttributes: [
-          'label',
-        ],
-        controlComponents: [
-          'input',
-        ],
-        depth: 1,
-      },
-    ],
     'class-methods-use-this': 'off',
     // https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#consistent-components-exports
     'react-refresh/only-export-components': ['warn'],
@@ -94,6 +81,13 @@ module.exports = {
     'object-curly-newline': 'off',
     'no-nested-ternary': 'off',
     'no-param-reassign': ['error', { props: false }],
+    'default-param-last': 'off',
+    '@typescript-eslint/default-param-last': 'off',
+    'no-unsafe-optional-chaining': 'off',
+    'function-paren-newline': 'off',
+    'prefer-regex-literals': 'off',
+    'react/display-name': 'off',
+    'no-promise-executor-return': 'off',
     'sonarjs/no-duplicate-string': 'off',
     'sonarjs/cognitive-complexity': [1, 20],
     'sonarjs/no-identical-functions': [0, 5],

.gitignore

@@ -19,7 +19,6 @@ lerna-debug.log*
 coverage
 /.nyc_output
 **/coverage
-storybook-static
 
 # IDEs and editors
 /.idea