Merge branch 'main' into bugfix/fe/java-ser-util-date

# Conflicts:
#	tests/e2e/tests/web/regression/browser/formatters.e2e.ts
#	yarn.lock

Author: rsergeenko

.circleci/config.yml

@@ -3,20 +3,52 @@ set -e
 
 yarn --cwd tests/e2e install
 
-# mount app resources
-./release/*.AppImage --appimage-mount >> apppath &
+# Create the ri-test directory if it doesn't exist
+mkdir -p ri-test
+
+# Extract the AppImage
+chmod +x ./release/*.AppImage
+./release/*.AppImage --appimage-extract
+
+# Move contents of squashfs-root to ri-test and remove squashfs-root folder
+mv squashfs-root/* ri-test/
+rm -rf squashfs-root
+
+# Export custom XDG_DATA_DIRS with ri-test
+export XDG_DATA_DIRS="$(pwd)/ri-test:$XDG_DATA_DIRS"
 
 # create folder before tests run to prevent permissions issue
 mkdir -p tests/e2e/remote
 mkdir -p tests/e2e/rdi
 
-# run rte
+# Create a custom .desktop file for RedisInsight
+cat > ri-test/redisinsight.desktop <<EOL
+[Desktop Entry]
+Version=1.0
+Name=RedisInsight
+Exec=$(pwd)/ri-test/redisinsight %u
+Icon=$(pwd)/ri-test/resources/app.asar/img/icon.png
+Type=Application
+Terminal=false
+MimeType=x-scheme-handler/redisinsight;
+EOL
+
+# Copy the .desktop file to the local applications directory
+cp ri-test/redisinsight.desktop "$HOME/.local/share/applications"
+
+# Update the desktop database with custom directory
+update-desktop-database "$(pwd)/ri-test/"
+
+# Register the RedisInsight deeplink protocol
+xdg-mime default redisinsight.desktop x-scheme-handler/redisinsight
+
+# Run rte
 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 && \
 
-# run tests
-COMMON_URL=$(tail -n 1 apppath)/resources/app.asar/dist/renderer/index.html \
-ELECTRON_PATH=$(tail -n 1 apppath)/redisinsight \
+# Run tests
+COMMON_URL=$(pwd)/ri-test/resources/app.asar/dist/renderer/index.html \
+ELECTRON_PATH=$(pwd)/ri-test/redisinsight \
 RI_SOCKETS_CORS=true \
 yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci

.circleci/config.yml.backup

@@ -0,0 +1,49 @@
+name: Deploy Pages
+description: 'Download the artifact and deploy to GitHub Pages'
+
+inputs:
+  group:
+    description: Group matching the artifacts
+    required: false
+    default: '*'
+
+  AWS_BUCKET_NAME_TEST:
+    required: true
+  AWS_DEFAULT_REGION:
+    required: true
+  AWS_DISTRIBUTION_ID:
+    required: true
+  AWS_ACCESS_KEY_ID:
+    required: true
+  AWS_SECRET_ACCESS_KEY:
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+
+    - name: Get current date
+      id: date
+      uses: ./.github/actions/get-current-date
+
+    - name: Download artifacts
+      uses: actions/download-artifact@v4
+      with:
+        pattern: ${{ format('{0}*', inputs.group) }}
+        path: public/${{ github.run_id }}
+
+    - name: Deploy 🚀
+      shell: bash
+      env:
+        AWS_BUCKET_NAME_TEST: ${{ inputs.AWS_BUCKET_NAME_TEST }}
+        AWS_DEFAULT_REGION: ${{ inputs.AWS_DEFAULT_REGION }}
+        AWS_DISTRIBUTION_ID: ${{ inputs.AWS_DISTRIBUTION_ID }}
+        AWS_ACCESS_KEY_ID: ${{ inputs.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ inputs.AWS_SECRET_ACCESS_KEY }}
+      run: |
+
+        SUB_PATH=test-reports/${{ steps.date.outputs.date }}
+
+        aws s3 cp public/ s3://${AWS_BUCKET_NAME_TEST}/public/${SUB_PATH} --recursive
+
+

.circleci/e2e/test.app-image.sh

@@ -0,0 +1,17 @@
+name: Get current date
+
+outputs:
+  date:
+    description: Current date
+    value: ${{ steps.date.outputs.date }}
+
+runs:
+  using: 'composite'
+  steps:
+  - name: Get current date
+    id: date
+    shell: bash
+    run: |
+      DATE=$(date +'%Y-%m-%d')
+      echo "date=$DATE" >> $GITHUB_OUTPUT
+

.github/actions/deploy-test-reports/action.yml

@@ -33,7 +33,7 @@ runs:
     - name: Setup Node
       uses: actions/[email protected]
       with:
-        node-version: '20.15'
+        node-version: '20.18.0'
         # disable cache for windows
         # https://github.com/actions/setup-node/issues/975
         cache: ${{ runner.os != 'Windows' && 'yarn' || '' }}

.github/actions/get-current-date/action.yml

@@ -0,0 +1,23 @@
+name: Remove all artifacts
+
+runs:
+  using: 'composite'
+  steps:
+  - name: Merge artifacts by pattern
+    id: merge-artifacts
+    uses: actions/upload-artifact/merge@v4
+    with:
+      name: remove-artifacts
+      pattern: '*'
+      delete-merged: true
+
+  - name: Delete merged artifact
+    uses: actions/github-script@v7
+    with:
+      script: |
+        github.rest.actions.deleteArtifact({
+          owner: context.repo.owner,
+          repo: context.repo.repo,
+          artifact_id: ${{ steps.merge-artifacts.outputs.artifact-id }}
+        });
+

.github/actions/install-all-build-libs/action.yml

@@ -0,0 +1,38 @@
+FROM node:20.14-alpine
+
+# runtime args and environment variables
+ARG DIST=Redis-Insight.tar.gz
+ARG NODE_ENV=production
+ARG RI_SEGMENT_WRITE_KEY
+ENV RI_SEGMENT_WRITE_KEY=${RI_SEGMENT_WRITE_KEY}
+ENV NODE_ENV=${NODE_ENV}
+ENV RI_SERVE_STATICS=true
+ENV RI_BUILD_TYPE='DOCKER_ON_PREMISE'
+ENV RI_APP_FOLDER_ABSOLUTE_PATH='/data'
+
+# this resolves CVE-2023-5363
+# TODO: remove this line once we update to base image that doesn't have this vulnerability
+RUN apk update && apk upgrade --no-cache libcrypto3 libssl3
+
+# set workdir
+WORKDIR /usr/src/app
+
+# copy artifacts built in previous stage to this one
+ADD $DIST /usr/src/app/redisinsight
+RUN ls -la /usr/src/app/redisinsight
+
+# folder to store local database, plugins, logs and all other files
+RUN mkdir -p /data && chown -R node:node /data
+
+# copy the docker entry point script and make it executable
+COPY --chown=node:node ./docker-entry.sh ./
+RUN chmod +x docker-entry.sh
+
+# since RI is hard-code to port 5000, expose it from the container
+EXPOSE 5000
+
+# don't run the node process as root
+USER node
+
+# serve the application 🚀
+ENTRYPOINT ["./docker-entry.sh", "node", "redisinsight/api/dist/src/main"]

.github/actions/remove-artifacts/action.yml

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+# install deps
+yarn
+yarn --cwd redisinsight/api
+
+# build
+
+yarn build:statics
+yarn build:ui
+yarn --cwd ./redisinsight/api build:prod

.github/build/build.Dockerfile

@@ -0,0 +1,94 @@
+#!/bin/bash
+set -e
+
+PLATFORM=${PLATFORM:-'linux'}
+ARCH=${ARCH:-'x64'}
+LIBC=${LIBC:-''}
+#FILENAME="Redis-Insight-$PLATFORM.$VERSION.$ARCH.zip"
+FILENAME="Redis-Insight-web-$PLATFORM"
+if [ ! -z $LIBC ]
+then
+  FILENAME="$FILENAME-$LIBC.$ARCH.tar.gz"
+  export npm_config_target_libc="$LIBC"
+else
+  FILENAME="$FILENAME.$ARCH.tar.gz"
+fi
+
+echo "Building node modules..."
+echo "Platform: $PLATFORM"
+echo "Arch: $ARCH"
+echo "Libc: $LIBC"
+echo "npm target libc: $npm_config_target_libc"
+echo "Filname: $FILENAME"
+
+rm -rf redisinsight/api/node_modules
+
+npm_config_arch="$ARCH" \
+npm_config_target_arch="$ARCH" \
+npm_config_platform="$PLATFORM" \
+npm_config_target_platform="$PLATFORM" \
+yarn --cwd ./redisinsight/api install --production
+
+cp redisinsight/api/.yarnclean.prod redisinsight/api/.yarnclean
+yarn --cwd ./redisinsight/api autoclean --force
+
+rm -rf redisinsight/build.zip
+
+cp LICENSE ./redisinsight
+
+cd redisinsight && tar -czf build.tar.gz \
+--exclude="api/node_modules/**/build/node_gyp_bins/python3" \
+api/node_modules \
+api/dist \
+ui/dist \
+LICENSE \
+&& cd ..
+
+mkdir -p release/web
+cp redisinsight/build.tar.gz release/web/"$FILENAME"
+
+# Minify build via esbuild
+echo "Start minifing workflow"
+npm_config_arch="$ARCH" \
+npm_config_target_arch="$ARCH" \
+npm_config_platform="$PLATFORM" \
+npm_config_target_platform="$PLATFORM" \
+yarn --cwd ./redisinsight/api install
+yarn --cwd ./redisinsight/api minify:prod
+
+
+PACKAGE_JSON_PATH="./redisinsight/api/package.json"
+APP_PACKAGE_JSON_PATH="./redisinsight/package.json"
+
+# Extract dependencies from the app package.json
+BINARY_PACKAGES=$(jq -r '.dependencies | keys[]' "$APP_PACKAGE_JSON_PATH" | jq -R -s -c 'split("\n")[:-1]')
+
+echo "Binary packages to exclude during minify: $BINARY_PACKAGES"
+
+# Modify the package.json
+jq --argjson keep "$BINARY_PACKAGES" \
+  'del(.devDependencies) | .dependencies |= with_entries(select(.key as $k | $keep | index($k)))' \
+  "$PACKAGE_JSON_PATH" > temp.json && mv temp.json "$PACKAGE_JSON_PATH"
+
+npm_config_arch="$ARCH" \
+npm_config_target_arch="$ARCH" \
+npm_config_platform="$PLATFORM" \
+npm_config_target_platform="$PLATFORM" \
+yarn --cwd ./redisinsight/api install --production
+yarn --cwd ./redisinsight/api autoclean --force
+
+# Compress minified build
+cd redisinsight && tar -czf build-mini.tar.gz \
+--exclude="api/node_modules/**/build/node_gyp_bins/python3" \
+api/node_modules \
+api/dist-minified \
+ui/dist \
+LICENSE \
+&& cd ..
+
+mkdir -p release/web-mini
+cp redisinsight/build-mini.tar.gz release/web-mini/"$FILENAME"
+
+# Restore the original package.json and yarn.lock
+git restore redisinsight/api/yarn.lock redisinsight/api/package.json
+