feat(widget-sessions): improve session filtering logic

- Refactored session filtering logic to handle nested filters properly.
- Enhanced `fetchSessions` to ensure null checks and avoid errors.
- Updated `loadData` to handle `USER_PATH` and `HEATMAP` metric types.
- Improved UI consistency by adjusting spacing and formatting.
- Replaced redundant code with cleaner, more maintainable patterns.

This change improves the reliability and readability of the session
filtering and loading logic in the WidgetSessions component.

.github/workflows/patch-build-old.yaml

@@ -8,11 +8,7 @@ on:
         required: true
         default: 'chalice,frontend'
       tag:
-        description: 'Tag to update.'
-        required: true
-        type: string
-      branch:
-        description: 'Branch to build patches from. Make sure the branch is uptodate with tag. Else itll cause missing commits.'
+        description: 'Tag to build patches from.'
         required: true
         type: string
 
@@ -77,7 +73,7 @@ jobs:
     - name: Get HEAD Commit ID
       run: echo "HEAD_COMMIT_ID=$(git rev-parse HEAD)" >> $GITHUB_ENV
     - name: Define Branch Name
-      run: echo "BRANCH_NAME=${{inputs.branch}}" >> $GITHUB_ENV
+      run: echo "BRANCH_NAME=patch/main/${HEAD_COMMIT_ID}" >> $GITHUB_ENV
 
     - name: Build
       id: build-image

.github/workflows/patch-build.yaml

@@ -2,6 +2,7 @@
 
 on:
   workflow_dispatch:
+    description: 'This workflow will build for patches for latest tag, and will Always use commit from main branch.'
     inputs:
       services:
         description: 'Comma separated names of services to build(in small letters).'
@@ -19,20 +20,12 @@ jobs:
       DEPOT_PROJECT_ID: ${{ secrets.DEPOT_PROJECT_ID }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
       with:
-        fetch-depth: 0
-        token: ${{ secrets.GITHUB_TOKEN }}
+        fetch-depth: 1
     - name: Rebase with main branch, to make sure the code has latest main changes
-      if: github.ref != 'refs/heads/main'
       run: |
-        git remote -v
-        git config --global user.email "action@github.com"
-        git config --global user.name "GitHub Action"
-        git config --global rebase.autoStash true
-        git fetch origin main:main
-        git rebase main
-        git log -3
+        git pull --rebase origin main
 
     - name: Downloading yq
       run: |
@@ -55,8 +48,6 @@ jobs:
         aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${{ secrets.RELEASE_OSS_REGISTRY }}
 
     - uses: depot/setup-action@v1
-      env:
-        DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
     - name: Get HEAD Commit ID
       run: echo "HEAD_COMMIT_ID=$(git rev-parse HEAD)" >> $GITHUB_ENV
     - name: Define Branch Name
@@ -74,168 +65,78 @@ jobs:
         MSAAS_REPO_CLONE_TOKEN: ${{ secrets.MSAAS_REPO_CLONE_TOKEN }}
         MSAAS_REPO_URL: ${{ secrets.MSAAS_REPO_URL }}
         MSAAS_REPO_FOLDER: /tmp/msaas
-        SERVICES_INPUT: ${{ github.event.inputs.services }}
       run: |
-        #!/bin/bash
-        set -euo pipefail
-
-        # Configuration
-        readonly WORKING_DIR=$(pwd)
-        readonly BUILD_SCRIPT_NAME="build.sh"
-        readonly BACKEND_SERVICES_FILE="/tmp/backend.txt"
-
-        # Initialize git configuration
-        setup_git() {
-            git config --local user.email "action@github.com"
-            git config --local user.name "GitHub Action"
-            git checkout -b "$BRANCH_NAME"
+        set -exo pipefail
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        git checkout -b $BRANCH_NAME
+        working_dir=$(pwd)
+        function image_version(){
+          local service=$1
+          chart_path="$working_dir/scripts/helmcharts/openreplay/charts/$service/Chart.yaml"
+          current_version=$(yq eval '.AppVersion' $chart_path)
+          new_version=$(echo $current_version | awk -F. '{$NF += 1 ; print $1"."$2"."$3}')
+          echo $new_version
+          # yq eval ".AppVersion = \"$new_version\"" -i $chart_path
         }
-
-        # Get and increment image version
-        image_version() {
-            local service=$1
-            local chart_path="$WORKING_DIR/scripts/helmcharts/openreplay/charts/$service/Chart.yaml"
-            local current_version new_version
-
-            current_version=$(yq eval '.AppVersion' "$chart_path")
-            new_version=$(echo "$current_version" | awk -F. '{$NF += 1; print $1"."$2"."$3}')
-            echo "$new_version"
+        function clone_msaas() {
+          [ -d $MSAAS_REPO_FOLDER ] || {
+          git clone -b dev --recursive https://x-access-token:$MSAAS_REPO_CLONE_TOKEN@$MSAAS_REPO_URL $MSAAS_REPO_FOLDER
+          cd $MSAAS_REPO_FOLDER
+          cd openreplay && git fetch origin && git checkout main # This have to be changed to specific tag
+          git log -1
+          cd $MSAAS_REPO_FOLDER
+          bash git-init.sh
+          git checkout
+          }
         }
-
-        # Clone MSAAS repository if not exists
-        clone_msaas() {
-            if [[ ! -d "$MSAAS_REPO_FOLDER" ]]; then
-                git clone -b dev --recursive "https://x-access-token:${MSAAS_REPO_CLONE_TOKEN}@${MSAAS_REPO_URL}" "$MSAAS_REPO_FOLDER"
-                cd "$MSAAS_REPO_FOLDER"
-                cd openreplay && git fetch origin && git checkout main
-                git log -1
-                cd "$MSAAS_REPO_FOLDER"
-                bash git-init.sh
-                git checkout
-            fi
+        function build_managed() {
+          local service=$1
+          local version=$2
+          echo building managed
+          clone_msaas
+          if [[ $service == 'chalice' ]]; then
+            cd $MSAAS_REPO_FOLDER/openreplay/api
+          else
+            cd $MSAAS_REPO_FOLDER/openreplay/$service
+          fi
+          IMAGE_TAG=$version DOCKER_RUNTIME="depot" DOCKER_BUILD_ARGS="--push" ARCH=arm64 DOCKER_REPO=$DOCKER_REPO_ARM PUSH_IMAGE=0 bash build.sh >> /tmp/arm.txt
         }
-
-        # Build managed services
-        build_managed() {
-            local service=$1
-            local version=$2
-
-            echo "Building managed service: $service"
-            clone_msaas
-
-            if [[ $service == 'chalice' ]]; then
-                cd "$MSAAS_REPO_FOLDER/openreplay/api"
-            else
-                cd "$MSAAS_REPO_FOLDER/openreplay/$service"
-            fi
-
-            local build_cmd="IMAGE_TAG=$version DOCKER_RUNTIME=depot DOCKER_BUILD_ARGS=--push ARCH=arm64 DOCKER_REPO=$DOCKER_REPO_ARM PUSH_IMAGE=0 bash build.sh"
-
-            echo "Executing: $build_cmd"
-            if ! eval "$build_cmd" 2>&1; then
-                echo "Build failed for $service"
-                exit 1
-            fi
-        }
-
-        # Build service with given arguments
-        build_service() {
-            local service=$1
-            local version=$2
-            local build_args=$3
-            local build_script=${4:-$BUILD_SCRIPT_NAME}
-
-            local command="IMAGE_TAG=$version DOCKER_RUNTIME=depot DOCKER_BUILD_ARGS=--push ARCH=amd64 DOCKER_REPO=$DOCKER_REPO_OSS PUSH_IMAGE=0 bash $build_script $build_args"
-            echo "Executing: $command"
-            eval "$command"
-        }
-
-        # Update chart version and commit changes
-        update_chart_version() {
-            local service=$1
-            local version=$2
-            local chart_path="$WORKING_DIR/scripts/helmcharts/openreplay/charts/$service/Chart.yaml"
-
-            # Ensure we're in the original working directory/repository
-            cd "$WORKING_DIR"
-            yq eval ".AppVersion = \"$version\"" -i "$chart_path"
-            git add "$chart_path"
-            git commit -m "Increment $service chart version to $version"
-            git push --set-upstream origin "$BRANCH_NAME"
-            cd -
-        }
-
-        # Main execution
-        main() {
-            setup_git
-
-            # Get backend services list
-            ls backend/cmd >"$BACKEND_SERVICES_FILE"
-
-            # Parse services input (fix for GitHub Actions syntax)
-            echo "Services: ${SERVICES_INPUT:-$1}"
-            IFS=',' read -ra services <<<"${SERVICES_INPUT:-$1}"
-
-            # Process each service
-            for service in "${services[@]}"; do
-                echo "Processing service: $service"
-                cd "$WORKING_DIR"
-
-                local foss_build_args="" ee_build_args="" build_script="$BUILD_SCRIPT_NAME"
-
-                # Determine build configuration based on service type
-                if grep -q "$service" "$BACKEND_SERVICES_FILE"; then
-                    # Backend service
-                    cd backend
-                    foss_build_args="nil $service"
-                    ee_build_args="ee $service"
-                else
-                    # Non-backend service
-                    case "$service" in
-                    chalice | alerts | crons)
-                        cd "$WORKING_DIR/api"
-                        ;;
-                    *)
-                        cd "$service"
-                        ;;
-                    esac
-
-                    # Special build scripts for alerts/crons
-                    if [[ $service == 'alerts' || $service == 'crons' ]]; then
-                        build_script="build_${service}.sh"
-                    fi
-
-                    ee_build_args="ee"
-                fi
-
-                # Get version and build
-                local version
-                version=$(image_version "$service")
-
-                # Build FOSS and EE versions
-                build_service "$service" "$version" "$foss_build_args"
-                build_service "$service" "${version}-ee" "$ee_build_args"
-
-                # Build managed version for specific services
-                if [[ "$service" != "chalice" && "$service" != "frontend" ]]; then
-                    echo "Nothing to build in managed for service $service"
-                else
-                    build_managed "$service" "$version"
-                fi
-
-                # Update chart and commit
-                update_chart_version "$service" "$version"
-            done
-            cd "$WORKING_DIR"
-
-            # Cleanup
-            rm -f "$BACKEND_SERVICES_FILE"
-        }
-
-        echo "Working directory: $WORKING_DIR"
-        # Run main function with all arguments
-        main "$SERVICES_INPUT"
-        
+        # Checking for backend images
+        ls backend/cmd >> /tmp/backend.txt
+        echo Services: "${{ github.event.inputs.services }}"
+        IFS=',' read -ra SERVICES <<< "${{ github.event.inputs.services }}" 
+        BUILD_SCRIPT_NAME="build.sh"
+        # Build FOSS
+        for SERVICE in "${SERVICES[@]}"; do
+          # Check if service is backend
+          if grep -q $SERVICE /tmp/backend.txt; then 
+            cd backend 
+            foss_build_args="nil $SERVICE"
+            ee_build_args="ee $SERVICE"
+          else 
+            [[ $SERVICE == 'chalice' || $SERVICE == 'alerts' || $SERVICE == 'crons' ]] && cd $working_dir/api || cd $SERVICE
+            [[ $SERVICE == 'alerts' || $SERVICE == 'crons' ]] && BUILD_SCRIPT_NAME="build_${SERVICE}.sh"
+            ee_build_args="ee"
+          fi  
+          version=$(image_version $SERVICE)
+          echo IMAGE_TAG=$version DOCKER_RUNTIME="depot" DOCKER_BUILD_ARGS="--push" ARCH=amd64 DOCKER_REPO=$DOCKER_REPO_OSS PUSH_IMAGE=0 bash ${BUILD_SCRIPT_NAME} $foss_build_args
+          IMAGE_TAG=$version DOCKER_RUNTIME="depot" DOCKER_BUILD_ARGS="--push" ARCH=amd64 DOCKER_REPO=$DOCKER_REPO_OSS PUSH_IMAGE=0 bash ${BUILD_SCRIPT_NAME} $foss_build_args
+          echo IMAGE_TAG=$version-ee DOCKER_RUNTIME="depot" DOCKER_BUILD_ARGS="--push" ARCH=amd64 DOCKER_REPO=$DOCKER_REPO_OSS PUSH_IMAGE=0 bash ${BUILD_SCRIPT_NAME} $ee_build_args
+          IMAGE_TAG=$version-ee DOCKER_RUNTIME="depot" DOCKER_BUILD_ARGS="--push" ARCH=amd64 DOCKER_REPO=$DOCKER_REPO_OSS PUSH_IMAGE=0 bash ${BUILD_SCRIPT_NAME} $ee_build_args
+          if [[ "$SERVICE" != "chalice" && "$SERVICE" != "frontend" ]]; then
+            IMAGE_TAG=$version DOCKER_RUNTIME="depot" DOCKER_BUILD_ARGS="--push" ARCH=arm64 DOCKER_REPO=$DOCKER_REPO_ARM PUSH_IMAGE=0 bash ${BUILD_SCRIPT_NAME} $foss_build_args
+            echo IMAGE_TAG=$version DOCKER_RUNTIME="depot" DOCKER_BUILD_ARGS="--push" ARCH=arm64 DOCKER_REPO=$DOCKER_REPO_ARM PUSH_IMAGE=0 bash ${BUILD_SCRIPT_NAME} $foss_build_args
+          else
+            build_managed $SERVICE $version
+          fi
+          cd $working_dir
+          chart_path="$working_dir/scripts/helmcharts/openreplay/charts/$SERVICE/Chart.yaml"
+          yq eval ".AppVersion = \"$version\"" -i $chart_path
+          git add $chart_path
+          git commit -m "Increment $SERVICE chart version"
+          git push --set-upstream origin $BRANCH_NAME
+        done
 
     - name: Create Pull Request
       uses: repo-sync/pull-request@v2
@@ -246,7 +147,8 @@ jobs:
         pr_title: "Updated patch build from main ${{ env.HEAD_COMMIT_ID }}"
         pr_body: | 
           This PR updates the Helm chart version after building the patch from $HEAD_COMMIT_ID.
-          Once this PR is merged, tag update job will run automatically.
+          Once this PR is merged, To update the latest tag, run the following workflow.
+          https://github.com/openreplay/openreplay/actions/workflows/update-tag.yaml
 
     # - name: Debug Job
     #   if: ${{ failure() }}

.github/workflows/update-tag.yaml

@@ -1,42 +1,35 @@
 on:
-  pull_request:
-    types: [closed]
-    branches:
-      - main
-name: Release tag update --force
+  workflow_dispatch:
+    description: "This workflow will build for patches for latest tag, and will Always use commit from main branch."
+    inputs:
+      services:
+        description: "This action will update the latest tag with current main branch HEAD. Should I proceed ? true/false"
+        required: true
+        default: "false"
+
+name: Force Push tag with main branch HEAD
 
 jobs:
   deploy:
     name: Build Patch from main
     runs-on: ubuntu-latest
-    if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.merged == true) || github.event.inputs.services == 'true' }}
+    env:
+      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+      DEPOT_PROJECT_ID: ${{ secrets.DEPOT_PROJECT_ID }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-
-      - name: Get latest release tag using GitHub API
-        id: get-latest-tag
-        run: |
-          LATEST_TAG=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-            "https://api.github.com/repos/${{ github.repository }}/releases/latest" \
-            | jq -r .tag_name)
-          
-          # Fallback to git command if API doesn't return a tag
-          if [ "$LATEST_TAG" == "null" ] || [ -z "$LATEST_TAG" ]; then
-            echo "Not found latest tag"
-            exit 100
-          fi
-          
-          echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV
-          echo "Latest tag: $LATEST_TAG"
-
       - name: Set Remote with GITHUB_TOKEN
         run: |
           git config --unset http.https://github.com/.extraheader
-          git remote set-url origin https://x-access-token:${{ secrets.ACTIONS_COMMMIT_TOKEN }}@github.com/${{ github.repository }}
-
+          git remote set-url origin https://x-access-token:${{ secrets.ACTIONS_COMMMIT_TOKEN }}@github.com/${{ github.repository }}.git
       - name: Push main branch to tag
         run: |
+          git fetch --tags
           git checkout main
-          echo "Updating tag ${{ env.LATEST_TAG }} to point to latest commit on main"
-          git push origin HEAD:refs/tags/${{ env.LATEST_TAG }} --force
+          git push origin HEAD:refs/tags/$(git tag --list 'v[0-9]*' --sort=-v:refname | head -n 1) --force
+    # - name: Debug Job
+    #   if: ${{ failure() }}
+    #   uses: mxschmitt/action-tmate@v3
+    #   with:
+    #     limit-access-to-actor: true

api/chalicelib/core/autocomplete/autocomplete.py

@@ -85,8 +85,7 @@ def __generic_query(typename, value_length=None):
                       ORDER BY value"""
 
     if value_length is None or value_length > 2:
-        return f"""SELECT DISTINCT ON(value,type) value, type
-                   ((SELECT DISTINCT value, type
+        return f"""(SELECT DISTINCT value, type
                     FROM {TABLE}
                     WHERE
                       project_id = %(project_id)s
@@ -102,7 +101,7 @@ def __generic_query(typename, value_length=None):
                       AND type='{typename.upper()}'
                       AND value ILIKE %(value)s
                       ORDER BY value
-                    LIMIT 5)) AS raw;"""
+                    LIMIT 5);"""
     return f"""SELECT DISTINCT value, type
                 FROM {TABLE}
                 WHERE
@@ -327,7 +326,7 @@ def __search_metadata(project_id, value, key=None, source=None):
                                 AND {colname} ILIKE %(svalue)s LIMIT 5)""")
     with pg_client.PostgresClient() as cur:
         cur.execute(cur.mogrify(f"""\
-                    SELECT DISTINCT ON(key, value) key, value, 'METADATA' AS TYPE
+                    SELECT key, value, 'METADATA' AS TYPE
                     FROM({" UNION ALL ".join(sub_from)}) AS all_metas
                     LIMIT 5;""", {"project_id": project_id, "value": helper.string_to_sql_like(value),
                                   "svalue": helper.string_to_sql_like("^" + value)}))

api/chalicelib/core/errors/errors_ch.py

@@ -338,14 +338,14 @@ def search(data: schemas.SearchErrorsSchema, project: schemas.ProjectContext, us
                 SELECT details.error_id as error_id,
                         name, message, users, total, 
                         sessions, last_occurrence, first_occurrence, chart
-                FROM (SELECT error_id,
+                FROM (SELECT JSONExtractString(toString(`$properties`), 'error_id') AS error_id,
                              JSONExtractString(toString(`$properties`), 'name') AS name,
                              JSONExtractString(toString(`$properties`), 'message') AS message,
                              COUNT(DISTINCT user_id)  AS users,
                              COUNT(DISTINCT events.session_id) AS sessions,
                              MAX(created_at)              AS max_datetime,
                              MIN(created_at)              AS min_datetime,
-                             COUNT(DISTINCT error_id) 
+                             COUNT(DISTINCT JSONExtractString(toString(`$properties`), 'error_id')) 
                                 OVER() AS total
                       FROM {MAIN_EVENTS_TABLE} AS events
                             INNER JOIN (SELECT session_id, coalesce(user_id,toString(user_uuid)) AS user_id 
@@ -357,7 +357,7 @@ def search(data: schemas.SearchErrorsSchema, project: schemas.ProjectContext, us
                       GROUP BY error_id, name, message
                       ORDER BY {sort} {order}
                       LIMIT %(errors_limit)s OFFSET %(errors_offset)s) AS details 
-                        INNER JOIN (SELECT error_id, 
+                        INNER JOIN (SELECT JSONExtractString(toString(`$properties`), 'error_id') AS error_id, 
                                             toUnixTimestamp(MAX(created_at))*1000 AS last_occurrence, 
                                             toUnixTimestamp(MIN(created_at))*1000 AS first_occurrence
                                      FROM {MAIN_EVENTS_TABLE}
@@ -366,7 +366,7 @@ def search(data: schemas.SearchErrorsSchema, project: schemas.ProjectContext, us
                                      GROUP BY error_id) AS time_details
                 ON details.error_id=time_details.error_id
                     INNER JOIN (SELECT error_id, groupArray([timestamp, count]) AS chart
-                    FROM (SELECT error_id, 
+                    FROM (SELECT JSONExtractString(toString(`$properties`), 'error_id') AS error_id, 
                                  gs.generate_series AS timestamp,
                                  COUNT(DISTINCT session_id) AS count
                             FROM generate_series(%(startDate)s, %(endDate)s, %(step_size)s) AS gs

api/chalicelib/core/issue_tracking/jira_cloud.py

@@ -50,8 +50,8 @@ class JIRAIntegration(base.BaseIntegration):
             cur.execute(
                 cur.mogrify(
                     """SELECT username, token, url
-                       FROM public.jira_cloud
-                       WHERE user_id = %(user_id)s;""",
+                        FROM public.jira_cloud 
+                        WHERE user_id=%(user_id)s;""",
                     {"user_id": self._user_id})
             )
             data = helper.dict_to_camel_case(cur.fetchone())
@@ -95,9 +95,10 @@ class JIRAIntegration(base.BaseIntegration):
     def add(self, username, token, url, obfuscate=False):
         with pg_client.PostgresClient() as cur:
             cur.execute(
-                cur.mogrify(""" \
-                            INSERT INTO public.jira_cloud(username, token, user_id, url)
-                            VALUES (%(username)s, %(token)s, %(user_id)s, %(url)s) RETURNING  username, token, url;""",
+                cur.mogrify("""\
+                        INSERT INTO public.jira_cloud(username, token, user_id,url)
+                        VALUES (%(username)s, %(token)s, %(user_id)s,%(url)s)
+                        RETURNING  username, token, url;""",
                             {"user_id": self._user_id, "username": username,
                              "token": token, "url": url})
             )
@@ -111,10 +112,9 @@ class JIRAIntegration(base.BaseIntegration):
     def delete(self):
         with pg_client.PostgresClient() as cur:
             cur.execute(
-                cur.mogrify(""" \
-                            DELETE
-                            FROM public.jira_cloud
-                            WHERE user_id = %(user_id)s;""",
+                cur.mogrify("""\
+                        DELETE FROM public.jira_cloud
+                        WHERE user_id=%(user_id)s;""",
                             {"user_id": self._user_id})
             )
             return {"state": "success"}
@@ -125,7 +125,7 @@ class JIRAIntegration(base.BaseIntegration):
                 changes={
                     "username": data.username,
                     "token": data.token if len(data.token) > 0 and data.token.find("***") == -1 \
-                        else self.integration["token"],
+                        else self.integration.token,
                     "url": str(data.url)
                 },
                 obfuscate=True

api/chalicelib/core/sessions/sessions_ch.py

@@ -153,7 +153,7 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de
                         "isEvent": True,
                         "value": [],
                         "operator": e.operator,
-                        "filters": e.filters
+                        "filters": []
                     })
                 for v in e.value:
                     if v not in extra_conditions[e.operator].value:
@@ -178,7 +178,7 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de
                         "isEvent": True,
                         "value": [],
                         "operator": e.operator,
-                        "filters": e.filters
+                        "filters": []
                     })
                 for v in e.value:
                     if v not in extra_conditions[e.operator].value:
@@ -1108,12 +1108,8 @@ def search_query_parts_ch(data: schemas.SessionsSearchPayloadSchema, error_statu
                     is_any = sh.isAny_opreator(f.operator)
                     if is_any or len(f.value) == 0:
                         continue
-                    is_negative_operator = sh.is_negation_operator(f.operator)
                     f.value = helper.values_for_operator(value=f.value, op=f.operator)
                     op = sh.get_sql_operator(f.operator)
-                    r_op = ""
-                    if is_negative_operator:
-                        r_op = sh.reverse_sql_operator(op)
                     e_k_f = e_k + f"_fetch{j}"
                     full_args = {**full_args, **sh.multi_values(f.value, value_key=e_k_f)}
                     if f.type == schemas.FetchFilterType.FETCH_URL:
@@ -1122,12 +1118,6 @@ def search_query_parts_ch(data: schemas.SessionsSearchPayloadSchema, error_statu
                         ))
                         events_conditions[-1]["condition"].append(event_where[-1])
                         apply = True
-                        if is_negative_operator:
-                            events_conditions_not.append(
-                                {
-                                    "type": f"sub.`$event_name`='{exp_ch_helper.get_event_type(event_type, platform=platform)}'"})
-                            events_conditions_not[-1]["condition"] = sh.multi_conditions(
-                                f"sub.`$properties`.url_path {r_op} %({e_k_f})s", f.value, value_key=e_k_f)
                     elif f.type == schemas.FetchFilterType.FETCH_STATUS_CODE:
                         event_where.append(json_condition(
                             "main", "$properties", 'status', op, f.value, e_k_f, True, True
@@ -1140,13 +1130,6 @@ def search_query_parts_ch(data: schemas.SessionsSearchPayloadSchema, error_statu
                         ))
                         events_conditions[-1]["condition"].append(event_where[-1])
                         apply = True
-                        if is_negative_operator:
-                            events_conditions_not.append(
-                                {
-                                    "type": f"sub.`$event_name`='{exp_ch_helper.get_event_type(event_type, platform=platform)}'"})
-                            events_conditions_not[-1]["condition"] = sh.multi_conditions(
-                                f"sub.`$properties`.method {r_op} %({e_k_f})s", f.value,
-                                value_key=e_k_f)
                     elif f.type == schemas.FetchFilterType.FETCH_DURATION:
                         event_where.append(
                             sh.multi_conditions(f"main.`$duration_s` {f.operator} %({e_k_f})s/1000", f.value,
@@ -1159,26 +1142,12 @@ def search_query_parts_ch(data: schemas.SessionsSearchPayloadSchema, error_statu
                         ))
                         events_conditions[-1]["condition"].append(event_where[-1])
                         apply = True
-                        if is_negative_operator:
-                            events_conditions_not.append(
-                                {
-                                    "type": f"sub.`$event_name`='{exp_ch_helper.get_event_type(event_type, platform=platform)}'"})
-                            events_conditions_not[-1]["condition"] = sh.multi_conditions(
-                                f"sub.`$properties`.request_body {r_op} %({e_k_f})s", f.value,
-                                value_key=e_k_f)
                     elif f.type == schemas.FetchFilterType.FETCH_RESPONSE_BODY:
                         event_where.append(json_condition(
                             "main", "$properties", 'response_body', op, f.value, e_k_f
                         ))
                         events_conditions[-1]["condition"].append(event_where[-1])
                         apply = True
-                        if is_negative_operator:
-                            events_conditions_not.append(
-                                {
-                                    "type": f"sub.`$event_name`='{exp_ch_helper.get_event_type(event_type, platform=platform)}'"})
-                            events_conditions_not[-1]["condition"] = sh.multi_conditions(
-                                f"sub.`$properties`.response_body {r_op} %({e_k_f})s", f.value,
-                                value_key=e_k_f)
                     else:
                         logging.warning(f"undefined FETCH filter: {f.type}")
                 if not apply:
@@ -1426,30 +1395,17 @@ def search_query_parts_ch(data: schemas.SessionsSearchPayloadSchema, error_statu
         if extra_conditions and len(extra_conditions) > 0:
             _extra_or_condition = []
             for i, c in enumerate(extra_conditions):
-                if sh.isAny_opreator(c.operator) and c.type != schemas.EventType.REQUEST_DETAILS.value:
+                if sh.isAny_opreator(c.operator):
                     continue
                 e_k = f"ec_value{i}"
                 op = sh.get_sql_operator(c.operator)
                 c.value = helper.values_for_operator(value=c.value, op=c.operator)
                 full_args = {**full_args,
                              **sh.multi_values(c.value, value_key=e_k)}
-                if c.type in (schemas.EventType.LOCATION.value, schemas.EventType.REQUEST.value):
+                if c.type == events.EventType.LOCATION.ui_type:
                     _extra_or_condition.append(
                         sh.multi_conditions(f"extra_event.url_path {op} %({e_k})s",
                                             c.value, value_key=e_k))
-                elif c.type == schemas.EventType.REQUEST_DETAILS.value:
-                    for j, c_f in enumerate(c.filters):
-                        if sh.isAny_opreator(c_f.operator) or len(c_f.value) == 0:
-                            continue
-                        e_k += f"_{j}"
-                        op = sh.get_sql_operator(c_f.operator)
-                        c_f.value = helper.values_for_operator(value=c_f.value, op=c_f.operator)
-                        full_args = {**full_args,
-                                     **sh.multi_values(c_f.value, value_key=e_k)}
-                        if c_f.type == schemas.FetchFilterType.FETCH_URL.value:
-                            _extra_or_condition.append(
-                                sh.multi_conditions(f"extra_event.url_path {op} %({e_k})s",
-                                                     c_f.value, value_key=e_k))
                 else:
                     logging.warning(f"unsupported extra_event type:${c.type}")
             if len(_extra_or_condition) > 0:

api/chalicelib/core/sessions/sessions_pg.py

@@ -148,7 +148,7 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de
                         "isEvent": True,
                         "value": [],
                         "operator": e.operator,
-                        "filters": e.filters
+                        "filters": []
                     })
                 for v in e.value:
                     if v not in extra_conditions[e.operator].value:
@@ -165,7 +165,7 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de
                         "isEvent": True,
                         "value": [],
                         "operator": e.operator,
-                        "filters": e.filters
+                        "filters": []
                     })
                 for v in e.value:
                     if v not in extra_conditions[e.operator].value:
@@ -989,7 +989,7 @@ def search_query_parts(data: schemas.SessionsSearchPayloadSchema, error_status,
                         sh.multi_conditions(f"ev.{events.EventType.LOCATION.column} {op} %({e_k})s",
                                             c.value, value_key=e_k))
                 else:
-                    logger.warning(f"unsupported extra_event type: {c.type}")
+                    logger.warning(f"unsupported extra_event type:${c.type}")
             if len(_extra_or_condition) > 0:
                 extra_constraints.append("(" + " OR ".join(_extra_or_condition) + ")")
     query_part = f"""\

api/chalicelib/utils/sql_helper.py

@@ -4,41 +4,37 @@ import schemas
 
 
 def get_sql_operator(op: Union[schemas.SearchEventOperator, schemas.ClickEventExtraOperator, schemas.MathOperator]):
-    if isinstance(op, Enum):
-        op = op.value
     return {
-        schemas.SearchEventOperator.IS.value: "=",
-        schemas.SearchEventOperator.ON.value: "=",
-        schemas.SearchEventOperator.ON_ANY.value: "IN",
-        schemas.SearchEventOperator.IS_NOT.value: "!=",
-        schemas.SearchEventOperator.NOT_ON.value: "!=",
-        schemas.SearchEventOperator.CONTAINS.value: "ILIKE",
-        schemas.SearchEventOperator.NOT_CONTAINS.value: "NOT ILIKE",
-        schemas.SearchEventOperator.STARTS_WITH.value: "ILIKE",
-        schemas.SearchEventOperator.ENDS_WITH.value: "ILIKE",
+        schemas.SearchEventOperator.IS: "=",
+        schemas.SearchEventOperator.ON: "=",
+        schemas.SearchEventOperator.ON_ANY: "IN",
+        schemas.SearchEventOperator.IS_NOT: "!=",
+        schemas.SearchEventOperator.NOT_ON: "!=",
+        schemas.SearchEventOperator.CONTAINS: "ILIKE",
+        schemas.SearchEventOperator.NOT_CONTAINS: "NOT ILIKE",
+        schemas.SearchEventOperator.STARTS_WITH: "ILIKE",
+        schemas.SearchEventOperator.ENDS_WITH: "ILIKE",
         # Selector operators:
-        schemas.ClickEventExtraOperator.IS.value: "=",
-        schemas.ClickEventExtraOperator.IS_NOT.value: "!=",
-        schemas.ClickEventExtraOperator.CONTAINS.value: "ILIKE",
-        schemas.ClickEventExtraOperator.NOT_CONTAINS.value: "NOT ILIKE",
-        schemas.ClickEventExtraOperator.STARTS_WITH.value: "ILIKE",
-        schemas.ClickEventExtraOperator.ENDS_WITH.value: "ILIKE",
+        schemas.ClickEventExtraOperator.IS: "=",
+        schemas.ClickEventExtraOperator.IS_NOT: "!=",
+        schemas.ClickEventExtraOperator.CONTAINS: "ILIKE",
+        schemas.ClickEventExtraOperator.NOT_CONTAINS: "NOT ILIKE",
+        schemas.ClickEventExtraOperator.STARTS_WITH: "ILIKE",
+        schemas.ClickEventExtraOperator.ENDS_WITH: "ILIKE",
 
-        schemas.MathOperator.GREATER.value: ">",
-        schemas.MathOperator.GREATER_EQ.value: ">=",
-        schemas.MathOperator.LESS.value: "<",
-        schemas.MathOperator.LESS_EQ.value: "<=",
+        schemas.MathOperator.GREATER: ">",
+        schemas.MathOperator.GREATER_EQ: ">=",
+        schemas.MathOperator.LESS: "<",
+        schemas.MathOperator.LESS_EQ: "<=",
     }.get(op, "=")
 
 
 def is_negation_operator(op: schemas.SearchEventOperator):
-    if isinstance(op, Enum):
-        op = op.value
-    return op in [schemas.SearchEventOperator.IS_NOT.value,
-                  schemas.SearchEventOperator.NOT_ON.value,
-                  schemas.SearchEventOperator.NOT_CONTAINS.value,
-                  schemas.ClickEventExtraOperator.IS_NOT.value,
-                  schemas.ClickEventExtraOperator.NOT_CONTAINS.value]
+    return op in [schemas.SearchEventOperator.IS_NOT,
+                  schemas.SearchEventOperator.NOT_ON,
+                  schemas.SearchEventOperator.NOT_CONTAINS,
+                  schemas.ClickEventExtraOperator.IS_NOT,
+                  schemas.ClickEventExtraOperator.NOT_CONTAINS]
 
 
 def reverse_sql_operator(op):

api/schemas/schemas.py

@@ -960,6 +960,36 @@ class CardSessionsSchema(_TimedSchema, _PaginatedSchema):
 
         return self
 
+    # We don't need this as the UI is expecting filters to override the full series' filters
+    # @model_validator(mode="after")
+    # def __merge_out_filters_with_series(self):
+    #     for f in self.filters:
+    #         for s in self.series:
+    #             found = False
+    #
+    #             if f.is_event:
+    #                 sub = s.filter.events
+    #             else:
+    #                 sub = s.filter.filters
+    #
+    #             for e in sub:
+    #                 if f.type == e.type and f.operator == e.operator:
+    #                     found = True
+    #                     if f.is_event:
+    #                         # If extra event: append value
+    #                         for v in f.value:
+    #                             if v not in e.value:
+    #                                 e.value.append(v)
+    #                     else:
+    #                         # If extra filter: override value
+    #                         e.value = f.value
+    #             if not found:
+    #                 sub.append(f)
+    #
+    #     self.filters = []
+    #
+    #     return self
+
     # UI is expecting filters to override the full series' filters
     @model_validator(mode="after")
     def __override_series_filters_with_outer_filters(self):
@@ -1030,16 +1060,6 @@ class CardTable(__CardSchema):
             values["metricValue"] = []
         return values
 
-    @model_validator(mode="after")
-    def __enforce_AND_operator(self):
-        self.metric_of = MetricOfTable(self.metric_of)
-        if self.metric_of in (MetricOfTable.VISITED_URL, MetricOfTable.FETCH, \
-                              MetricOfTable.VISITED_URL.value, MetricOfTable.FETCH.value):
-            for s in self.series:
-                if s.filter is not None:
-                    s.filter.events_order = SearchEventOrder.AND
-        return self
-
     @model_validator(mode="after")
     def __transform(self):
         self.metric_of = MetricOfTable(self.metric_of)

backend/internal/db/datasaver/saver.go

@@ -2,12 +2,11 @@ package datasaver
 
 import (
 	"context"
-	"encoding/json"
-	"openreplay/backend/pkg/db/types"
 
 	"openreplay/backend/internal/config/db"
 	"openreplay/backend/pkg/db/clickhouse"
 	"openreplay/backend/pkg/db/postgres"
+	"openreplay/backend/pkg/db/types"
 	"openreplay/backend/pkg/logger"
 	. "openreplay/backend/pkg/messages"
 	queue "openreplay/backend/pkg/queue/types"
@@ -51,6 +50,10 @@ func New(log logger.Logger, cfg *db.Config, pg *postgres.Conn, ch clickhouse.Con
 }
 
 func (s *saverImpl) Handle(msg Message) {
+	if msg.TypeID() == MsgCustomEvent {
+		defer s.Handle(types.WrapCustomEvent(msg.(*CustomEvent)))
+	}
+
 	var (
 		sessCtx = context.WithValue(context.Background(), "sessionID", msg.SessionID())
 		session *sessions.Session
@@ -66,23 +69,6 @@ func (s *saverImpl) Handle(msg Message) {
 		return
 	}
 
-	if msg.TypeID() == MsgCustomEvent {
-		m := msg.(*CustomEvent)
-		// Try to parse custom event payload to JSON and extract or_payload field
-		type CustomEventPayload struct {
-			CustomTimestamp uint64 `json:"or_timestamp"`
-		}
-		customPayload := &CustomEventPayload{}
-		if err := json.Unmarshal([]byte(m.Payload), customPayload); err == nil {
-			if customPayload.CustomTimestamp >= session.Timestamp {
-				s.log.Info(sessCtx, "custom event timestamp received: %v", m.Timestamp)
-				msg.Meta().Timestamp = customPayload.CustomTimestamp
-				s.log.Info(sessCtx, "custom event timestamp updated: %v", m.Timestamp)
-			}
-		}
-		defer s.Handle(types.WrapCustomEvent(m))
-	}
-
 	if IsMobileType(msg.TypeID()) {
 		if err := s.handleMobileMessage(sessCtx, session, msg); err != nil {
 			if !postgres.IsPkeyViolation(err) {

ee/api/chalicelib/core/autocomplete/autocomplete_ch.py

@@ -86,8 +86,7 @@ def __generic_query(typename, value_length=None):
                       ORDER BY value"""
 
     if value_length is None or value_length > 2:
-        return f"""SELECT DISTINCT ON(value, type) value, type
-                   FROM ((SELECT DISTINCT value, type
+        return f"""(SELECT DISTINCT value, type
                     FROM {TABLE}
                     WHERE
                       project_id = %(project_id)s
@@ -103,7 +102,7 @@ def __generic_query(typename, value_length=None):
                       AND type='{typename.upper()}'
                       AND value ILIKE %(value)s
                       ORDER BY value
-                    LIMIT 5)) AS raw;"""
+                    LIMIT 5);"""
     return f"""SELECT DISTINCT value, type
                 FROM {TABLE}
                 WHERE
@@ -258,7 +257,7 @@ def __search_metadata(project_id, value, key=None, source=None):
                                 WHERE project_id = %(project_id)s
                                 AND {colname} ILIKE %(svalue)s LIMIT 5)""")
     with ch_client.ClickHouseClient() as cur:
-        query = cur.format(query=f"""SELECT DISTINCT ON(key, value) key, value, 'METADATA' AS TYPE
+        query = cur.format(query=f"""SELECT key, value, 'METADATA' AS TYPE
                                 FROM({" UNION ALL ".join(sub_from)}) AS all_metas
                                 LIMIT 5;""", parameters={"project_id": project_id, "value": helper.string_to_sql_like(value),
                                               "svalue": helper.string_to_sql_like("^" + value)})

ee/api/chalicelib/core/errors/errors_details_exp.py

@@ -71,7 +71,7 @@ def get_details(project_id, error_id, user_id, **data):
     MAIN_EVENTS_TABLE = exp_ch_helper.get_main_events_table(0)
 
     ch_basic_query = errors_helper.__get_basic_constraints_ch(time_constraint=False)
-    ch_basic_query.append("error_id = %(error_id)s")
+    ch_basic_query.append("toString(`$properties`.error_id) = %(error_id)s")
 
     with ch_client.ClickHouseClient() as ch:
         data["startDate24"] = TimeUTC.now(-1)
@@ -95,7 +95,7 @@ def get_details(project_id, error_id, user_id, **data):
             "error_id": error_id}
 
         main_ch_query = f"""\
-        WITH pre_processed AS (SELECT error_id,
+        WITH pre_processed AS (SELECT toString(`$properties`.error_id)         AS error_id,
                                       toString(`$properties`.name)             AS name,
                                       toString(`$properties`.message)          AS message,
                                       session_id,
@@ -183,7 +183,7 @@ def get_details(project_id, error_id, user_id, **data):
                                          AND `$event_name` = 'ERROR'
                                          AND events.created_at >= toDateTime(timestamp / 1000)
                                          AND events.created_at < toDateTime((timestamp + %(step_size24)s) / 1000)
-                                         AND error_id = %(error_id)s
+                                         AND toString(`$properties`.error_id) = %(error_id)s
                                    GROUP BY timestamp
                                    ORDER BY timestamp) AS chart_details
                             ) AS chart_details24 ON TRUE
@@ -196,7 +196,7 @@ def get_details(project_id, error_id, user_id, **data):
                                          AND `$event_name` = 'ERROR'
                                          AND events.created_at >= toDateTime(timestamp / 1000)
                                          AND events.created_at < toDateTime((timestamp + %(step_size30)s) / 1000)
-                                         AND error_id = %(error_id)s
+                                         AND toString(`$properties`.error_id) = %(error_id)s
                                    GROUP BY timestamp
                                    ORDER BY timestamp) AS chart_details
                             ) AS chart_details30 ON TRUE;"""

ee/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql

@@ -1,16 +1,3 @@
-SELECT 1
-FROM (SELECT throwIf(platform = 'ios', 'IOS sessions found')
-      FROM experimental.sessions) AS raw
-LIMIT 1;
-
-SELECT 1
-FROM (SELECT throwIf(platform = 'android', 'Android sessions found')
-      FROM experimental.sessions) AS raw
-LIMIT 1;
-
-ALTER TABLE experimental.sessions
-    MODIFY COLUMN platform Enum8('web'=1,'mobile'=2) DEFAULT 'web';
-
 CREATE OR REPLACE FUNCTION openreplay_version AS() -> 'v1.22.0-ee';
 
 SET allow_experimental_json_type = 1;
@@ -164,7 +151,8 @@ CREATE TABLE IF NOT EXISTS product_analytics.events
     _timestamp                  DateTime DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       ORDER BY (project_id, "$event_name", created_at, session_id)
-      TTL _deleted_at + INTERVAL 1 DAY DELETE WHERE _deleted_at != '1970-01-01 00:00:00';
+      TTL _timestamp + INTERVAL 1 MONTH ,
+          _deleted_at + INTERVAL 1 DAY DELETE WHERE _deleted_at != '1970-01-01 00:00:00';
 
 -- The list of events that should not be ingested,
 -- according to a specific event_name and optional properties

ee/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql

@@ -9,7 +9,8 @@ CREATE TABLE IF NOT EXISTS experimental.autocomplete
     _timestamp DateTime DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMM(_timestamp)
-      ORDER BY (project_id, type, value);
+      ORDER BY (project_id, type, value)
+      TTL _timestamp + INTERVAL 1 MONTH;
 
 CREATE TABLE IF NOT EXISTS experimental.events
 (
@@ -86,7 +87,8 @@ CREATE TABLE IF NOT EXISTS experimental.events
     _timestamp                     DateTime                             DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMM(datetime)
-      ORDER BY (project_id, datetime, event_type, session_id, message_id);
+      ORDER BY (project_id, datetime, event_type, session_id, message_id)
+      TTL datetime + INTERVAL 3 MONTH;
 
 
 
@@ -106,7 +108,7 @@ CREATE TABLE IF NOT EXISTS experimental.sessions
     user_country         Enum8('UN'=-128, 'RW'=-127, 'SO'=-126, 'YE'=-125, 'IQ'=-124, 'SA'=-123, 'IR'=-122, 'CY'=-121, 'TZ'=-120, 'SY'=-119, 'AM'=-118, 'KE'=-117, 'CD'=-116, 'DJ'=-115, 'UG'=-114, 'CF'=-113, 'SC'=-112, 'JO'=-111, 'LB'=-110, 'KW'=-109, 'OM'=-108, 'QA'=-107, 'BH'=-106, 'AE'=-105, 'IL'=-104, 'TR'=-103, 'ET'=-102, 'ER'=-101, 'EG'=-100, 'SD'=-99, 'GR'=-98, 'BI'=-97, 'EE'=-96, 'LV'=-95, 'AZ'=-94, 'LT'=-93, 'SJ'=-92, 'GE'=-91, 'MD'=-90, 'BY'=-89, 'FI'=-88, 'AX'=-87, 'UA'=-86, 'MK'=-85, 'HU'=-84, 'BG'=-83, 'AL'=-82, 'PL'=-81, 'RO'=-80, 'XK'=-79, 'ZW'=-78, 'ZM'=-77, 'KM'=-76, 'MW'=-75, 'LS'=-74, 'BW'=-73, 'MU'=-72, 'SZ'=-71, 'RE'=-70, 'ZA'=-69, 'YT'=-68, 'MZ'=-67, 'MG'=-66, 'AF'=-65, 'PK'=-64, 'BD'=-63, 'TM'=-62, 'TJ'=-61, 'LK'=-60, 'BT'=-59, 'IN'=-58, 'MV'=-57, 'IO'=-56, 'NP'=-55, 'MM'=-54, 'UZ'=-53, 'KZ'=-52, 'KG'=-51, 'TF'=-50, 'HM'=-49, 'CC'=-48, 'PW'=-47, 'VN'=-46, 'TH'=-45, 'ID'=-44, 'LA'=-43, 'TW'=-42, 'PH'=-41, 'MY'=-40, 'CN'=-39, 'HK'=-38, 'BN'=-37, 'MO'=-36, 'KH'=-35, 'KR'=-34, 'JP'=-33, 'KP'=-32, 'SG'=-31, 'CK'=-30, 'TL'=-29, 'RU'=-28, 'MN'=-27, 'AU'=-26, 'CX'=-25, 'MH'=-24, 'FM'=-23, 'PG'=-22, 'SB'=-21, 'TV'=-20, 'NR'=-19, 'VU'=-18, 'NC'=-17, 'NF'=-16, 'NZ'=-15, 'FJ'=-14, 'LY'=-13, 'CM'=-12, 'SN'=-11, 'CG'=-10, 'PT'=-9, 'LR'=-8, 'CI'=-7, 'GH'=-6, 'GQ'=-5, 'NG'=-4, 'BF'=-3, 'TG'=-2, 'GW'=-1, 'MR'=0, 'BJ'=1, 'GA'=2, 'SL'=3, 'ST'=4, 'GI'=5, 'GM'=6, 'GN'=7, 'TD'=8, 'NE'=9, 'ML'=10, 'EH'=11, 'TN'=12, 'ES'=13, 'MA'=14, 'MT'=15, 'DZ'=16, 'FO'=17, 'DK'=18, 'IS'=19, 'GB'=20, 'CH'=21, 'SE'=22, 'NL'=23, 'AT'=24, 'BE'=25, 'DE'=26, 'LU'=27, 'IE'=28, 'MC'=29, 'FR'=30, 'AD'=31, 'LI'=32, 'JE'=33, 'IM'=34, 'GG'=35, 'SK'=36, 'CZ'=37, 'NO'=38, 'VA'=39, 'SM'=40, 'IT'=41, 'SI'=42, 'ME'=43, 'HR'=44, 'BA'=45, 'AO'=46, 'NA'=47, 'SH'=48, 'BV'=49, 'BB'=50, 'CV'=51, 'GY'=52, 'GF'=53, 'SR'=54, 'PM'=55, 'GL'=56, 'PY'=57, 'UY'=58, 'BR'=59, 'FK'=60, 'GS'=61, 'JM'=62, 'DO'=63, 'CU'=64, 'MQ'=65, 'BS'=66, 'BM'=67, 'AI'=68, 'TT'=69, 'KN'=70, 'DM'=71, 'AG'=72, 'LC'=73, 'TC'=74, 'AW'=75, 'VG'=76, 'VC'=77, 'MS'=78, 'MF'=79, 'BL'=80, 'GP'=81, 'GD'=82, 'KY'=83, 'BZ'=84, 'SV'=85, 'GT'=86, 'HN'=87, 'NI'=88, 'CR'=89, 'VE'=90, 'EC'=91, 'CO'=92, 'PA'=93, 'HT'=94, 'AR'=95, 'CL'=96, 'BO'=97, 'PE'=98, 'MX'=99, 'PF'=100, 'PN'=101, 'KI'=102, 'TK'=103, 'TO'=104, 'WF'=105, 'WS'=106, 'NU'=107, 'MP'=108, 'GU'=109, 'PR'=110, 'VI'=111, 'UM'=112, 'AS'=113, 'CA'=114, 'US'=115, 'PS'=116, 'RS'=117, 'AQ'=118, 'SX'=119, 'CW'=120, 'BQ'=121, 'SS'=122,'BU'=123, 'VD'=124, 'YD'=125, 'DD'=126),
     user_city            LowCardinality(String),
     user_state           LowCardinality(String),
-    platform             Enum8('web'=1,'mobile'=2) DEFAULT 'web',
+    platform             Enum8('web'=1,'ios'=2,'android'=3) DEFAULT 'web',
     datetime             DateTime,
     timezone             LowCardinality(Nullable(String)),
     duration             UInt32,
@@ -138,6 +140,7 @@ CREATE TABLE IF NOT EXISTS experimental.sessions
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMMDD(datetime)
       ORDER BY (project_id, datetime, session_id)
+      TTL datetime + INTERVAL 3 MONTH
       SETTINGS index_granularity = 512;
 
 CREATE TABLE IF NOT EXISTS experimental.user_favorite_sessions
@@ -149,7 +152,8 @@ CREATE TABLE IF NOT EXISTS experimental.user_favorite_sessions
     sign       Int8
 ) ENGINE = CollapsingMergeTree(sign)
       PARTITION BY toYYYYMM(_timestamp)
-      ORDER BY (project_id, user_id, session_id);
+      ORDER BY (project_id, user_id, session_id)
+      TTL _timestamp + INTERVAL 3 MONTH;
 
 CREATE TABLE IF NOT EXISTS experimental.user_viewed_sessions
 (
@@ -159,7 +163,8 @@ CREATE TABLE IF NOT EXISTS experimental.user_viewed_sessions
     _timestamp DateTime DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMM(_timestamp)
-      ORDER BY (project_id, user_id, session_id);
+      ORDER BY (project_id, user_id, session_id)
+      TTL _timestamp + INTERVAL 3 MONTH;
 
 CREATE TABLE IF NOT EXISTS experimental.user_viewed_errors
 (
@@ -169,7 +174,8 @@ CREATE TABLE IF NOT EXISTS experimental.user_viewed_errors
     _timestamp DateTime DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMM(_timestamp)
-      ORDER BY (project_id, user_id, error_id);
+      ORDER BY (project_id, user_id, error_id)
+      TTL _timestamp + INTERVAL 3 MONTH;
 
 CREATE TABLE IF NOT EXISTS experimental.issues
 (
@@ -182,7 +188,8 @@ CREATE TABLE IF NOT EXISTS experimental.issues
     _timestamp     DateTime DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMM(_timestamp)
-      ORDER BY (project_id, issue_id, type);
+      ORDER BY (project_id, issue_id, type)
+      TTL _timestamp + INTERVAL 3 MONTH;
 
 
 
@@ -285,7 +292,8 @@ CREATE TABLE IF NOT EXISTS experimental.sessions_feature_flags
     _timestamp      DateTime DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMM(datetime)
-      ORDER BY (project_id, datetime, session_id, feature_flag_id, condition_id);
+      ORDER BY (project_id, datetime, session_id, feature_flag_id, condition_id)
+      TTL datetime + INTERVAL 3 MONTH;
 
 CREATE TABLE IF NOT EXISTS experimental.ios_events
 (
@@ -321,7 +329,8 @@ CREATE TABLE IF NOT EXISTS experimental.ios_events
     _timestamp     DateTime                             DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       PARTITION BY toYYYYMM(datetime)
-      ORDER BY (project_id, datetime, event_type, session_id, message_id);
+      ORDER BY (project_id, datetime, event_type, session_id, message_id)
+      TTL datetime + INTERVAL 3 MONTH;
 
 
 SET allow_experimental_json_type = 1;
@@ -475,7 +484,8 @@ CREATE TABLE IF NOT EXISTS product_analytics.events
     _timestamp                  DateTime DEFAULT now()
 ) ENGINE = ReplacingMergeTree(_timestamp)
       ORDER BY (project_id, "$event_name", created_at, session_id)
-      TTL _deleted_at + INTERVAL 1 DAY DELETE WHERE _deleted_at != '1970-01-01 00:00:00';
+      TTL _timestamp + INTERVAL 1 MONTH ,
+          _deleted_at + INTERVAL 1 DAY DELETE WHERE _deleted_at != '1970-01-01 00:00:00';
 
 -- The list of events that should not be ingested,
 -- according to a specific event_name and optional properties

frontend/app/PrivateRoutes.tsx

@@ -1,4 +1,5 @@
 import withSiteIdUpdater from 'HOCs/withSiteIdUpdater';
+import withSiteIdUpdater from 'HOCs/withSiteIdUpdater';
 import React, { Suspense, lazy } from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import { observer } from 'mobx-react-lite';
@@ -9,7 +10,7 @@ import { Loader } from 'UI';
 
 import APIClient from './api_client';
 import * as routes from './routes';
-import { debounceCall } from '@/utils';
+import { debounce } from '@/utils';
 
 const components: any = {
   SessionPure: lazy(() => import('Components/Session/Session')),
@@ -87,6 +88,7 @@ const ASSIST_PATH = routes.assist();
 const LIVE_SESSION_PATH = routes.liveSession();
 const MULTIVIEW_PATH = routes.multiview();
 const MULTIVIEW_INDEX_PATH = routes.multiviewIndex();
+const ASSIST_STATS_PATH = routes.assistStats();
 
 const USABILITY_TESTING_PATH = routes.usabilityTesting();
 const USABILITY_TESTING_EDIT_PATH = routes.usabilityTestingEdit();
@@ -97,6 +99,7 @@ const SPOT_PATH = routes.spot();
 const SCOPE_SETUP = routes.scopeSetup();
 
 const HIGHLIGHTS_PATH = routes.highlights();
+let debounceSearch: any = () => {};
 
 function PrivateRoutes() {
   const { projectsStore, userStore, integrationsStore, searchStore } = useStore();
@@ -121,9 +124,13 @@ function PrivateRoutes() {
     }
   }, [siteId]);
 
+  React.useEffect(() => {
+    debounceSearch = debounce(() => searchStore.fetchSessions(), 250);
+  }, []);
+
   React.useEffect(() => {
     if (!searchStore.urlParsed) return;
-    debounceCall(() => searchStore.fetchSessions(true), 250)()
+    debounceSearch();
   }, [searchStore.urlParsed, searchStore.instance.filters, searchStore.instance.eventsOrder]);
 
   return (

frontend/app/components/Client/SessionsListingSettings.tsx

@@ -6,7 +6,6 @@ import DefaultPlaying from 'Shared/SessionSettings/components/DefaultPlaying';
 import DefaultTimezone from 'Shared/SessionSettings/components/DefaultTimezone';
 import ListingVisibility from 'Shared/SessionSettings/components/ListingVisibility';
 import MouseTrailSettings from 'Shared/SessionSettings/components/MouseTrailSettings';
-import VirtualModeSettings from '../shared/SessionSettings/components/VirtualMode';
 import DebugLog from './DebugLog';
 import { useTranslation } from 'react-i18next';
 
@@ -36,7 +35,6 @@ function SessionsListingSettings() {
         <div className="flex flex-col gap-2">
           <MouseTrailSettings />
           <DebugLog />
-          <VirtualModeSettings />
         </div>
       </div>
     </div>

frontend/app/components/Dashboard/components/Alerts/AlertForm/BottomButtons.tsx

@@ -23,7 +23,6 @@ function BottomButtons({
         <Button
           loading={loading}
           type="primary"
-          htmlType="submit"
           disabled={loading || !instance.validate()}
           id="submit-button"
         >

frontend/app/components/Dashboard/components/ClickMapRagePicker/ClickMapRagePicker.tsx

@@ -43,7 +43,7 @@ function ClickMapRagePicker() {
       <Checkbox onChange={onToggle} label={t('Include rage clicks')} />
 
       <Button size="small" onClick={refreshHeatmapSession}>
-        {t('Get new image')}
+        {t('Get new session')}
       </Button>
     </div>
   );

frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx

@@ -64,7 +64,6 @@ function DashboardView(props: Props) {
   };
 
   useEffect(() => {
-    dashboardStore.resetPeriod();
     if (queryParams.has('modal')) {
       onAddWidgets();
       trimQuery();

frontend/app/components/Dashboard/components/MetricsList/ListView.tsx

@@ -117,6 +117,8 @@ const ListView: React.FC<Props> = ({
     if (disableSelection) {
       const path = withSiteId(`/metrics/${metric.metricId}`, siteId);
       history.push(path);
+    } else {
+      toggleSelection?.(metric.metricId);
     }
   };
 

frontend/app/components/Dashboard/components/WidgetChart/WidgetChart.tsx

@@ -181,10 +181,9 @@ function WidgetChart(props: Props) {
     }
     prevMetricRef.current = _metric;
     const timestmaps = drillDownPeriod.toTimestamps();
-    const density = props.isPreview ? metric.density : dashboardStore.selectedDensity
     const payload = isSaved
-      ? { ...metricParams, density }
-      : { ...params, ...timestmaps, ..._metric.toJson(), density };
+      ? { ...metricParams }
+      : { ...params, ...timestmaps, ..._metric.toJson() };
     debounceRequest(
       _metric,
       payload,

frontend/app/components/Dashboard/components/WidgetDateRange/RangeGranularity.tsx

@@ -55,7 +55,7 @@ function RangeGranularity({
 }
 
 const PAST_24_HR_MS = 24 * 60 * 60 * 1000;
-export function calculateGranularities(periodDurationMs: number) {
+function calculateGranularities(periodDurationMs: number) {
   const granularities = [
     { label: 'Hourly', durationMs: 60 * 60 * 1000 },
     { label: 'Daily', durationMs: 24 * 60 * 60 * 1000 },

frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx

@@ -165,7 +165,7 @@ function WidgetSessions(props: Props) {
             if (widget.metricType === USER_PATH) {
                 if (
                     seriesJson[0].filter.filters[0].value[0] === '' &&
-                    widget.data.nodes?.length
+                    widget.data.nodes
                 ) {
                     seriesJson[0].filter.filters[0].value = widget.data.nodes[0].name;
                 } else if (

frontend/app/components/Dashboard/components/WidgetView/WidgetView.tsx

@@ -92,9 +92,6 @@ function WidgetView({
                 filter: { filters: selectedCard.filters },
               }),
             ];
-          } else if (selectedCard.cardType === TABLE) {
-            cardData.series = [new FilterSeries()];
-            cardData.series[0].filter.eventsOrder = 'and';
           }
           if (selectedCard.cardType === FUNNEL) {
             cardData.series = [new FilterSeries()];

frontend/app/components/Session/Player/ClipPlayer/ClipFeedback.tsx

@@ -8,7 +8,7 @@ import {
   LikeFilled,
   LikeOutlined,
 } from '@ant-design/icons';
-import { Tour, TourProps } from 'antd';
+import { Tour, TourProps } from './.store/antd-virtual-7db13b4af6/package';
 import { useTranslation } from 'react-i18next';
 
 interface Props {

frontend/app/components/Session/Player/ReplayPlayer/AudioPlayer.tsx

@@ -42,7 +42,7 @@ function DropdownAudioPlayer({
         return {
           url: data.url,
           timestamp: data.timestamp,
-          start: Math.max(0, startTs),
+          start: startTs,
         };
       }),
     [audioEvents.length, sessionStart],

frontend/app/components/Session/Player/ReplayPlayer/PlayerBlockHeader.tsx

@@ -114,11 +114,13 @@ function PlayerBlockHeader(props: any) {
           )}
 
           {_metaList.length > 0 && (
-            <SessionMetaList
-              horizontal
-              metaList={_metaList}
-              maxLength={2}
-            />
+            <div className="h-full flex items-center px-2 gap-1">
+              <SessionMetaList
+                className=""
+                metaList={_metaList}
+                maxLength={2}
+              />
+            </div>
           )}
         </div>
       </div>

frontend/app/components/Session/WebPlayer.tsx

@@ -38,8 +38,8 @@ function WebPlayer(props: any) {
     uxtestingStore,
     uiPlayerStore,
     integrationsStore,
+    userStore,
   } = useStore();
-  const devTools = sessionStore.devTools
   const session = sessionStore.current;
   const { prefetched } = sessionStore;
   const startedAt = sessionStore.current.startedAt || 0;
@@ -57,17 +57,14 @@ function WebPlayer(props: any) {
   const [fullView, setFullView] = useState(false);
 
   React.useEffect(() => {
-    const handleActivation = () => {
-      if (!document.hidden) {
-        setWindowActive(true);
-        document.removeEventListener('visibilitychange', handleActivation);
-      }
-    };
-    document.addEventListener('visibilitychange', handleActivation);
-
-    return () => {
-      devTools.update('network', { activeTab: 'ALL' });
-      document.removeEventListener('visibilitychange', handleActivation);
+    if (windowActive) {
+      const handleActivation = () => {
+        if (!document.hidden) {
+          setWindowActive(true);
+          document.removeEventListener('visibilitychange', handleActivation);
+        }
+      };
+      document.addEventListener('visibilitychange', handleActivation);
     }
   }, []);
 

frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js

@@ -169,6 +169,6 @@ function TabChange({ from, to, activeUrl, onClick }) {
       </div>
     </div>
   );
-};
+}
 
 export default observer(EventGroupWrapper);

frontend/app/components/Session_/EventsBlock/EventsBlock.tsx

@@ -4,17 +4,17 @@ import cn from 'classnames';
 import { observer } from 'mobx-react-lite';
 import React from 'react';
 import { VList, VListHandle } from 'virtua';
-import { Button } from 'antd';
+import { Button } from 'antd'
 import { PlayerContext } from 'App/components/Session/playerContext';
 import { useStore } from 'App/mstore';
 import { Icon } from 'UI';
-import { Search } from 'lucide-react';
+import { Search } from 'lucide-react'
 import EventGroupWrapper from './EventGroupWrapper';
 import EventSearch from './EventSearch/EventSearch';
 import styles from './eventsBlock.module.css';
 import { useTranslation } from 'react-i18next';
-import { CloseOutlined } from "@ant-design/icons";
-import { Tooltip } from "antd";
+import { CloseOutlined } from ".store/@ant-design-icons-virtual-42686020c5/package";
+import { Tooltip } from ".store/antd-virtual-9dbfadb7f6/package";
 import { getDefaultFramework, frameworkIcons } from "../UnitStepsModal";
 
 interface IProps {
@@ -25,7 +25,7 @@ const MODES = {
   SELECT: 'select',
   SEARCH: 'search',
   EXPORT: 'export',
-};
+}
 
 function EventsBlock(props: IProps) {
   const defaultFramework = getDefaultFramework();
@@ -95,7 +95,7 @@ function EventsBlock(props: IProps) {
           ? e.time >= zoomStartTs && e.time <= zoomEndTs
           : false
         : true,
-      );
+    );
   }, [
     filteredLength,
     notesWithEvtsLength,
@@ -126,7 +126,6 @@ function EventsBlock(props: IProps) {
     },
     [usedEvents, time, endTime],
   );
-
   const currentTimeEventIndex = findLastFitting(time);
 
   const write = ({
@@ -183,7 +182,6 @@ function EventsBlock(props: IProps) {
     const isTabChange = 'type' in event && event.type === 'TABCHANGE';
     const isCurrent = index === currentTimeEventIndex;
     const isPrev = index < currentTimeEventIndex;
-
     return (
       <EventGroupWrapper
         query={query}
@@ -251,14 +249,12 @@ function EventsBlock(props: IProps) {
               onClick={() => setMode(MODES.SEARCH)}
             >
               <Search size={14} />
-              <div>
-                {t('Search')}&nbsp;{usedEvents.length}&nbsp;{t('events')}
-              </div>
+              <div>{t('Search')}&nbsp;{usedEvents.length}&nbsp;{t('events')}</div>
             </Button>
-            <Tooltip title={t('Close Panel')} placement="bottom">
+            <Tooltip title={t('Close Panel')} placement='bottom' >
               <Button
                 className="ml-auto"
-                type="text"
+                type='text'
                 onClick={() => {
                   setActiveTab('');
                 }}
@@ -267,23 +263,19 @@ function EventsBlock(props: IProps) {
             </Tooltip>
           </div>
         ) : null}
-        {mode === MODES.SEARCH ? (
+        {mode === MODES.SEARCH ?
           <div className={'flex items-center gap-2'}>
             <EventSearch
               onChange={write}
               setActiveTab={setActiveTab}
               value={query}
               eventsText={
-                usedEvents.length
-                  ? `${usedEvents.length} ${t('Events')}`
-                  : `0 ${t('Events')}`
+                usedEvents.length ? `${usedEvents.length} ${t('Events')}` : `0 ${t('Events')}`
               }
             />
-            <Button type={'text'} onClick={() => setMode(MODES.SELECT)}>
-              {t('Cancel')}
-            </Button>
+            <Button type={'text'} onClick={() => setMode(MODES.SELECT)}>{t('Cancel')}</Button>
           </div>
-        ) : null}
+        : null}
       </div>
       <div
         className={cn('flex-1 pb-4', styles.eventsList)}

frontend/app/components/Session_/Player/Controls/EventsList.tsx

@@ -6,11 +6,9 @@ import {
 import { observer } from 'mobx-react-lite';
 import stl from './timeline.module.css';
 import { getTimelinePosition } from './getTimelinePosition';
-import { useStore } from '@/mstore';
 
 function EventsList() {
   const { store } = useContext(PlayerContext);
-  const { uiPlayerStore } = useStore();
 
   const { eventCount, endTime } = store.get();
   const { tabStates } = store.get();
@@ -19,6 +17,7 @@ function EventsList() {
     () => Object.values(tabStates)[0]?.eventList.filter((e) => e.time) || [],
     [eventCount],
   );
+
   React.useEffect(() => {
     const hasDuplicates = events.some(
       (e, i) =>

frontend/app/components/Session_/Player/Controls/timeline.module.css

@@ -49,6 +49,7 @@
   z-index: 2;
 }
 
+
 .event {
   position: absolute;
   width: 2px;

frontend/app/components/Session_/Subheader.tsx

@@ -38,7 +38,6 @@ function SubHeader(props) {
     projectsStore,
     userStore,
     issueReportingStore,
-    settingsStore
   } = useStore();
   const { t } = useTranslation();
   const { favorite } = sessionStore.current;
@@ -46,7 +45,7 @@ function SubHeader(props) {
   const currentSession = sessionStore.current;
   const projectId = projectsStore.siteId;
   const integrations = integrationsStore.issues.list;
-  const { player, store } = React.useContext(PlayerContext);
+  const { store } = React.useContext(PlayerContext);
   const { location: currentLocation = 'loading...' } = store.get();
   const hasIframe = localStorage.getItem(IFRAME) === 'true';
   const [hideTools, setHideTools] = React.useState(false);
@@ -128,13 +127,6 @@ function SubHeader(props) {
     });
   };
 
-  const showVModeBadge = store.get().vModeBadge;
-  const onVMode = () => {
-    settingsStore.sessionSettings.updateKey('virtualMode', true);
-    player.enableVMode?.();
-    location.reload();
-  }
-
   return (
     <>
       <div
@@ -151,8 +143,6 @@ function SubHeader(props) {
           siteId={projectId!}
           currentLocation={currentLocation}
           version={currentSession?.trackerVersion ?? ''}
-          virtualElsFailed={showVModeBadge}
-          onVMode={onVMode}
         />
 
         <SessionTabs />

frontend/app/components/Session_/WarnBadge.tsx

@@ -34,46 +34,38 @@ const WarnBadge = React.memo(
     currentLocation,
     version,
     siteId,
-    virtualElsFailed,
-    onVMode,
   }: {
     currentLocation: string;
     version: string;
     siteId: string;
-    virtualElsFailed: boolean;
-    onVMode: () => void;
   }) => {
     const { t } = useTranslation();
     const localhostWarnSiteKey = localhostWarn(siteId);
     const defaultLocalhostWarn =
       localStorage.getItem(localhostWarnSiteKey) !== '1';
-    const localhostWarnActive = Boolean(
+    const localhostWarnActive =
       currentLocation &&
       defaultLocalhostWarn &&
-      /(localhost)|(127.0.0.1)|(0.0.0.0)/.test(currentLocation)
-    )
+      /(localhost)|(127.0.0.1)|(0.0.0.0)/.test(currentLocation);
     const trackerVersion = window.env.TRACKER_VERSION ?? undefined;
     const trackerVerDiff = compareVersions(version, trackerVersion);
     const trackerWarnActive = trackerVerDiff !== VersionComparison.Same;
 
-    const [warnings, setWarnings] = React.useState<[localhostWarn: boolean, trackerWarn: boolean, virtualElsFailWarn: boolean]>([localhostWarnActive, trackerWarnActive, virtualElsFailed])
+    const [showLocalhostWarn, setLocalhostWarn] =
+      React.useState(localhostWarnActive);
+    const [showTrackerWarn, setTrackerWarn] = React.useState(trackerWarnActive);
 
-    React.useEffect(() => {
-      setWarnings([localhostWarnActive, trackerWarnActive, virtualElsFailed])
-    }, [localhostWarnActive, trackerWarnActive, virtualElsFailed])
-
-    const closeWarning = (type: 0 | 1 | 2) => {
+    const closeWarning = (type: 1 | 2) => {
       if (type === 1) {
         localStorage.setItem(localhostWarnSiteKey, '1');
+        setLocalhostWarn(false);
+      }
+      if (type === 2) {
+        setTrackerWarn(false);
       }
-      setWarnings((prev) => {
-        const newWarnings = [...prev];
-        newWarnings[type] = false;
-        return newWarnings;
-      });
     };
 
-    if (!warnings.some(el => el === true)) return null;
+    if (!showLocalhostWarn && !showTrackerWarn) return null;
 
     return (
       <div
@@ -87,7 +79,7 @@ const WarnBadge = React.memo(
           fontWeight: 500,
         }}
       >
-        {warnings[0] ? (
+        {showLocalhostWarn ? (
           <div className="px-3 py-1 border border-gray-lighter drop-shadow-md rounded bg-active-blue flex items-center justify-between">
             <div>
               <span>{t('Some assets may load incorrectly on localhost.')}</span>
@@ -109,7 +101,7 @@ const WarnBadge = React.memo(
             </div>
           </div>
         ) : null}
-        {warnings[1] ? (
+        {showTrackerWarn ? (
           <div className="px-3 py-1 border border-gray-lighter drop-shadow-md rounded bg-active-blue flex items-center justify-between">
             <div>
               <div>
@@ -133,21 +125,6 @@ const WarnBadge = React.memo(
               </div>
             </div>
 
-            <div
-              className="py-1 ml-3 cursor-pointer"
-              onClick={() => closeWarning(1)}
-            >
-              <Icon name="close" size={16} color="black" />
-            </div>
-          </div>
-        ) : null}
-        {warnings[2] ? (
-          <div className="px-3 py-1 border border-gray-lighter drop-shadow-md rounded bg-active-blue flex items-center justify-between">
-            <div className="flex flex-col">
-              <div>{t('If you have issues displaying custom HTML elements (i.e when using LWC), consider turning on Virtual Mode.')}</div>
-              <div className='link' onClick={onVMode}>{t('Enable')}</div>
-            </div>
-
             <div
               className="py-1 ml-3 cursor-pointer"
               onClick={() => closeWarning(2)}

frontend/app/components/shared/DateRangeDropdown/DateRangePopup.tsx

@@ -12,123 +12,60 @@ import {
   getDateRangeFromValue,
   getDateRangeLabel,
 } from 'App/dateRange';
-import { DateTime, Interval, Settings } from 'luxon';
+import { DateTime, Interval } from 'luxon';
 
 import styles from './dateRangePopup.module.css';
 import { useTranslation } from 'react-i18next';
 
 function DateRangePopup(props: any) {
   const { t } = useTranslation();
-  const [displayDates, setDisplayDates] = React.useState<[Date, Date]>([new Date(), new Date()]);
   const [range, setRange] = React.useState(
     props.selectedDateRange ||
       Interval.fromDateTimes(DateTime.now(), DateTime.now()),
   );
   const [value, setValue] = React.useState<string | null>(null);
 
-  React.useEffect(() => {
-      if (props.selectedDateRange) {
-        const start = new Date(
-          props.selectedDateRange.start.year,
-          props.selectedDateRange.start.month - 1, // JS months are 0-based
-          props.selectedDateRange.start.day
-        );
-        const end = new Date(
-          props.selectedDateRange.end.year,
-          props.selectedDateRange.end.month - 1,
-          props.selectedDateRange.end.day
-        );
-        setDisplayDates([start, end]);
-      }
-    }, [props.selectedDateRange]);
-
-    const createNaiveTime = (dateTime: DateTime) => {
-      if (!dateTime) return null;
-      return DateTime.fromObject({
-        hour: dateTime.hour,
-        minute: dateTime.minute
-      });
-    };
-
-
-  const selectCustomRange = (newDates: [Date, Date]) => {
-    if (!newDates || !newDates[0] || !newDates[1]) return;
-
-    setDisplayDates(newDates);
-
-    const selectedTzStart = DateTime.fromObject({
-      year: newDates[0].getFullYear(),
-      month: newDates[0].getMonth() + 1,
-      day: newDates[0].getDate(),
-      hour: 0,
-      minute: 0
-    }).setZone(Settings.defaultZone);
-
-    const selectedTzEnd = DateTime.fromObject({
-      year: newDates[1].getFullYear(),
-      month: newDates[1].getMonth() + 1,
-      day: newDates[1].getDate(),
-      hour: 23,
-      minute: 59
-    }).setZone(Settings.defaultZone);
-
-    const updatedRange = Interval.fromDateTimes(selectedTzStart, selectedTzEnd);
-    setRange(updatedRange);
+  const selectCustomRange = (range) => {
+    let newRange;
+    if (props.singleDay) {
+      newRange = Interval.fromDateTimes(
+        DateTime.fromJSDate(range),
+        DateTime.fromJSDate(range),
+      );
+    } else {
+      newRange = Interval.fromDateTimes(
+        DateTime.fromJSDate(range[0]),
+        DateTime.fromJSDate(range[1]),
+      );
+    }
+    setRange(newRange);
     setValue(CUSTOM_RANGE);
   };
 
-  const setRangeTimeStart = (naiveTime: DateTime) => {
-    if (!range.end || !naiveTime) return;
-
-    const newStart = range.start.set({
-      hour: naiveTime.hour,
-      minute: naiveTime.minute
+  const setRangeTimeStart = (value: DateTime) => {
+    if (!range.end || value > range.end) {
+      return;
+    }
+    const newRange = range.start.set({
+      hour: value.hour,
+      minute: value.minute,
     });
-
-    if (newStart > range.end) return;
-
-    setRange(Interval.fromDateTimes(newStart, range.end));
+    setRange(Interval.fromDateTimes(newRange, range.end));
     setValue(CUSTOM_RANGE);
   };
 
-  const setRangeTimeEnd = (naiveTime: DateTime) => {
-    if (!range.start || !naiveTime) return;
-
-    const newEnd = range.end.set({
-      hour: naiveTime.hour,
-      minute: naiveTime.minute
-    });
-
-    if (newEnd < range.start) return;
-
-    setRange(Interval.fromDateTimes(range.start, newEnd));
+  const setRangeTimeEnd = (value: DateTime) => {
+    if (!range.start || (value && value < range.start)) {
+      return;
+    }
+    const newRange = range.end.set({ hour: value.hour, minute: value.minute });
+    setRange(Interval.fromDateTimes(range.start, newRange));
     setValue(CUSTOM_RANGE);
   };
 
   const selectValue = (value: string) => {
-    const newRange = getDateRangeFromValue(value);
-
-    if (!newRange.start || !newRange.end) {
-      setRange(Interval.fromDateTimes(DateTime.now(), DateTime.now()));
-      setDisplayDates([new Date(), new Date()]);
-      setValue(null);
-      return;
-    }
-    const zonedStart = newRange.start.setZone(Settings.defaultZone);
-    const zonedEnd = newRange.end.setZone(Settings.defaultZone);
-    setRange(Interval.fromDateTimes(zonedStart, zonedEnd));
-
-    const start = new Date(
-      zonedStart.year,
-      zonedStart.month - 1,
-      zonedStart.day
-    );
-    const end = new Date(
-      zonedEnd.year,
-      zonedEnd.month - 1,
-      zonedEnd.day
-    );
-    setDisplayDates([start, end]);
+    const range = getDateRangeFromValue(value);
+    setRange(range);
     setValue(value);
   };
 
@@ -140,9 +77,9 @@ function DateRangePopup(props: any) {
   const isUSLocale =
     navigator.language === 'en-US' || navigator.language.startsWith('en-US');
 
-  const naiveStartTime = createNaiveTime(range.start);
-  const naiveEndTime = createNaiveTime(range.end);
-
+  const rangeForDisplay = props.singleDay
+    ? range.start.ts
+    : [range.start!.startOf('day').ts, range.end!.startOf('day').ts];
   return (
     <div className={styles.wrapper}>
       <div className={`${styles.body} h-fit`}>
@@ -166,7 +103,7 @@ function DateRangePopup(props: any) {
             shouldCloseCalendar={() => false}
             isOpen
             maxDate={new Date()}
-            value={displayDates}
+            value={rangeForDisplay}
             calendarProps={{
               tileDisabled: props.isTileDisabled,
               selectRange: !props.singleDay,
@@ -185,7 +122,7 @@ function DateRangePopup(props: any) {
             <span>{range.start.toFormat(isUSLocale ? 'MM/dd' : 'dd/MM')} </span>
             <TimePicker
               format={isUSLocale ? 'hh:mm a' : 'HH:mm'}
-              value={naiveStartTime}
+              value={range.start}
               onChange={setRangeTimeStart}
               needConfirm={false}
               showNow={false}
@@ -195,7 +132,7 @@ function DateRangePopup(props: any) {
             <span>{range.end.toFormat(isUSLocale ? 'MM/dd' : 'dd/MM')} </span>
             <TimePicker
               format={isUSLocale ? 'hh:mm a' : 'HH:mm'}
-              value={naiveEndTime}
+              value={range.end}
               onChange={setRangeTimeEnd}
               needConfirm={false}
               showNow={false}

frontend/app/components/shared/DevTools/NetworkPanel/NetworkPanel.tsx

@@ -1,17 +1,9 @@
 /* eslint-disable i18next/no-literal-string */
 import { ResourceType, Timed } from 'Player';
-import { WsChannel } from 'Player/web/messages';
 import MobilePlayer from 'Player/mobile/IOSPlayer';
 import WebPlayer from 'Player/web/WebPlayer';
 import { observer } from 'mobx-react-lite';
-import React, {
-  useMemo,
-  useState,
-  useEffect,
-  useCallback,
-  useRef,
-} from 'react';
-import i18n from 'App/i18n'
+import React, { useMemo, useState } from 'react';
 
 import { useModal } from 'App/components/Modal';
 import {
@@ -20,27 +12,25 @@ import {
 } from 'App/components/Session/playerContext';
 import { formatMs } from 'App/date';
 import { useStore } from 'App/mstore';
-import { formatBytes, debounceCall } from 'App/utils';
+import { formatBytes } from 'App/utils';
 import { Icon, NoContent, Tabs } from 'UI';
 import { Tooltip, Input, Switch, Form } from 'antd';
-import {
-  SearchOutlined,
-  InfoCircleOutlined,
-} from '@ant-design/icons';
+import { SearchOutlined, InfoCircleOutlined } from '@ant-design/icons';
 
 import FetchDetailsModal from 'Shared/FetchDetailsModal';
+import { WsChannel } from 'App/player/web/messages';
 
 import BottomBlock from '../BottomBlock';
 import InfoLine from '../BottomBlock/InfoLine';
 import TabSelector from '../TabSelector';
 import TimeTable from '../TimeTable';
 import useAutoscroll, { getLastItemTime } from '../useAutoscroll';
+import { useRegExListFilterMemo, useTabListFilterMemo } from '../useListFilter';
 import WSPanel from './WSPanel';
 import { useTranslation } from 'react-i18next';
-import { mergeListsWithZoom, processInChunks } from './utils'
 
-// Constants remain the same
 const INDEX_KEY = 'network';
+
 const ALL = 'ALL';
 const XHR = 'xhr';
 const JS = 'js';
@@ -72,9 +62,6 @@ export const NETWORK_TABS = TAP_KEYS.map((tab) => ({
 const DOM_LOADED_TIME_COLOR = 'teal';
 const LOAD_TIME_COLOR = 'red';
 
-const BATCH_SIZE = 2500;
-const INITIAL_LOAD_SIZE = 5000;
-
 export function renderType(r: any) {
   return (
     <Tooltip style={{ width: '100%' }} title={<div>{r.type}</div>}>
@@ -92,17 +79,13 @@ export function renderName(r: any) {
 }
 
 function renderSize(r: any) {
-  const t = i18n.t;
-  const notCaptured = t('Not captured');
-  const resSizeStr = t('Resource size')
+  const { t } = useTranslation();
+  if (r.responseBodySize) return formatBytes(r.responseBodySize);
   let triggerText;
   let content;
-  if (r.responseBodySize) {
-    triggerText = formatBytes(r.responseBodySize);
-    content = undefined;
-  } else if (r.decodedBodySize == null || r.decodedBodySize === 0) {
+  if (r.decodedBodySize == null || r.decodedBodySize === 0) {
     triggerText = 'x';
-    content = notCaptured;
+    content = t('Not captured');
   } else {
     const headerSize = r.headerSize || 0;
     const showTransferred = r.headerSize != null;
@@ -117,7 +100,7 @@ function renderSize(r: any) {
             )} transferred over network`}
           </li>
         )}
-        <li>{`${resSizeStr}: ${formatBytes(r.decodedBodySize)} `}</li>
+        <li>{`${t('Resource size')}: ${formatBytes(r.decodedBodySize)} `}</li>
       </ul>
     );
   }
@@ -185,8 +168,6 @@ function renderStatus({
   );
 }
 
-
-// Main component for Network Panel
 function NetworkPanelCont({ panelHeight }: { panelHeight: number }) {
   const { player, store } = React.useContext(PlayerContext);
   const { sessionStore, uiPlayerStore } = useStore();
@@ -235,7 +216,6 @@ function NetworkPanelCont({ panelHeight }: { panelHeight: number }) {
 
   const getTabNum = (tab: string) => tabsArr.findIndex((t) => t === tab) + 1;
   const getTabName = (tabId: string) => tabNames[tabId];
-
   return (
     <NetworkPanelComp
       loadTime={loadTime}
@@ -248,8 +228,8 @@ function NetworkPanelCont({ panelHeight }: { panelHeight: number }) {
       resourceListNow={resourceListNow}
       player={player}
       startedAt={startedAt}
-      websocketList={websocketList}
-      websocketListNow={websocketListNow}
+      websocketList={websocketList as WSMessage[]}
+      websocketListNow={websocketListNow as WSMessage[]}
       getTabNum={getTabNum}
       getTabName={getTabName}
       showSingleTab={showSingleTab}
@@ -289,7 +269,9 @@ function MobileNetworkPanelCont({ panelHeight }: { panelHeight: number }) {
       resourceListNow={resourceListNow}
       player={player}
       startedAt={startedAt}
+      // @ts-ignore
       websocketList={websocketList}
+      // @ts-ignore
       websocketListNow={websocketListNow}
       zoomEnabled={zoomEnabled}
       zoomStartTs={zoomStartTs}
@@ -298,35 +280,12 @@ function MobileNetworkPanelCont({ panelHeight }: { panelHeight: number }) {
   );
 }
 
-const useInfiniteScroll = (loadMoreCallback: () => void, hasMore: boolean) => {
-  const observerRef = useRef<IntersectionObserver>(null);
-  const loadingRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0]?.isIntersecting && hasMore) {
-          loadMoreCallback();
-        }
-      },
-      { threshold: 0.1 },
-    );
-
-    if (loadingRef.current) {
-      observer.observe(loadingRef.current);
-    }
-
-    // @ts-ignore
-    observerRef.current = observer;
-
-    return () => {
-      if (observerRef.current) {
-        observerRef.current.disconnect();
-      }
-    };
-  }, [loadMoreCallback, hasMore, loadingRef]);
-
-  return loadingRef;
+type WSMessage = Timed & {
+  channelName: string;
+  data: string;
+  timestamp: number;
+  dir: 'up' | 'down';
+  messageType: string;
 };
 
 interface Props {
@@ -343,8 +302,8 @@ interface Props {
   resourceList: Timed[];
   fetchListNow: Timed[];
   resourceListNow: Timed[];
-  websocketList: Array<WsChannel>;
-  websocketListNow: Array<WsChannel>;
+  websocketList: Array<WSMessage>;
+  websocketListNow: Array<WSMessage>;
   player: WebPlayer | MobilePlayer;
   startedAt: number;
   isMobile?: boolean;
@@ -390,189 +349,107 @@ export const NetworkPanelComp = observer(
     >(null);
     const { showModal } = useModal();
     const [showOnlyErrors, setShowOnlyErrors] = useState(false);
+
     const [isDetailsModalActive, setIsDetailsModalActive] = useState(false);
-    const [isLoading, setIsLoading] = useState(true);
-    const [isProcessing, setIsProcessing] = useState(false);
-    const [displayedItems, setDisplayedItems] = useState([]);
-    const [totalItems, setTotalItems] = useState(0);
-    const [summaryStats, setSummaryStats] = useState({
-      resourcesSize: 0,
-      transferredSize: 0,
-    });
-
-    const originalListRef = useRef([]);
-    const socketListRef = useRef([]);
-
     const {
       sessionStore: { devTools },
     } = useStore();
     const { filter } = devTools[INDEX_KEY];
     const { activeTab } = devTools[INDEX_KEY];
     const activeIndex = activeOutsideIndex ?? devTools[INDEX_KEY].index;
-    const [inputFilterValue, setInputFilterValue] = useState(filter);
 
-    const debouncedFilter = useCallback(
-      debounceCall((filterValue) => {
-        devTools.update(INDEX_KEY, { filter: filterValue });
-      }, 300),
-      [],
+    const socketList = useMemo(
+      () =>
+        websocketList.filter(
+          (ws, i, arr) =>
+            arr.findIndex((it) => it.channelName === ws.channelName) === i,
+        ),
+      [websocketList],
     );
 
-    // Process socket lists once
-    useEffect(() => {
-      const uniqueSocketList = websocketList.filter(
-        (ws, i, arr) =>
-          arr.findIndex((it) => it.channelName === ws.channelName) === i,
-      );
-      socketListRef.current = uniqueSocketList;
-    }, [websocketList.length]);
-
-    // Initial data processing - do this only once when data changes
-    useEffect(() => {
-      setIsLoading(true);
-
-      // Heaviest operation here, will create a final merged network list
-      const processData = async () => {
-        const fetchUrls = new Set(
-          fetchList.map((ft) => {
-            return `${ft.name}-${Math.floor(ft.time / 100)}-${Math.floor(ft.duration / 100)}`;
-          }),
-        );
-
-        // We want to get resources that aren't in fetch list
-        const filteredResources = await processInChunks(resourceList, (chunk) =>
-          chunk.filter((res: any) => {
-            const key = `${res.name}-${Math.floor(res.time / 100)}-${Math.floor(res.duration / 100)}`;
-            return !fetchUrls.has(key);
-          }),
-          BATCH_SIZE,
-          25,
-        );
-
-        const processedSockets = socketListRef.current.map((ws: any) => ({
-          ...ws,
-          type: 'websocket',
-          method: 'ws',
-          url: ws.channelName,
-          name: ws.channelName,
-          status: '101',
-          duration: 0,
-          transferredBodySize: 0,
-        }));
-
-        const mergedList: Timed[] = mergeListsWithZoom(
-          filteredResources as Timed[],
-          fetchList,
-          processedSockets as Timed[],
-          { enabled: Boolean(zoomEnabled), start: zoomStartTs ?? 0, end: zoomEndTs ?? 0 }
-        )
-
-        originalListRef.current = mergedList;
-        setTotalItems(mergedList.length);
-
-        calculateResourceStats(resourceList);
-
-        // Only display initial chunk
-        setDisplayedItems(mergedList.slice(0, INITIAL_LOAD_SIZE));
-        setIsLoading(false);
-      };
-
-      void processData();
-    }, [
-      resourceList.length,
-      fetchList.length,
-      socketListRef.current.length,
-      zoomEnabled,
-      zoomStartTs,
-      zoomEndTs,
-    ]);
-
-    const calculateResourceStats = (resourceList: Record<string, any>) => {
-      setTimeout(() => {
-        let resourcesSize = 0
-        let transferredSize = 0
-        resourceList.forEach(({ decodedBodySize, headerSize, encodedBodySize }: any) => {
-          resourcesSize += decodedBodySize || 0
-          transferredSize += (headerSize || 0) + (encodedBodySize || 0)
-        })
-
-        setSummaryStats({
-          resourcesSize,
-          transferredSize,
-        });
-      }, 0);
-    }
-
-    useEffect(() => {
-      if (originalListRef.current.length === 0) return;
-      setIsProcessing(true);
-      const applyFilters = async () => {
-        let filteredItems: any[] = originalListRef.current;
-
-        filteredItems = await processInChunks(filteredItems, (chunk) =>
-          chunk.filter(
-            (it) => {
-              let valid = true;
-              if (showOnlyErrors) {
-                valid = parseInt(it.status) >= 400 || !it.success || it.error
-              }
-              if (filter) {
-                try {
-                  const regex = new RegExp(filter, 'i');
-                  valid = valid && regex.test(it.status) || regex.test(it.name) || regex.test(it.type) || regex.test(it.method);
-                } catch (e) {
-                  valid = valid && String(it.status).includes(filter) || it.name.includes(filter) || it.type.includes(filter) || (it.method && it.method.includes(filter));
+    const list = useMemo(
+      () =>
+        // TODO: better merge (with body size info) - do it in player
+        resourceList
+          .filter(
+            (res) =>
+              !fetchList.some((ft) => {
+                // res.url !== ft.url doesn't work on relative URLs appearing within fetchList (to-fix in player)
+                if (res.name === ft.name) {
+                  if (res.time === ft.time) return true;
+                  if (res.url.includes(ft.url)) {
+                    return (
+                      Math.abs(res.time - ft.time) < 350 ||
+                      Math.abs(res.timestamp - ft.timestamp) < 350
+                    );
+                  }
                 }
-              }
-              if (activeTab !== ALL) {
-                valid = valid && TYPE_TO_TAB[it.type] === activeTab;
-              }
 
-              return valid;
-            },
-          ),
-        );
+                if (res.name !== ft.name) {
+                  return false;
+                }
+                if (Math.abs(res.time - ft.time) > 250) {
+                  return false;
+                } // TODO: find good epsilons
+                if (Math.abs(res.duration - ft.duration) > 200) {
+                  return false;
+                }
 
-        // Update displayed items
-        setDisplayedItems(filteredItems.slice(0, INITIAL_LOAD_SIZE));
-        setTotalItems(filteredItems.length);
-        setIsProcessing(false);
-      };
+                return true;
+              }),
+          )
+          .concat(fetchList)
+          .concat(
+            socketList.map((ws) => ({
+              ...ws,
+              type: 'websocket',
+              method: 'ws',
+              url: ws.channelName,
+              name: ws.channelName,
+              status: '101',
+              duration: 0,
+              transferredBodySize: 0,
+            })),
+          )
+          .filter((req) =>
+            zoomEnabled
+              ? req.time >= zoomStartTs! && req.time <= zoomEndTs!
+              : true,
+          )
+          .sort((a, b) => a.time - b.time),
+      [resourceList.length, fetchList.length, socketList.length],
+    );
 
-      void applyFilters();
-    }, [filter, activeTab, showOnlyErrors]);
+    let filteredList = useMemo(() => {
+      if (!showOnlyErrors) {
+        return list;
+      }
+      return list.filter(
+        (it) => parseInt(it.status) >= 400 || !it.success || it.error,
+      );
+    }, [showOnlyErrors, list]);
+    filteredList = useRegExListFilterMemo(
+      filteredList,
+      (it) => [it.status, it.name, it.type, it.method],
+      filter,
+    );
+    filteredList = useTabListFilterMemo(
+      filteredList,
+      (it) => TYPE_TO_TAB[it.type],
+      ALL,
+      activeTab,
+    );
 
-    const loadMoreItems = useCallback(() => {
-      if (isProcessing) return;
-
-      setIsProcessing(true);
-      setTimeout(() => {
-        setDisplayedItems((prevItems) => {
-          const currentLength = prevItems.length;
-          const newItems = originalListRef.current.slice(
-            currentLength,
-            currentLength + BATCH_SIZE,
-          );
-          return [...prevItems, ...newItems];
-        });
-        setIsProcessing(false);
-      }, 10);
-    }, [isProcessing]);
-
-    const hasMoreItems = displayedItems.length < totalItems;
-    const loadingRef = useInfiniteScroll(loadMoreItems, hasMoreItems);
-
-    const onTabClick = (activeTab) => {
+    const onTabClick = (activeTab: (typeof TAP_KEYS)[number]) =>
       devTools.update(INDEX_KEY, { activeTab });
-    };
-
-    const onFilterChange = ({ target: { value } }) => {
-      setInputFilterValue(value)
-      debouncedFilter(value);
-    };
+    const onFilterChange = ({
+      target: { value },
+    }: React.ChangeEvent<HTMLInputElement>) =>
+      devTools.update(INDEX_KEY, { filter: value });
 
+    // AutoScroll
     const [timeoutStartAutoscroll, stopAutoscroll] = useAutoscroll(
-      displayedItems,
+      filteredList,
       getLastItemTime(fetchListNow, resourceListNow),
       activeIndex,
       (index) => devTools.update(INDEX_KEY, { index }),
@@ -585,6 +462,24 @@ export const NetworkPanelComp = observer(
       timeoutStartAutoscroll();
     };
 
+    const resourcesSize = useMemo(
+      () =>
+        resourceList.reduce(
+          (sum, { decodedBodySize }) => sum + (decodedBodySize || 0),
+          0,
+        ),
+      [resourceList.length],
+    );
+    const transferredSize = useMemo(
+      () =>
+        resourceList.reduce(
+          (sum, { headerSize, encodedBodySize }) =>
+            sum + (headerSize || 0) + (encodedBodySize || 0),
+          0,
+        ),
+      [resourceList.length],
+    );
+
     const referenceLines = useMemo(() => {
       const arr = [];
 
@@ -618,7 +513,7 @@ export const NetworkPanelComp = observer(
           isSpot={isSpot}
           time={item.time + startedAt}
           resource={item}
-          rows={displayedItems}
+          rows={filteredList}
           fetchPresented={fetchList.length > 0}
         />,
         {
@@ -630,10 +525,12 @@ export const NetworkPanelComp = observer(
           },
         },
       );
+      devTools.update(INDEX_KEY, { index: filteredList.indexOf(item) });
+      stopAutoscroll();
     };
 
-    const tableCols = useMemo(() => {
-      const cols = [
+    const tableCols = React.useMemo(() => {
+      const cols: any[] = [
         {
           label: t('Status'),
           dataKey: 'status',
@@ -688,7 +585,7 @@ export const NetworkPanelComp = observer(
         });
       }
       return cols;
-    }, [showSingleTab, activeTab, t, getTabName, getTabNum, isSpot]);
+    }, [showSingleTab]);
 
     return (
       <BottomBlock
@@ -720,7 +617,7 @@ export const NetworkPanelComp = observer(
               name="filter"
               onChange={onFilterChange}
               width={280}
-              value={inputFilterValue}
+              value={filter}
               size="small"
               prefix={<SearchOutlined className="text-neutral-400" />}
             />
@@ -728,7 +625,7 @@ export const NetworkPanelComp = observer(
         </BottomBlock.Header>
         <BottomBlock.Content>
           <div className="flex items-center justify-between px-4 border-b bg-teal/5 h-8">
-            <div className="flex items-center">
+            <div>
               <Form.Item name="show-errors-only" className="mb-0">
                 <label
                   style={{
@@ -745,29 +642,21 @@ export const NetworkPanelComp = observer(
                   <span className="text-sm ms-2">4xx-5xx Only</span>
                 </label>
               </Form.Item>
-
-              {isProcessing && (
-                <span className="text-xs text-gray-500 ml-4">
-                  Processing data...
-                </span>
-              )}
             </div>
             <InfoLine>
-              <InfoLine.Point label={`${totalItems}`} value="requests" />
               <InfoLine.Point
-                label={`${displayedItems.length}/${totalItems}`}
-                value="displayed"
-                display={displayedItems.length < totalItems}
+                label={`${filteredList.length}`}
+                value=" requests"
               />
               <InfoLine.Point
-                label={formatBytes(summaryStats.transferredSize)}
+                label={formatBytes(transferredSize)}
                 value="transferred"
-                display={summaryStats.transferredSize > 0}
+                display={transferredSize > 0}
               />
               <InfoLine.Point
-                label={formatBytes(summaryStats.resourcesSize)}
+                label={formatBytes(resourcesSize)}
                 value="resources"
-                display={summaryStats.resourcesSize > 0}
+                display={resourcesSize > 0}
               />
               <InfoLine.Point
                 label={formatMs(domBuildingTime)}
@@ -790,67 +679,42 @@ export const NetworkPanelComp = observer(
               />
             </InfoLine>
           </div>
-
-          {isLoading ? (
-            <div className="flex items-center justify-center h-full">
-              <div className="text-center">
-                <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900 mx-auto mb-2"></div>
-                <p>Processing initial network data...</p>
+          <NoContent
+            title={
+              <div className="capitalize flex items-center gap-2">
+                <InfoCircleOutlined size={18} />
+                {t('No Data')}
               </div>
-            </div>
-          ) : (
-            <NoContent
-              title={
-                <div className="capitalize flex items-center gap-2">
-                  <InfoCircleOutlined size={18} />
-                  {t('No Data')}
-                </div>
-              }
-              size="small"
-              show={displayedItems.length === 0}
+            }
+            size="small"
+            show={filteredList.length === 0}
+          >
+            {/* @ts-ignore */}
+            <TimeTable
+              rows={filteredList}
+              tableHeight={panelHeight - 102}
+              referenceLines={referenceLines}
+              renderPopup
+              onRowClick={showDetailsModal}
+              sortBy="time"
+              sortAscending
+              onJump={(row: any) => {
+                devTools.update(INDEX_KEY, {
+                  index: filteredList.indexOf(row),
+                });
+                player.jump(row.time);
+              }}
+              activeIndex={activeIndex}
             >
-              <div>
-                <TimeTable
-                  rows={displayedItems}
-                  tableHeight={panelHeight - 102 - (hasMoreItems ? 30 : 0)}
-                  referenceLines={referenceLines}
-                  renderPopup
-                  onRowClick={showDetailsModal}
-                  sortBy="time"
-                  sortAscending
-                  onJump={(row) => {
-                    devTools.update(INDEX_KEY, {
-                      index: displayedItems.indexOf(row),
-                    });
-                    player.jump(row.time);
-                  }}
-                  activeIndex={activeIndex}
-                >
-                  {tableCols}
-                </TimeTable>
-
-                {hasMoreItems && (
-                  <div
-                    ref={loadingRef}
-                    className="flex justify-center items-center text-xs text-gray-500"
-                  >
-                      <div className="flex items-center">
-                        <div className="animate-spin rounded-full h-4 w-4 border-b-2 border-gray-600 mr-2"></div>
-                        Loading more data ({totalItems - displayedItems.length}{' '}
-                        remaining)
-                      </div>
-                  </div>
-                )}
-              </div>
-
-              {selectedWsChannel ? (
-                <WSPanel
-                  socketMsgList={selectedWsChannel}
-                  onClose={() => setSelectedWsChannel(null)}
-                />
-              ) : null}
-            </NoContent>
-          )}
+              {tableCols}
+            </TimeTable>
+            {selectedWsChannel ? (
+              <WSPanel
+                socketMsgList={selectedWsChannel}
+                onClose={() => setSelectedWsChannel(null)}
+              />
+            ) : null}
+          </NoContent>
         </BottomBlock.Content>
       </BottomBlock>
     );
@@ -858,6 +722,7 @@ export const NetworkPanelComp = observer(
 );
 
 const WebNetworkPanel = observer(NetworkPanelCont);
+
 const MobileNetworkPanel = observer(MobileNetworkPanelCont);
 
 export { WebNetworkPanel, MobileNetworkPanel };

frontend/app/components/shared/DevTools/NetworkPanel/utils.ts

@@ -1,178 +0,0 @@
-export function mergeListsWithZoom<
-  T extends Record<string, any>,
-  Y extends Record<string, any>,
-  Z extends Record<string, any>,
->(
-  arr1: T[],
-  arr2: Y[],
-  arr3: Z[],
-  zoom?: { enabled: boolean; start: number; end: number },
-): Array<T | Y | Z> {
-  // Early return for empty arrays
-  if (arr1.length === 0 && arr2.length === 0 && arr3.length === 0) {
-    return [];
-  }
-
-  // Optimized for common case - no zoom
-  if (!zoom?.enabled) {
-    return mergeThreeSortedArrays(arr1, arr2, arr3);
-  }
-
-  // Binary search for start indexes (faster than linear search for large arrays)
-  const index1 = binarySearchStartIndex(arr1, zoom.start);
-  const index2 = binarySearchStartIndex(arr2, zoom.start);
-  const index3 = binarySearchStartIndex(arr3, zoom.start);
-
-  // Merge arrays within zoom range
-  return mergeThreeSortedArraysWithinRange(
-    arr1,
-    arr2,
-    arr3,
-    index1,
-    index2,
-    index3,
-    zoom.start,
-    zoom.end,
-  );
-}
-
-function binarySearchStartIndex<T extends Record<string, any>>(
-  arr: T[],
-  threshold: number,
-): number {
-  if (arr.length === 0) return 0;
-
-  let low = 0;
-  let high = arr.length - 1;
-
-  // Handle edge cases first for better performance
-  if (arr[high].time < threshold) return arr.length;
-  if (arr[low].time >= threshold) return 0;
-
-  while (low <= high) {
-    const mid = Math.floor((low + high) / 2);
-
-    if (arr[mid].time < threshold) {
-      low = mid + 1;
-    } else {
-      high = mid - 1;
-    }
-  }
-
-  return low;
-}
-
-function mergeThreeSortedArrays<
-  T extends Record<string, any>,
-  Y extends Record<string, any>,
-  Z extends Record<string, any>,
->(arr1: T[], arr2: Y[], arr3: Z[]): Array<T | Y | Z> {
-  const totalLength = arr1.length + arr2.length + arr3.length;
-  // prealloc array size
-  const result = new Array(totalLength);
-
-  let i = 0,
-    j = 0,
-    k = 0,
-    index = 0;
-
-  while (i < arr1.length || j < arr2.length || k < arr3.length) {
-    const val1 = i < arr1.length ? arr1[i].time : Infinity;
-    const val2 = j < arr2.length ? arr2[j].time : Infinity;
-    const val3 = k < arr3.length ? arr3[k].time : Infinity;
-
-    if (val1 <= val2 && val1 <= val3) {
-      result[index++] = arr1[i++];
-    } else if (val2 <= val1 && val2 <= val3) {
-      result[index++] = arr2[j++];
-    } else {
-      result[index++] = arr3[k++];
-    }
-  }
-
-  return result;
-}
-
-// same as above, just with zoom stuff
-function mergeThreeSortedArraysWithinRange<
-  T extends Record<string, any>,
-  Y extends Record<string, any>,
-  Z extends Record<string, any>,
->(
-  arr1: T[],
-  arr2: Y[],
-  arr3: Z[],
-  startIdx1: number,
-  startIdx2: number,
-  startIdx3: number,
-  start: number,
-  end: number,
-): Array<T | Y | Z> {
-  // we don't know beforehand how many items will be there
-  const result = [];
-
-  let i = startIdx1;
-  let j = startIdx2;
-  let k = startIdx3;
-
-  while (i < arr1.length || j < arr2.length || k < arr3.length) {
-    const val1 = i < arr1.length ? arr1[i].time : Infinity;
-    const val2 = j < arr2.length ? arr2[j].time : Infinity;
-    const val3 = k < arr3.length ? arr3[k].time : Infinity;
-
-    // Early termination: if all remaining values exceed end time
-    if (Math.min(val1, val2, val3) > end) {
-      break;
-    }
-
-    if (val1 <= val2 && val1 <= val3) {
-      if (val1 <= end) {
-        result.push(arr1[i]);
-      }
-      i++;
-    } else if (val2 <= val1 && val2 <= val3) {
-      if (val2 <= end) {
-        result.push(arr2[j]);
-      }
-      j++;
-    } else {
-      if (val3 <= end) {
-        result.push(arr3[k]);
-      }
-      k++;
-    }
-  }
-
-  return result;
-}
-
-export function processInChunks(
-  items: any[],
-  processFn: (item: any) => any,
-  chunkSize = 1000,
-  overscan = 0,
-) {
-  return new Promise((resolve) => {
-    if (items.length === 0) {
-      resolve([]);
-      return;
-    }
-
-    let result: any[] = [];
-    let index = 0;
-
-    const processNextChunk = () => {
-      const chunk = items.slice(index, index + chunkSize + overscan);
-      result = result.concat(processFn(chunk));
-      index += chunkSize;
-
-      if (index < items.length) {
-        setTimeout(processNextChunk, 0);
-      } else {
-        resolve(result);
-      }
-    };
-
-    processNextChunk();
-  });
-}

frontend/app/components/shared/Filters/FilterAutoComplete/AutocompleteModal.tsx

@@ -5,7 +5,6 @@ import cn from 'classnames';
 import { Loader } from 'UI';
 import OutsideClickDetectingDiv from 'Shared/OutsideClickDetectingDiv';
 import { useTranslation } from 'react-i18next';
-import { VList } from 'virtua';
 
 function TruncatedText({
   text,
@@ -125,7 +124,7 @@ export function AutocompleteModal({
       if (index === blocksAmount - 1 && blocksAmount > 1) {
         str += ' and ';
       }
-      str += block.trim();
+      str += `"${block.trim()}"`;
       if (index < blocksAmount - 2) {
         str += ', ';
       }
@@ -171,27 +170,25 @@ export function AutocompleteModal({
           <>
             <div
               className="flex flex-col gap-2 overflow-y-auto py-2 overflow-x-hidden text-ellipsis"
-              style={{ height: Math.min(sortedOptions.length * 32, 240) }}
+              style={{ maxHeight: 200 }}
             >
-              <VList count={sortedOptions.length} itemSize={18}>
-                {sortedOptions.map((item) => (
-                  <div
-                    key={item.value}
-                    onClick={() => onSelectOption(item)}
-                    className="cursor-pointer w-full py-1 hover:bg-active-blue rounded px-2"
-                  >
-                    <Checkbox checked={isSelected(item)} /> {item.label}
-                  </div>
-                ))}
-              </VList>
+              {sortedOptions.map((item) => (
+                <div
+                  key={item.value}
+                  onClick={() => onSelectOption(item)}
+                  className="cursor-pointer w-full py-1 hover:bg-active-blue rounded px-2"
+                >
+                  <Checkbox checked={isSelected(item)} /> {item.label}
+                </div>
+              ))}
             </div>
             {query.length ? (
               <div className="border-y border-y-gray-light py-2">
                 <div
-                  className="whitespace-nowrap truncate w-full rounded cursor-pointer text-teal hover:bg-active-blue px-2 py-1"
+                  className="whitespace-normal rounded cursor-pointer text-teal hover:bg-active-blue px-2 py-1"
                   onClick={applyQuery}
                 >
-                  {t('Apply')}&nbsp;<span className='font-semibold'>{queryStr}</span>
+                  {t('Apply')}&nbsp;{queryStr}
                 </div>
               </div>
             ) : null}

frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx

@@ -128,10 +128,8 @@ const FilterAutoComplete = observer(
     };
 
     const handleFocus = () => {
-      if (!initialFocus) {
-        setOptions(topValues.map((i) => ({ value: i.value, label: i.value })));
-      }
       setInitialFocus(true);
+      setOptions(topValues.map((i) => ({ value: i.value, label: i.value })));
     };
 
     return (

frontend/app/components/shared/SessionItem/MetaItem/MetaItem.tsx

@@ -19,13 +19,11 @@ export default function MetaItem(props: Props) {
       <TextEllipsis
         text={label}
         className="p-0"
-        maxWidth={'300px'}
         popupProps={{ size: 'small', disabled: true }}
       />
       <span className="bg-neutral-200 inline-block w-[1px] min-h-[17px]"></span>
       <TextEllipsis
         text={value}
-        maxWidth={'350px'}
         className="p-0 text-neutral-500"
         popupProps={{ size: 'small', disabled: true }}
       />

frontend/app/components/shared/SessionItem/SessionMetaList/SessionMetaList.tsx

@@ -7,15 +7,13 @@ interface Props {
   className?: string;
   metaList: any[];
   maxLength?: number;
-  onMetaClick?: (meta: { name: string, value: string }) => void;
-  horizontal?: boolean;
 }
 
 export default function SessionMetaList(props: Props) {
-  const { className = '', metaList, maxLength = 14, horizontal = false } = props;
+  const { className = '', metaList, maxLength = 14 } = props;
 
   return (
-    <div className={cn('flex items-center gap-1', horizontal ? '' : 'flex-wrap', className)}>
+    <div className={cn('flex items-center flex-wrap gap-1', className)}>
       {metaList.slice(0, maxLength).map(({ label, value }, index) => (
         <React.Fragment key={index}>
           <MetaItem label={label} value={`${value}`} />

frontend/app/components/shared/SessionSettings/SessionSettings.tsx

@@ -5,7 +5,6 @@ import ListingVisibility from './components/ListingVisibility';
 import DefaultPlaying from './components/DefaultPlaying';
 import DefaultTimezone from './components/DefaultTimezone';
 import CaptureRate from './components/CaptureRate';
-
 import { useTranslation } from 'react-i18next';
 
 function SessionSettings() {

frontend/app/components/shared/SessionSettings/components/VirtualMode.tsx

@@ -1,30 +0,0 @@
-import React from 'react';
-import { useStore } from 'App/mstore';
-import { observer } from 'mobx-react-lite';
-import { Switch } from 'UI';
-import { useTranslation } from 'react-i18next';
-
-function VirtualModeSettings() {
-  const { settingsStore } = useStore();
-  const { sessionSettings } = settingsStore;
-  const { virtualMode } = sessionSettings;
-  const { t } = useTranslation();
-
-  const updateSettings = (checked: boolean) => {
-    settingsStore.sessionSettings.updateKey('virtualMode', !virtualMode);
-  };
-
-  return (
-    <div>
-      <h3 className="text-lg">{t('Virtual Mode')}</h3>
-      <div className="my-1">
-        {t('Change this setting if you have issues with recordings containing Lightning Web Components (or similar custom HTML Element libraries).')}
-      </div>
-      <div className="mt-2">
-        <Switch onChange={updateSettings} checked={virtualMode} />
-      </div>
-    </div>
-  );
-}
-
-export default observer(VirtualModeSettings);

frontend/app/constants/storageKeys.ts

@@ -9,7 +9,6 @@ export const GLOBAL_HAS_NO_RECORDINGS = '__$global-hasNoRecordings$__';
 export const SITE_ID_STORAGE_KEY = '__$user-siteId$__';
 export const GETTING_STARTED = '__$user-gettingStarted$__';
 export const MOUSE_TRAIL = '__$session-mouseTrail$__';
-export const VIRTUAL_MODE_KEY = '__$session-virtualMode$__'
 export const IFRAME = '__$session-iframe$__';
 export const JWT_PARAM = '__$session-jwt-param$__';
 export const MENU_COLLAPSED = '__$global-menuCollapsed$__';

frontend/app/locales/en.json

@@ -503,7 +503,7 @@
   "Returning users between": "Returning users between",
   "Sessions": "Sessions",
   "No recordings found.": "No recordings found.",
-  "Get new image": "Get new image",
+  "Get new session": "Get new session",
   "The number of cards in one dashboard is limited to 30.": "The number of cards in one dashboard is limited to 30.",
   "Add Card": "Add Card",
   "Create Dashboard": "Create Dashboard",

frontend/app/locales/es.json

@@ -503,7 +503,7 @@
   "Returning users between": "Usuarios recurrentes entre",
   "Sessions": "Sesiones",
   "No recordings found.": "No se encontraron grabaciones.",
-  "Get new image": "Obtener nueva sesión",
+  "Get new session": "Obtener nueva sesión",
   "The number of cards in one dashboard is limited to 30.": "El número de tarjetas en un panel está limitado a 30.",
   "Add Card": "Agregar tarjeta",
   "Create Dashboard": "Crear panel",

frontend/app/locales/fr.json

@@ -503,7 +503,7 @@
   "Returning users between": "Utilisateurs récurrents entre",
   "Sessions": "Sessions",
   "No recordings found.": "Aucun enregistrement trouvé.",
-  "Get new image": "Obtenir une nouvelle session",
+  "Get new session": "Obtenir une nouvelle session",
   "The number of cards in one dashboard is limited to 30.": "Le nombre de cartes dans un tableau de bord est limité à 30.",
   "Add Card": "Ajouter une carte",
   "Create Dashboard": "Créer un tableau de bord",

frontend/app/locales/ru.json

@@ -504,7 +504,7 @@
   "Returning users between": "Возвращающиеся пользователи за период",
   "Sessions": "Сессии",
   "No recordings found.": "Записей не найдено.",
-  "Get new image": "Получить новую сессию",
+  "Get new session": "Получить новую сессию",
   "The number of cards in one dashboard is limited to 30.": "Количество карточек в одном дашборде ограничено 30.",
   "Add Card": "Добавить карточку",
   "Create Dashboard": "Создать дашборд",
@@ -1498,8 +1498,5 @@
   "More attribute": "Еще атрибут",
   "More attributes": "Еще атрибуты",
   "Account settings updated successfully": "Настройки аккаунта успешно обновлены",
-  "Include rage clicks": "Включить невыносимые клики",
-  "Interface Language": "Язык интерфейса",
-  "Select the language in which OpenReplay will appear.": "Выберите язык, на котором будет отображаться OpenReplay.",
-  "Language": "Язык"
-}
+  "Include rage clicks": "Включить невыносимые клики"
+} 

frontend/app/locales/zh.json

@@ -503,7 +503,7 @@
   "Returning users between": "回访用户区间",
   "Sessions": "会话",
   "No recordings found.": "未找到录制。",
-  "Get new image": "获取新会话",
+  "Get new session": "获取新会话",
   "The number of cards in one dashboard is limited to 30.": "一个仪表板最多可包含30个卡片。",
   "Add Card": "添加卡片",
   "Create Dashboard": "创建仪表板",

frontend/app/mstore/dashboardStore.ts

@@ -1,13 +1,11 @@
-import { makeAutoObservable, runInAction, reaction } from 'mobx';
+import { makeAutoObservable, runInAction } from 'mobx';
 import { dashboardService, metricService } from 'App/services';
 import { toast } from 'react-toastify';
-import Period, { LAST_24_HOURS } from 'Types/app/period';
+import Period, { LAST_24_HOURS, LAST_7_DAYS } from 'Types/app/period';
 import { getRE } from 'App/utils';
 import Filter from './types/filter';
 import Widget from './types/widget';
 import Dashboard from './types/dashboard';
-import { calculateGranularities } from '@/components/Dashboard/components/WidgetDateRange/RangeGranularity';
-import { CUSTOM_RANGE } from '@/dateRange';
 
 interface DashboardFilter {
   query?: string;
@@ -38,7 +36,7 @@ export default class DashboardStore {
 
   drillDownPeriod: Record<string, any> = Period({ rangeName: LAST_24_HOURS });
 
-  selectedDensity: number = 7;
+  selectedDensity: number = 7; // depends on default drilldown, 7 points here!!!;
 
   comparisonPeriods: Record<string, any> = {};
 
@@ -85,29 +83,10 @@ export default class DashboardStore {
     makeAutoObservable(this);
 
     this.resetDrillDownFilter();
-
-    this.createDensity(this.period.getDuration());
-    reaction(
-      () => this.period,
-      (period) => {
-        this.createDensity(period.getDuration());
-      },
-    );
   }
 
-  resetDensity = () => {
-    this.createDensity(this.period.getDuration());
-  };
-
-  createDensity = (duration: number) => {
-    const densityOpts = calculateGranularities(duration);
-    const defaultOption = densityOpts[densityOpts.length - 2];
-
-    this.setDensity(defaultOption.key);
-  };
-
-  setDensity = (density: number) => {
-    this.selectedDensity = density;
+  setDensity = (density: any) => {
+    this.selectedDensity = parseInt(density, 10);
   };
 
   get sortedDashboards() {
@@ -467,7 +446,7 @@ export default class DashboardStore {
     this.isSaving = true;
     try {
       try {
-        await dashboardService.addWidget(dashboard, metricIds);
+        const response = await dashboardService.addWidget(dashboard, metricIds);
         toast.success('Card added to dashboard.');
       } catch {
         toast.error('Card could not be added.');
@@ -477,17 +456,6 @@ export default class DashboardStore {
     }
   }
 
-  resetPeriod = () => {
-    if (this.period) {
-      const range = this.period.rangeName;
-      if (range !== CUSTOM_RANGE) {
-        this.period = Period({ rangeName: this.period.rangeName });
-      } else {
-        this.period = Period({ rangeName: LAST_24_HOURS });
-      }
-    }
-  };
-
   setPeriod(period: any) {
     this.period = Period({
       start: period.start,

frontend/app/mstore/issueReportingStore.ts

@@ -1,5 +1,6 @@
 import { makeAutoObservable } from 'mobx';
 import { issueReportsService } from 'App/services';
+import { makePersistable } from '.store/mobx-persist-store-virtual-858ce4d906/package';
 import ReportedIssue from '../types/session/assignment';
 
 export default class IssueReportingStore {

frontend/app/mstore/projectsStore.ts

@@ -4,6 +4,7 @@ import {
   SITE_ID_STORAGE_KEY,
 } from 'App/constants/storageKeys';
 import { projectsService } from 'App/services';
+import { toast } from '.store/react-toastify-virtual-9dd0f3eae1/package';
 import GDPR from './types/gdpr';
 import Project from './types/project';
 

frontend/app/mstore/searchStore.ts

@@ -390,11 +390,10 @@ class SearchStore {
     // TODO
   }
 
-  fetchSessions = async (
+  async fetchSessions(
     force: boolean = false,
     bookmarked: boolean = false,
-  ): Promise<void> => {
-    console.log(this.searchInProgress)
+  ): Promise<void> {
     if (this.searchInProgress) return;
     const filter = this.instance.toSearch();
 

frontend/app/mstore/sessionStore.ts

@@ -15,7 +15,9 @@ import { loadFile } from 'App/player/web/network/loadFiles';
 import { LAST_7_DAYS } from 'Types/app/period';
 import { filterMap } from 'App/mstore/searchStore';
 import { getDateRangeFromValue } from 'App/dateRange';
+import { clean as cleanParams } from '../api_client';
 import { searchStore, searchStoreLive } from './index';
+
 const range = getDateRangeFromValue(LAST_7_DAYS);
 
 const defaultDateFilters = {

frontend/app/mstore/types/sessionSettings.ts

@@ -6,7 +6,6 @@ import {
   SHOWN_TIMEZONE,
   DURATION_FILTER,
   MOUSE_TRAIL,
-  VIRTUAL_MODE_KEY,
 } from 'App/constants/storageKeys';
 import { DateTime, Settings } from 'luxon';
 
@@ -72,19 +71,27 @@ export const generateGMTZones = (): Timezone[] => {
 
 export default class SessionSettings {
   defaultTimezones = [...generateGMTZones()];
+
   skipToIssue: boolean = localStorage.getItem(SKIP_TO_ISSUE) === 'true';
+
   timezone: Timezone;
+
   durationFilter: any = JSON.parse(
     localStorage.getItem(DURATION_FILTER) ||
       JSON.stringify(defaultDurationFilter),
   );
+
   captureRate: string = '0';
+
   conditionalCapture: boolean = false;
+
   captureConditions: { name: string; captureRate: number; filters: any[] }[] =
     [];
+
   mouseTrail: boolean = localStorage.getItem(MOUSE_TRAIL) !== 'false';
+
   shownTimezone: 'user' | 'local';
-  virtualMode: boolean = localStorage.getItem(VIRTUAL_MODE_KEY) === 'true';
+
   usingLocal: boolean = false;
 
   constructor() {

frontend/app/mstore/types/widget.ts

@@ -163,7 +163,6 @@ export default class Widget {
   fromJson(json: any, period?: any) {
     json.config = json.config || {};
     runInAction(() => {
-      this.dashboardId = json.dashboardId;
       this.metricId = json.metricId;
       this.widgetId = json.widgetId;
       this.metricValue = this.metricValueFromArray(

frontend/app/player/web/MessageLoader.ts

@@ -43,7 +43,6 @@ export default class MessageLoader {
     this.session = session;
   }
 
-  rawMessages: any[] = []
   createNewParser(
     shouldDecrypt = true,
     onMessagesDone: (msgs: PlayerMsg[], file?: string) => void,
@@ -70,7 +69,6 @@ export default class MessageLoader {
         while (!finished) {
           const msg = fileReader.readNext();
           if (msg) {
-            this.rawMessages.push(msg)
             msgs.push(msg);
           } else {
             finished = true;
@@ -80,6 +78,7 @@ export default class MessageLoader {
 
         let artificialStartTime = Infinity;
         let startTimeSet = false;
+
         msgs.forEach((msg, i) => {
           if (msg.tp === MType.Redux || msg.tp === MType.ReduxDeprecated) {
             if ('actionTime' in msg && msg.actionTime) {
@@ -344,6 +343,7 @@ const DOMMessages = [
   MType.CreateElementNode,
   MType.CreateTextNode,
   MType.MoveNode,
+  MType.RemoveNode,
   MType.CreateIFrameDocument,
 ];
 
@@ -351,25 +351,20 @@ const DOMMessages = [
 function brokenDomSorter(m1: PlayerMsg, m2: PlayerMsg) {
   if (m1.time !== m2.time) return m1.time - m2.time;
 
-  // if (m1.tp === MType.CreateDocument && m2.tp !== MType.CreateDocument)
-  //   return -1;
-  // if (m1.tp !== MType.CreateDocument && m2.tp === MType.CreateDocument)
-  //   return 1;
+  if (m1.tp === MType.CreateDocument && m2.tp !== MType.CreateDocument)
+    return -1;
+  if (m1.tp !== MType.CreateDocument && m2.tp === MType.CreateDocument)
+    return 1;
 
-  // if (m1.tp === MType.RemoveNode)
-  //   return 1;
-  // if (m2.tp === MType.RemoveNode)
-  //   return -1;
-
-  // const m1IsDOM = DOMMessages.includes(m1.tp);
-  // const m2IsDOM = DOMMessages.includes(m2.tp);
+  const m1IsDOM = DOMMessages.includes(m1.tp);
+  const m2IsDOM = DOMMessages.includes(m2.tp);
   // if (m1IsDOM && m2IsDOM) {
   //   // @ts-ignore DOM msg has id but checking for 'id' in m is expensive
   //   return m1.id - m2.id;
   // }
 
-  // if (m1IsDOM && !m2IsDOM) return -1;
-  // if (!m1IsDOM && m2IsDOM) return 1;
+  if (m1IsDOM && !m2IsDOM) return -1;
+  if (!m1IsDOM && m2IsDOM) return 1;
 
   return 0;
 }

frontend/app/player/web/MessageManager.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import { Decoder } from 'syncod';
 import logger from 'App/logger';
-import { VIRTUAL_MODE_KEY } from '@/constants/storageKeys';
+
 import type { Store, ILog, SessionFilesInfo } from 'Player';
 import TabSessionManager, { TabState } from 'Player/web/TabManager';
 import ActiveTabManager from 'Player/web/managers/ActiveTabManager';
@@ -69,7 +69,6 @@ export interface State extends ScreenState {
   tabChangeEvents: TabChangeEvent[];
   closedTabs: string[];
   sessionStart: number;
-  vModeBadge: boolean;
 }
 
 export const visualChanges = [
@@ -100,7 +99,6 @@ export default class MessageManager {
     closedTabs: [],
     sessionStart: 0,
     tabNames: {},
-    vModeBadge: false,
   };
 
   private clickManager: ListWalker<MouseClick> = new ListWalker();
@@ -128,6 +126,7 @@ export default class MessageManager {
   private tabsAmount = 0;
 
   private tabChangeEvents: TabChangeEvent[] = [];
+
   private activeTab = '';
 
   constructor(
@@ -143,19 +142,8 @@ export default class MessageManager {
     this.activityManager = new ActivityManager(
       this.session.duration.milliseconds,
     ); // only if not-live
-
-    const vMode = localStorage.getItem(VIRTUAL_MODE_KEY);
-    if (vMode === 'true') {
-      this.setVirtualMode(true);
-    }
   }
 
-  private virtualMode = false;
-  public setVirtualMode = (virtualMode: boolean) => {
-    this.virtualMode = virtualMode;
-    Object.values(this.tabs).forEach((tab) => tab.setVirtualMode(virtualMode));
-  };
-
   public getListsFullState = () => {
     const fullState: Record<string, any> = {};
     for (const tab in Object.keys(this.tabs)) {
@@ -406,9 +394,6 @@ export default class MessageManager {
         this.sessionStart,
         this.initialLists,
       );
-      if (this.virtualMode) {
-        this.tabs[msg.tabId].setVirtualMode(this.virtualMode);
-      }
     }
 
     const lastMessageTime = Math.max(msg.time, this.lastMessageTime);

frontend/app/player/web/TabManager.ts

@@ -99,7 +99,6 @@ export default class TabSessionManager {
       tabStates: { [tabId: string]: TabState };
       tabNames: { [tabId: string]: string };
       location?: string;
-      vModeBadge?: boolean;
     }>,
     private readonly screen: Screen,
     private readonly id: string,
@@ -117,13 +116,6 @@ export default class TabSessionManager {
       screen,
       this.session.isMobile,
       this.setCSSLoading,
-      () => {
-        setTimeout(() => {
-          this.state.update({
-            vModeBadge: true,
-          })
-        }, 0)
-      }
     );
     this.lists = new Lists(initialLists);
     initialLists?.event?.forEach((e: Record<string, string>) => {
@@ -134,10 +126,6 @@ export default class TabSessionManager {
     });
   }
 
-  public setVirtualMode = (virtualMode: boolean) => {
-    this.pagesManager.setVirtualMode(virtualMode);
-  };
-
   setSession = (session: any) => {
     this.session = session;
   };
@@ -360,19 +348,19 @@ export default class TabSessionManager {
             break;
           case MType.CreateTextNode:
           case MType.CreateElementNode:
-            this.windowNodeCounter.addNode(msg);
+            this.windowNodeCounter.addNode(msg.id, msg.parentID);
             this.performanceTrackManager.setCurrentNodesCount(
               this.windowNodeCounter.count,
             );
             break;
           case MType.MoveNode:
-            this.windowNodeCounter.moveNode(msg);
+            this.windowNodeCounter.moveNode(msg.id, msg.parentID);
             this.performanceTrackManager.setCurrentNodesCount(
               this.windowNodeCounter.count,
             );
             break;
           case MType.RemoveNode:
-            this.windowNodeCounter.removeNode(msg);
+            this.windowNodeCounter.removeNode(msg.id);
             this.performanceTrackManager.setCurrentNodesCount(
               this.windowNodeCounter.count,
             );

frontend/app/player/web/WebPlayer.ts

@@ -21,10 +21,15 @@ export default class WebPlayer extends Player {
     inspectorMode: false,
     mobsFetched: false,
   };
+
   private inspectorController: InspectorController;
+
   protected screen: Screen;
+
   protected readonly messageManager: MessageManager;
+
   protected readonly messageLoader: MessageLoader;
+
   private targetMarker: TargetMarker;
 
   constructor(
@@ -99,10 +104,6 @@ export default class WebPlayer extends Player {
     window.__OPENREPLAY_DEV_TOOLS__.player = this;
   }
 
-  enableVMode = () => {
-    this.messageManager.setVirtualMode(true);
-  }
-
   preloadFirstFile(data: Uint8Array, fileKey?: string) {
     void this.messageLoader.preloadFirstFile(data, fileKey);
   }

frontend/app/player/web/addons/simpleHeatmap.ts

@@ -140,16 +140,11 @@ class SimpleHeatmap {
       ctx.drawImage(this.circle, p[0] - this.r, p[1] - this.r);
     });
 
-    try {
-      const colored = ctx.getImageData(0, 0, this.width, this.height);
-      this.colorize(colored.data, this.grad);
-      ctx.putImageData(colored, 0, 0);
-    } catch (e) {
-      // usually happens if session is corrupted ?
-      console.error('Error while colorizing heatmap:', e);
-    } finally {
-      return this;
-    }
+    const colored = ctx.getImageData(0, 0, this.width, this.height);
+    this.colorize(colored.data, this.grad);
+    ctx.putImageData(colored, 0, 0);
+
+    return this;
   }
 
   private colorize(

frontend/app/player/web/managers/DOM/DOMManager.ts

@@ -44,34 +44,45 @@ const ATTR_NAME_REGEXP = /([^\t\n\f \/>"'=]+)/;
 
 export default class DOMManager extends ListWalker<Message> {
   private readonly vTexts: Map<number, VText> = new Map(); // map vs object here?
+
   private readonly vElements: Map<number, VElement> = new Map();
+
   private readonly olVRoots: Map<number, OnloadVRoot> = new Map();
+
   /** required to keep track of iframes, frameId : vnodeId */
   private readonly iframeRoots: Record<number, number> = {};
-  private shadowRootParentMap: Map<number, number> = new Map();
+
   /** Constructed StyleSheets https://developer.mozilla.org/en-US/docs/Web/API/Document/adoptedStyleSheets
    * as well as <style> tag owned StyleSheets
    */
   private olStyleSheets: Map<number, OnloadStyleSheet> = new Map();
+
   /** @depreacted since tracker 4.0.2 Mapping by nodeID */
   private olStyleSheetsDeprecated: Map<number, OnloadStyleSheet> = new Map();
+
   private upperBodyId: number = -1;
+
   private nodeScrollManagers: Map<number, ListWalker<SetNodeScroll>> =
     new Map();
+
   private stylesManager: StylesManager;
+
   private focusManager: FocusManager = new FocusManager(this.vElements);
+
   private selectionManager: SelectionManager;
+
   private readonly screen: Screen;
+
   private readonly isMobile: boolean;
+
   private readonly stringDict: Record<number, string>;
+
   private readonly globalDict: {
     get: (key: string) => string | undefined;
     all: () => Record<string, string>;
   };
+
   public readonly time: number;
-  private virtualMode = false;
-  private hasSlots = false
-  private showVModeBadge?: () => void;
 
   constructor(params: {
     screen: Screen;
@@ -83,8 +94,6 @@ export default class DOMManager extends ListWalker<Message> {
       get: (key: string) => string | undefined;
       all: () => Record<string, string>;
     };
-    virtualMode?: boolean;
-    showVModeBadge?: () => void;
   }) {
     super();
     this.screen = params.screen;
@@ -94,8 +103,6 @@ export default class DOMManager extends ListWalker<Message> {
     this.globalDict = params.globalDict;
     this.selectionManager = new SelectionManager(this.vElements, params.screen);
     this.stylesManager = new StylesManager(params.screen, params.setCssLoading);
-    this.virtualMode = params.virtualMode || false;
-    this.showVModeBadge = params.showVModeBadge;
     setupWindowLogging(this.vTexts, this.vElements, this.olVRoots);
   }
 
@@ -156,11 +163,6 @@ export default class DOMManager extends ListWalker<Message> {
   }
 
   public getNode(id: number) {
-    const mappedId = this.shadowRootParentMap.get(id);
-    if (mappedId !== undefined) {
-      // If this is a shadow root ID, return the parent element instead
-      return this.vElements.get(mappedId);
-    }
     return this.vElements.get(id) || this.vTexts.get(id);
   }
 
@@ -169,21 +171,24 @@ export default class DOMManager extends ListWalker<Message> {
     id: number;
     index: number;
   }): void {
-    let { parentID, id, index } = msg;
-
-    // Check if parentID is a shadow root, and get the real parent element if so
-    const actualParentID = this.shadowRootParentMap.get(parentID);
-    if (actualParentID !== undefined) {
-      parentID = actualParentID;
-    }
-
+    const { parentID, id, index } = msg;
     const child = this.vElements.get(id) || this.vTexts.get(id);
     if (!child) {
       logger.error('Insert error. Node not found', id);
       return;
     }
-
     const parent = this.vElements.get(parentID) || this.olVRoots.get(parentID);
+    if ('tagName' in child && child.tagName === 'BODY') {
+      const spriteMap = new VSpriteMap(
+        'svg',
+        true,
+        Number.MAX_SAFE_INTEGER - 100,
+        Number.MAX_SAFE_INTEGER - 100,
+      );
+      spriteMap.node.setAttribute('id', 'OPENREPLAY_SPRITES_MAP');
+      spriteMap.node.setAttribute('style', 'display: none;');
+      child.insertChildAt(spriteMap, Number.MAX_SAFE_INTEGER - 100);
+    }
     if (!parent) {
       logger.error(
         `${id} Insert error. Parent vNode ${parentID} not found`,
@@ -298,19 +303,11 @@ export default class DOMManager extends ListWalker<Message> {
         this.insertNode(msg);
         this.removeBodyScroll(msg.id, vElem);
         this.removeAutocomplete(vElem);
-        if (msg.tag === 'SLOT') {
-          this.hasSlots = true;
-        }
         return;
       }
-      case MType.MoveNode: {
-        // if the parent ID is in shadow root map -> custom elements case
-        if (this.shadowRootParentMap.has(msg.parentID)) {
-          msg.parentID = this.shadowRootParentMap.get(msg.parentID)!;
-        }
+      case MType.MoveNode:
         this.insertNode(msg);
         return;
-      }
       case MType.RemoveNode: {
         const vChild = this.vElements.get(msg.id) || this.vTexts.get(msg.id);
         if (!vChild) {
@@ -443,21 +440,6 @@ export default class DOMManager extends ListWalker<Message> {
           logger.error('CreateIFrameDocument: Node not found', msg);
           return;
         }
-        // shadow DOM for a custom element + SALESFORCE (<slot>)
-        const isCustomElement =
-          vElem.tagName.includes('-') || vElem.tagName === 'SLOT';
-
-        if (isCustomElement) {
-          if (this.virtualMode) {
-            // Store the mapping but don't create the actual shadow root
-            this.shadowRootParentMap.set(msg.id, msg.frameID);
-            return;
-          } else if (this.hasSlots) {
-            this.showVModeBadge?.();
-          }
-        }
-
-        // Real iframes
         if (this.iframeRoots[msg.frameID] && !this.olVRoots.has(msg.id)) {
           this.olVRoots.delete(this.iframeRoots[msg.frameID]);
         }
@@ -470,11 +452,7 @@ export default class DOMManager extends ListWalker<Message> {
       case MType.AdoptedSsInsertRule: {
         const styleSheet = this.olStyleSheets.get(msg.sheetID);
         if (!styleSheet) {
-          logger.warn(
-            'No stylesheet was created for ',
-            msg,
-            this.olStyleSheets,
-          );
+          logger.warn('No stylesheet was created for ', msg);
           return;
         }
         insertRule(styleSheet, msg);

frontend/app/player/web/managers/PagesManager.ts

@@ -22,7 +22,6 @@ export default class PagesManager extends ListWalker<DOMManager> {
     private screen: Screen,
     private isMobile: boolean,
     private setCssLoading: (flag: boolean) => void,
-    private showVModeBadge: () => void,
   ) {
     super();
   }
@@ -31,10 +30,6 @@ export default class PagesManager extends ListWalker<DOMManager> {
 		Assumed that messages added in a correct time sequence.
 	*/
   falseOrder = false;
-  virtualMode = false;
-  setVirtualMode = (virtualMode: boolean) => {
-    this.virtualMode = virtualMode;
-  };
 
   appendMessage(m: Message): void {
     if ([MType.StringDict, MType.StringDictGlobal].includes(m.tp)) {
@@ -67,8 +62,6 @@ export default class PagesManager extends ListWalker<DOMManager> {
             get: (key: string) => this.globalDictionary.get(key),
             all: () => Object.fromEntries(this.globalDictionary),
           },
-          virtualMode: this.virtualMode,
-          showVModeBadge: this.showVModeBadge,
         }),
       );
       this.falseOrder = false;

frontend/app/player/web/managers/WindowNodeCounter.ts

@@ -54,45 +54,40 @@ export default class WindowNodeCounter {
     this.nodes = [this.root];
   }
 
-  addNode(msg: { id: number, parentID: number, time: number }): boolean {
-    const { id, parentID } = msg;
+  addNode(id: number, parentID: number) {
     if (!this.nodes[parentID]) {
       // TODO: iframe case
       // console.error(`Wrong! Node with id ${ parentID } (parentId) not found.`);
-      return false;
+      return;
     }
     if (this.nodes[id]) {
       // console.error(`Wrong! Node with id ${ id } already exists.`);
-      return false;
+      return;
     }
     this.nodes[id] = this.nodes[parentID].newChild();
-    return true;
   }
 
-  removeNode({ id }: { id: number }) {
+  removeNode(id: number) {
     if (!this.nodes[id]) {
       // Might be text node
       // console.error(`Wrong! Node with id ${ id } not found.`);
-      return false;
+      return;
     }
     this.nodes[id].removeNode();
-    return true;
   }
 
-  moveNode(msg: { id: number, parentID: number, time: number }) {
-    const { id, parentID, time } = msg;
+  moveNode(id: number, parentId: number) {
     if (!this.nodes[id]) {
-      console.warn(`Node Counter: Node with id ${id} (parent: ${parentID}) not found. time: ${time}`);
-      return false;
+      console.warn(`Node Counter: Node with id ${id} not found.`);
+      return;
     }
-    if (!this.nodes[parentID]) {
+    if (!this.nodes[parentId]) {
       console.warn(
-        `Node Counter: Node with id ${parentID} (parentId) not found. time: ${time}`,
+        `Node Counter: Node with id ${parentId} (parentId) not found.`,
       );
-      return false;
+      return;
     }
-    this.nodes[id].moveNode(this.nodes[parentID]);
-    return true;
+    this.nodes[id].moveNode(this.nodes[parentId]);
   }
 
   get count() {

frontend/app/types/session/event.ts

@@ -178,8 +178,6 @@ export class Click extends Event {
 
   selector: string;
 
-  isHighlighted: boolean | undefined = false;
-
   constructor(evt: ClickEvent, isClickRage?: boolean) {
     super(evt);
     this.targetContent = evt.targetContent;

frontend/app/utils/index.ts

@@ -29,15 +29,6 @@ export function debounce(callback, wait, context = this) {
   };
 }
 
-export function debounceCall(func, wait) {
-  let timeout;
-  return function (...args) {
-    const context = this;
-    clearTimeout(timeout);
-    timeout = setTimeout(() => func.apply(context, args), wait);
-  };
-}
-
 export function randomInt(a, b) {
   const min = (b ? a : 0) - 0.5;
   const max = b || a || Number.MAX_SAFE_INTEGER;

scripts/docker-compose/.gitignore

@@ -1 +0,0 @@
-hacks/yamls

scripts/docker-compose/alerts.env

@@ -0,0 +1,28 @@
+ASSIST_JWT_SECRET=${COMMON_JWT_SECRET}
+ASSIST_KEY=${COMMON_JWT_SECRET}
+ASSIST_RECORDS_BUCKET=records
+ASSIST_URL="http://assist-openreplay:9001/assist/%s"
+AWS_DEFAULT_REGION="us-east-1"
+CH_COMPRESSION="false"
+PYTHONUNBUFFERED="0"
+REDIS_STRING="redis://redis:6379"
+S3_HOST="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
+S3_KEY="${COMMON_S3_KEY}"
+S3_SECRET="${COMMON_S3_SECRET}"
+SITE_URL="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
+ch_host="clickhouse"
+ch_port="9000"
+ch_port_http="8123"
+ch_username="default"
+js_cache_bucket=sessions-assets 
+jwt_secret="${COMMON_JWT_SECRET}"
+pg_dbname="postgres"
+pg_host="postgresql"
+pg_password="${COMMON_PG_PASSWORD}"
+sessions_bucket=mobs
+sessions_region="us-east-1" 
+sourcemaps_bucket=sourcemaps 
+sourcemaps_reader="http://sourcemapreader-openreplay:9000/sourcemaps/%s/sourcemaps"
+version_number="${COMMON_VERSION}"
+CLUSTER_URL=""
+POD_NAMESPACE=""

scripts/docker-compose/assets.env

@@ -0,0 +1,10 @@
+AWS_ACCESS_KEY_ID=${COMMON_S3_KEY}
+AWS_SECRET_ACCESS_KEY=${COMMON_S3_SECRET}
+BUCKET_NAME=sessions-assets
+LICENSE_KEY=''
+AWS_ENDPOINT='http://minio:9000'
+AWS_REGION='us-east-1'
+KAFKA_SERVERS='kafka.db.svc.cluster.local:9092'
+KAFKA_USE_SSL='false'
+ASSETS_ORIGIN='https://${COMMON_DOMAIN_NAME}:443/sessions-assets'
+REDIS_STRING='redis://redis:6379'

scripts/docker-compose/assist.env

@@ -0,0 +1,11 @@
+ASSIST_JWT_SECRET=${COMMON_JWT_SECRET}
+ASSIST_KEY=${COMMON_JWT_SECRET}
+AWS_DEFAULT_REGION="us-east-1"
+S3_HOST="https://${COMMON_DOMAIN_NAME}:443"
+S3_KEY=changeMeMinioAccessKey
+S3_SECRET=changeMeMinioPassword
+REDIS_URL=redis
+CLEAR_SOCKET_TIME='720'
+debug='0'
+redis='false'
+uws='false'

scripts/docker-compose/chalice.env

@@ -0,0 +1,31 @@
+ASSIST_JWT_SECRET=${COMMON_JWT_SECRET}
+ASSIST_KEY=${COMMON_JWT_SECRET}
+ASSIST_RECORDS_BUCKET=records
+ASSIST_URL="http://assist-openreplay:9001/assist/%s"
+AWS_DEFAULT_REGION="us-east-1"
+CH_COMPRESSION="false"
+PYTHONUNBUFFERED="0"
+REDIS_STRING="redis://redis:6379"
+S3_HOST="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
+S3_KEY="${COMMON_S3_KEY}"
+S3_SECRET="${COMMON_S3_SECRET}"
+SITE_URL="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
+ch_host="clickhouse"
+ch_port="9000"
+ch_port_http="8123"
+ch_username="default"
+js_cache_bucket=sessions-assets 
+jwt_secret="${COMMON_JWT_SECRET}"
+pg_dbname="postgres"
+pg_host="postgresql"
+pg_password="${COMMON_PG_PASSWORD}"
+sessions_bucket=mobs
+sessions_region="us-east-1" 
+sourcemaps_bucket=sourcemaps 
+sourcemaps_reader="http://sourcemapreader-openreplay:9000/sourcemaps/%s/sourcemaps"
+version_number="${COMMON_VERSION}"
+CLUSTER_URL=""
+POD_NAMESPACE=""
+JWT_REFRESH_SECRET=${COMMON_JWT_REFRESH_SECRET}
+JWT_SPOT_REFRESH_SECRET=${COMMON_JWT_REFRESH_SECRET}
+JWT_SPOT_SECRET=${COMMON_JWT_SPOT_SECRET}

scripts/docker-compose/common.env

@@ -1,20 +1,15 @@
-COMMON_VERSION="v1.22.0"
 COMMON_PROTOCOL="https"
 COMMON_DOMAIN_NAME="change_me_domain"
 COMMON_JWT_SECRET="change_me_jwt"
 COMMON_JWT_SPOT_SECRET="change_me_jwt"
+COMMON_JWT_REFRESH_SECRET="change_me_jwt_refresh"
 COMMON_S3_KEY="change_me_s3_key"
 COMMON_S3_SECRET="change_me_s3_secret"
 COMMON_PG_PASSWORD="change_me_pg_password"
-COMMON_JWT_REFRESH_SECRET="change_me_jwt_refresh"
-COMMON_JWT_SPOT_REFRESH_SECRET="change_me_jwt_spot_refresh"
-COMMON_ASSIST_JWT_SECRET="change_me_assist_jwt_secret"
-COMMON_ASSIST_KEY="change_me_assist_key"
-
+COMMON_VERSION="v1.21.0"
 ## DB versions
 ######################################
-POSTGRES_VERSION="17.2.0"
+POSTGRES_VERSION="14.5.0"
 REDIS_VERSION="6.0.12-debian-10-r33"
 MINIO_VERSION="2023.2.10-debian-11-r1"
-CLICKHOUSE_VERSION="25.1-alpine"
 ######################################

scripts/docker-compose/db.env

@@ -0,0 +1,11 @@
+CH_USERNAME='default'
+CH_PASSWORD=''
+CLICKHOUSE_STRING='clickhouse-openreplay-clickhouse.db.svc.cluster.local:9000/default'
+LICENSE_KEY=''
+KAFKA_SERVERS='kafka.db.svc.cluster.local:9092'
+KAFKA_USE_SSL='false'
+pg_password="${COMMON_PG_PASSWORD}"
+QUICKWIT_ENABLED='false'
+POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql:5432/postgres"
+REDIS_STRING='redis://redis:6379'
+ch_db='default'

scripts/docker-compose/docker-compose.yaml

@@ -1,34 +1,15 @@
-
-# vim: ft=yaml
 version: '3'
 
 services:
-
   postgresql:
     image: bitnami/postgresql:${POSTGRES_VERSION}
     container_name: postgres
     volumes:
-      - pgdata:/bitnami/postgresql
+      - pgdata:/var/lib/postgresql/data
     networks:
-      openreplay-net:
-        aliases:
-          - postgresql.db.svc.cluster.local
+      - openreplay-net
     environment:
-      POSTGRESQL_PASSWORD: "${COMMON_PG_PASSWORD}"
-
-  clickhouse:
-    image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}
-    container_name: clickhouse
-    volumes:
-      - clickhouse:/var/lib/clickhouse
-    networks:
-      openreplay-net:
-        aliases:
-          - clickhouse-openreplay-clickhouse.db.svc.cluster.local
-    environment:
-      CLICKHOUSE_USER: "default"
-      CLICKHOUSE_PASSWORD: ""
-      CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: "1"
+      POSTGRESQL_PASSWORD: ${COMMON_PG_PASSWORD}
 
   redis:
     image: bitnami/redis:${REDIS_VERSION}
@@ -36,9 +17,7 @@ services:
     volumes:
       - redisdata:/bitnami/redis/data
     networks:
-      openreplay-net:
-        aliases:
-          - redis-master.db.svc.cluster.local
+      - openreplay-net
     environment:
       ALLOW_EMPTY_PASSWORD: "yes"
 
@@ -48,9 +27,7 @@ services:
     volumes:
       - miniodata:/bitnami/minio/data
     networks:
-      openreplay-net:
-        aliases:
-          - minio.db.svc.cluster.local
+      - openreplay-net
     ports:
       - 9001:9001
     environment:
@@ -86,7 +63,7 @@ services:
     volumes:
       - ../helmcharts/openreplay/files/minio.sh:/tmp/minio.sh
     environment:
-      MINIO_HOST: http://minio.db.svc.cluster.local:9000
+      MINIO_HOST: http://minio:9000
       MINIO_ACCESS_KEY: ${COMMON_S3_KEY}
       MINIO_SECRET_KEY: ${COMMON_S3_SECRET}
     user: root
@@ -103,7 +80,7 @@ services:
           bash /tmp/minio.sh init || exit 100
 
   db-migration:
-    image: bitnami/postgresql:14.5.0
+    image: bitnami/postgresql:14.5.0 
     container_name: db-migration
     profiles:
       - "migration"
@@ -124,317 +101,65 @@ services:
       - /bin/bash
       - -c
       - |
-          until psql -c '\q'; do
+          until PGPASSWORD=${COMMON_PG_PASSWORD} psql -h postgresql -U postgres -d postgres -c '\q'; do
           echo "PostgreSQL is unavailable - sleeping"
           sleep 1
           done
           echo "PostgreSQL is up - executing command"
           psql -v ON_ERROR_STOP=1 -f /tmp/init_schema.sql
 
-  clickhouse-migration:
-    image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}
-    container_name: clickhouse-migration
-    profiles:
-      - "migration"
-    depends_on:
-      - clickhouse
-      - minio-migration
-    networks:
-      - openreplay-net
-    volumes:
-      - ../schema/db/init_dbs/clickhouse/create/init_schema.sql:/tmp/init_schema.sql
-    environment:
-      CH_HOST: "clickhouse-openreplay-clickhouse.db.svc.cluster.local"
-      CH_PORT: "9000"
-      CH_PORT_HTTP: "8123"
-      CH_USERNAME: "default"
-      CH_PASSWORD: ""
-    entrypoint:
-      - /bin/bash
-      - -c
-      - |
-          # Checking variable is empty. Shell independant method.
-          # Wait for Minio to be ready
-          until nc -z -v -w30 clickhouse-openreplay-clickhouse.db.svc.cluster.local 9000; do
-              echo "Waiting for Minio server to be ready..."
-              sleep 1
-          done
-
-          echo "clickhouse is up - executing command"
-          clickhouse-client -h clickhouse-openreplay-clickhouse.db.svc.cluster.local --user default --port 9000 --multiquery < /tmp/init_schema.sql || true
-  
-  alerts-openreplay:
-    image: public.ecr.aws/p1t3u8a3/alerts:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: alerts
-    networks:
-      openreplay-net:
-        aliases:
-          - alerts-openreplay
-          - alerts-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/alerts.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  analytics-openreplay:
-    image: public.ecr.aws/p1t3u8a3/analytics:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: analytics
-    networks:
-      openreplay-net:
-        aliases:
-          - analytics-openreplay
-          - analytics-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/analytics.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  http-openreplay:
-    image: public.ecr.aws/p1t3u8a3/http:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: http
-    networks:
-      openreplay-net:
-        aliases:
-          - http-openreplay
-          - http-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/http.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  images-openreplay:
-    image: public.ecr.aws/p1t3u8a3/images:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: images
-    networks:
-      openreplay-net:
-        aliases:
-          - images-openreplay
-          - images-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/images.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  integrations-openreplay:
-    image: public.ecr.aws/p1t3u8a3/integrations:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: integrations
-    networks:
-      openreplay-net:
-        aliases:
-          - integrations-openreplay
-          - integrations-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/integrations.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  sink-openreplay:
-    image: public.ecr.aws/p1t3u8a3/sink:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: sink
-    networks:
-      openreplay-net:
-        aliases:
-          - sink-openreplay
-          - sink-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/sink.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  sourcemapreader-openreplay:
-    image: public.ecr.aws/p1t3u8a3/sourcemapreader:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: sourcemapreader
-    networks:
-      openreplay-net:
-        aliases:
-          - sourcemapreader-openreplay
-          - sourcemapreader-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/sourcemapreader.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  spot-openreplay:
-    image: public.ecr.aws/p1t3u8a3/spot:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: spot
-    networks:
-      openreplay-net:
-        aliases:
-          - spot-openreplay
-          - spot-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/spot.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  storage-openreplay:
-    image: public.ecr.aws/p1t3u8a3/storage:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: storage
-    networks:
-      openreplay-net:
-        aliases:
-          - storage-openreplay
-          - storage-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/storage.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  assets-openreplay:
-    image: public.ecr.aws/p1t3u8a3/assets:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: assets
-    networks:
-      openreplay-net:
-        aliases:
-          - assets-openreplay
-          - assets-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/assets.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  assist-openreplay:
-    image: public.ecr.aws/p1t3u8a3/assist:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: assist
-    networks:
-      openreplay-net:
-        aliases:
-          - assist-openreplay
-          - assist-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/assist.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  canvases-openreplay:
-    image: public.ecr.aws/p1t3u8a3/canvases:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: canvases
-    networks:
-      openreplay-net:
-        aliases:
-          - canvases-openreplay
-          - canvases-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/canvases.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  chalice-openreplay:
-    image: public.ecr.aws/p1t3u8a3/chalice:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: chalice
-    networks:
-      openreplay-net:
-        aliases:
-          - chalice-openreplay
-          - chalice-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/chalice.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  db-openreplay:
-    image: public.ecr.aws/p1t3u8a3/db:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: db
-    networks:
-      openreplay-net:
-        aliases:
-          - db-openreplay
-          - db-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/db.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
-  ender-openreplay:
-    image: public.ecr.aws/p1t3u8a3/ender:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: ender
-    networks:
-      openreplay-net:
-        aliases:
-          - ender-openreplay
-          - ender-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/ender.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  
-  
   frontend-openreplay:
     image: public.ecr.aws/p1t3u8a3/frontend:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
     container_name: frontend
     networks:
-      openreplay-net:
-        aliases:
-          - frontend-openreplay
-          - frontend-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/frontend.env
-    environment: {}  # Fallback empty environment if env_file is missing
+      - openreplay-net
     restart: unless-stopped
-  
-  
+
+  alerts-openreplay:
+    image: public.ecr.aws/p1t3u8a3/alerts:${COMMON_VERSION}
+    container_name: alerts
+    networks:
+      - openreplay-net
+    env_file:
+      - alerts.env
+    restart: unless-stopped
+
+  assets-openreplay:
+    image: public.ecr.aws/p1t3u8a3/assets:${COMMON_VERSION}
+    container_name: assets
+    networks:
+      - openreplay-net
+    env_file:
+      - assets.env
+    restart: unless-stopped
+
+  assist-openreplay:
+    image: public.ecr.aws/p1t3u8a3/assist:${COMMON_VERSION}
+    container_name: assist
+    networks:
+      - openreplay-net
+    env_file:
+      - assist.env
+    restart: unless-stopped
+
+  db-openreplay:
+    image: public.ecr.aws/p1t3u8a3/db:${COMMON_VERSION}
+    container_name: db
+    networks:
+      - openreplay-net
+    env_file:
+      - db.env
+    restart: unless-stopped
+
+  ender-openreplay:
+    image: public.ecr.aws/p1t3u8a3/ender:${COMMON_VERSION}
+    container_name: ender
+    networks:
+      - openreplay-net
+    env_file:
+      - ender.env
+    restart: unless-stopped
+
   heuristics-openreplay:
     image: public.ecr.aws/p1t3u8a3/heuristics:${COMMON_VERSION}
     domainname: app.svc.cluster.local
@@ -442,15 +167,88 @@ services:
     networks:
       openreplay-net:
         aliases:
-          - heuristics-openreplay
           - heuristics-openreplay.app.svc.cluster.local
+    env_file:
+      - heuristics.env
+    restart: unless-stopped
+
+  imagestorage-openreplay:
+    image: public.ecr.aws/p1t3u8a3/imagestorage:${COMMON_VERSION}
+    container_name: imagestorage
+    env_file:
+      - imagestorage.env
+    networks:
+      - openreplay-net
+    restart: unless-stopped
+
+  integrations-openreplay:
+    image: public.ecr.aws/p1t3u8a3/integrations:${COMMON_VERSION}
+    container_name: integrations
+    networks:
+      - openreplay-net
+    env_file:
+      - integrations.env
+    restart: unless-stopped
+
+  peers-openreplay:
+    image: public.ecr.aws/p1t3u8a3/peers:${COMMON_VERSION}
+    container_name: peers
+    networks:
+      - openreplay-net
+    env_file:
+      - peers.env
+    restart: unless-stopped
+
+  sourcemapreader-openreplay:
+    image: public.ecr.aws/p1t3u8a3/sourcemapreader:${COMMON_VERSION}
+    container_name: sourcemapreader
+    networks:
+      - openreplay-net
+    env_file:
+      - sourcemapreader.env
+    restart: unless-stopped
+
+  http-openreplay:
+    image: public.ecr.aws/p1t3u8a3/http:${COMMON_VERSION}
+    container_name: http
+    networks:
+      - openreplay-net
+    env_file:
+      - http.env
+    restart: unless-stopped
+
+  chalice-openreplay:
+    image: public.ecr.aws/p1t3u8a3/chalice:${COMMON_VERSION}
+    container_name: chalice
     volumes:
       - shared-volume:/mnt/efs
+    networks:
+      - openreplay-net
     env_file:
-      - docker-envs/heuristics.env
-    environment: {}  # Fallback empty environment if env_file is missing
+      - chalice.env
+    restart: unless-stopped
+
+  sink-openreplay:
+    image: public.ecr.aws/p1t3u8a3/sink:${COMMON_VERSION}
+    container_name: sink
+    volumes:
+      - shared-volume:/mnt/efs
+    networks:
+      - openreplay-net
+    env_file:
+      - sink.env
+    restart: unless-stopped
+
+  storage-openreplay:
+    image: public.ecr.aws/p1t3u8a3/storage:${COMMON_VERSION}
+    container_name: storage
+    volumes:
+      - shared-volume:/mnt/efs
+    networks:
+      - openreplay-net
+    env_file:
+      - storage.env
     restart: unless-stopped
-  
 
   nginx-openreplay:
     image: nginx:latest
@@ -482,7 +280,6 @@ services:
 
 volumes:
   pgdata:
-  clickhouse:
   redisdata:
   miniodata:
   shared-volume:

scripts/docker-compose/docker-envs/alerts.env

@@ -1,27 +0,0 @@
-version_number="v1.22.0"
-pg_host="postgresql.db.svc.cluster.local"
-pg_port="5432"
-pg_dbname="postgres"
-ch_host="clickhouse-openreplay-clickhouse.db.svc.cluster.local"
-ch_port="9000"
-ch_port_http="8123"
-ch_username="default"
-ch_password=""
-pg_user="postgres"
-pg_password="${COMMON_PG_PASSWORD}"
-SITE_URL="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-S3_HOST="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-S3_KEY="${COMMON_S3_KEY}"
-S3_SECRET="${COMMON_S3_SECRET}"
-AWS_DEFAULT_REGION="us-east-1"
-EMAIL_HOST=""
-EMAIL_PORT="587"
-EMAIL_USER=""
-EMAIL_PASSWORD=""
-EMAIL_USE_TLS="true"
-EMAIL_USE_SSL="false"
-EMAIL_SSL_KEY=""
-EMAIL_SSL_CERT=""
-EMAIL_FROM="OpenReplay<do-not-reply@openreplay.com>"
-LOGLEVEL="INFO"
-PYTHONUNBUFFERED="0"

scripts/docker-compose/docker-envs/analytics.env

@@ -1,11 +0,0 @@
-TOKEN_SECRET="secret_token_string"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-JWT_SECRET="${COMMON_JWT_SECRET}"
-CH_USERNAME="default"
-CH_PASSWORD=""
-CLICKHOUSE_STRING="clickhouse-openreplay-clickhouse.db.svc.cluster.local:9000/"
-pg_password="${COMMON_PG_PASSWORD}"
-POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres?sslmode=disable"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"

scripts/docker-compose/docker-envs/assets.env

@@ -1,10 +0,0 @@
-AWS_ACCESS_KEY_ID="${COMMON_S3_KEY}"
-AWS_SECRET_ACCESS_KEY="${COMMON_S3_SECRET}"
-BUCKET_NAME="sessions-assets"
-LICENSE_KEY=""
-AWS_ENDPOINT="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-AWS_REGION="us-east-1"
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-ASSETS_ORIGIN="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}/sessions-assets"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"

scripts/docker-compose/docker-envs/assist.env

@@ -1,11 +0,0 @@
-ASSIST_JWT_SECRET="${COMMON_ASSIST_JWT_SECRET}"
-ASSIST_KEY="${COMMON_ASSIST_KEY}"
-AWS_DEFAULT_REGION="us-east-1"
-S3_HOST="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}:80"
-S3_KEY="${COMMON_S3_KEY}"
-S3_SECRET="${COMMON_S3_SECRET}"
-REDIS_URL="redis-master.db.svc.cluster.local"
-CLEAR_SOCKET_TIME="720"
-debug="0"
-redis="false"
-uws="false"

scripts/docker-compose/docker-envs/canvases.env

@@ -1,10 +0,0 @@
-AWS_ACCESS_KEY_ID="${COMMON_S3_KEY}"
-AWS_SECRET_ACCESS_KEY="${COMMON_S3_SECRET}"
-AWS_ENDPOINT="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-AWS_REGION="us-east-1"
-BUCKET_NAME="mobs"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-FS_CLEAN_HRS="24"

scripts/docker-compose/docker-envs/chalice.env

@@ -1,61 +0,0 @@
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-KAFKA_SERVERS="kafka.db.svc.cluster.local"
-ch_username="default"
-ch_password=""
-ch_host="clickhouse-openreplay-clickhouse.db.svc.cluster.local"
-ch_port="9000"
-ch_port_http="8123"
-sourcemaps_reader="http://sourcemapreader-openreplay.app.svc.cluster.local:9000/%s/sourcemaps"
-ASSIST_URL="http://assist-openreplay.app.svc.cluster.local:9001/assist/%s"
-ASSIST_JWT_SECRET="${COMMON_ASSIST_JWT_SECRET}"
-JWT_SECRET="${COMMON_JWT_SECRET}"
-JWT_SPOT_SECRET="${COMMON_JWT_SPOT_SECRET}"
-ASSIST_KEY="${COMMON_ASSIST_KEY}"
-LICENSE_KEY=""
-version_number="v1.22.0"
-pg_host="postgresql.db.svc.cluster.local"
-pg_port="5432"
-pg_dbname="postgres"
-pg_user="postgres"
-pg_password="${COMMON_PG_PASSWORD}"
-SITE_URL="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-S3_HOST="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-S3_KEY="${COMMON_S3_KEY}"
-S3_SECRET="${COMMON_S3_SECRET}"
-AWS_DEFAULT_REGION="us-east-1"
-sessions_region="us-east-1"
-ASSIST_RECORDS_BUCKET="records"
-sessions_bucket="mobs"
-IOS_VIDEO_BUCKET="mobs"
-sourcemaps_bucket="sourcemaps"
-js_cache_bucket="sessions-assets"
-EMAIL_HOST=""
-EMAIL_PORT="587"
-EMAIL_USER=""
-EMAIL_PASSWORD=""
-EMAIL_USE_TLS="true"
-EMAIL_USE_SSL="false"
-EMAIL_SSL_KEY=""
-EMAIL_SSL_CERT=""
-EMAIL_FROM="OpenReplay<do-not-reply@openreplay.com>"
-CH_COMPRESSION="false"
-CLUSTER_URL="svc.cluster.local"
-JWT_EXPIRATION="86400"
-JWT_REFRESH_SECRET="${COMMON_JWT_REFRESH_SECRET}"
-JWT_SPOT_REFRESH_SECRET="${COMMON_JWT_SPOT_REFRESH_SECRET}"
-LOGLEVEL="INFO"
-PYTHONUNBUFFERED="0"
-SAML2_MD_URL=""
-announcement_url=""
-assist_secret=""
-async_Token=""
-captcha_key=""
-captcha_server=""
-iceServers=""
-idp_entityId=""
-idp_name=""
-idp_sls_url=""
-idp_sso_url=""
-idp_tenantKey=""
-idp_x509cert=""
-jwt_algorithm="HS512"

scripts/docker-compose/docker-envs/db.env

@@ -1,11 +0,0 @@
-CH_USERNAME="default"
-CH_PASSWORD=""
-CLICKHOUSE_STRING="clickhouse-openreplay-clickhouse.db.svc.cluster.local:9000/default"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-pg_password="${COMMON_PG_PASSWORD}"
-QUICKWIT_ENABLED="false"
-POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres?sslmode=disable"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-ch_db="default"

scripts/docker-compose/docker-envs/ender.env

@@ -1,6 +0,0 @@
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-pg_password="${COMMON_PG_PASSWORD}"
-POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres?sslmode=disable"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"

scripts/docker-compose/docker-envs/frontend.env

@@ -1,2 +0,0 @@
-TRACKER_HOST="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}/script"
-HTTP_PORT="80"

scripts/docker-compose/docker-envs/heuristics.env

@@ -1,4 +0,0 @@
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"

scripts/docker-compose/docker-envs/http.env

@@ -1,15 +0,0 @@
-BUCKET_NAME="uxtesting-records"
-CACHE_ASSETS="true"
-AWS_ACCESS_KEY_ID="${COMMON_S3_KEY}"
-AWS_SECRET_ACCESS_KEY="${COMMON_S3_SECRET}"
-AWS_REGION="us-east-1"
-AWS_ENDPOINT="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-pg_password="${COMMON_PG_PASSWORD}"
-POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres?sslmode=disable"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-JWT_SECRET="${COMMON_JWT_SECRET}"
-JWT_SPOT_SECRET="${COMMON_JWT_SPOT_SECRET}"
-TOKEN_SECRET="${COMMON_TOKEN_SECRET}"

scripts/docker-compose/docker-envs/images.env

@@ -1,10 +0,0 @@
-AWS_ACCESS_KEY_ID="${COMMON_S3_KEY}"
-AWS_SECRET_ACCESS_KEY="${COMMON_S3_SECRET}"
-AWS_ENDPOINT="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-AWS_REGION="us-east-1"
-BUCKET_NAME="mobs"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-FS_CLEAN_HRS="24"

scripts/docker-compose/docker-envs/integrations.env

@@ -1,13 +0,0 @@
-AWS_ACCESS_KEY_ID="${COMMON_S3_KEY}"
-AWS_SECRET_ACCESS_KEY="${COMMON_S3_SECRET}"
-AWS_ENDPOINT="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-AWS_REGION="us-east-1"
-BUCKET_NAME="mobs"
-JWT_SECRET="${COMMON_JWT_SECRET}"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-pg_password="${COMMON_PG_PASSWORD}"
-POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres?sslmode=disable"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-TOKEN_SECRET="secret_token_string"

scripts/docker-compose/docker-envs/sink.env

@@ -1,5 +0,0 @@
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-ASSETS_ORIGIN="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}/sessions-assets"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"

scripts/docker-compose/docker-envs/sourcemapreader.env

@@ -1,11 +0,0 @@
-SMR_HOST="0.0.0.0"
-S3_HOST="http://minio.db.svc.cluster.local:9000"
-S3_KEY="${COMMON_S3_KEY}"
-S3_SECRET="${COMMON_S3_SECRET}"
-AWS_REGION="us-east-1"
-LICENSE_KEY=""
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres"
-ASSETS_ORIGIN="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}/sessions-assets"

scripts/docker-compose/docker-envs/spot.env

@@ -1,16 +0,0 @@
-CACHE_ASSETS="true"
-FS_CLEAN_HRS="24"
-TOKEN_SECRET="secret_token_string"
-AWS_ACCESS_KEY_ID="${COMMON_S3_KEY}"
-AWS_SECRET_ACCESS_KEY="${COMMON_S3_SECRET}"
-BUCKET_NAME="spots"
-AWS_REGION="us-east-1"
-AWS_ENDPOINT="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-JWT_SECRET="${COMMON_JWT_SECRET}"
-JWT_SPOT_SECRET="${COMMON_JWT_SPOT_SECRET}"
-pg_password="${COMMON_PG_PASSWORD}"
-POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres?sslmode=disable"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"

scripts/docker-compose/docker-envs/storage.env

@@ -1,10 +0,0 @@
-AWS_ACCESS_KEY_ID="${COMMON_S3_KEY}"
-AWS_SECRET_ACCESS_KEY="${COMMON_S3_SECRET}"
-AWS_ENDPOINT="${COMMON_PROTOCOL}://${COMMON_DOMAIN_NAME}"
-AWS_REGION="us-east-1"
-BUCKET_NAME="mobs"
-LICENSE_KEY=""
-KAFKA_SERVERS="kafka.db.svc.cluster.local:9092"
-KAFKA_USE_SSL="false"
-REDIS_STRING="redis://redis-master.db.svc.cluster.local:6379"
-FS_CLEAN_HRS="24"

scripts/docker-compose/ender.env

@@ -0,0 +1,6 @@
+LICENSE_KEY=''
+KAFKA_SERVERS='kafka.db.svc.cluster.local:9092'
+KAFKA_USE_SSL='false'
+pg_password="${COMMON_PG_PASSWORD}"
+POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql:5432/postgres"
+REDIS_STRING='redis://redis:6379'

scripts/docker-compose/hacks/Makefile

@@ -1,38 +0,0 @@
-.PHONY: default
-default: create-compose
-
-help: ## Prints help for targets with comments
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ \
-		{ printf "  \033[36m%-25s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
-
-.PHONY: helm-template
-helm-template:
-	@rm -rf yamls
-	@mkdir yamls
-	@helm template op ../../helmcharts/openreplay -n app -f ../../helmcharts/vars.yaml -f vars.yaml > yamls/deployment.yaml 
-
-.PHONY: create-yamls
-create-yamls: helm-template
-	@awk -v RS='---' 'NR>1{kind=""; name=""; if(match($$0, /kind:[[:space:]]*([a-zA-Z]+)/, k) &&  \
-				match($$0, /name:[[:space:]]*([a-zA-Z0-9_.-]+)/, n)) \
-				{kind=k[1]; name=n[1]; if(kind == "Deployment") print $$0 > "yamls/"name".yaml";}}' yamls/deployment.yaml
-	@rm yamls/ingress-nginx.yaml
-	@rm yamls/deployment.yaml
-
-.PHONY: create-envs
-create-envs: create-yamls ## Create envs from deployment
-	@echo Creating env vars...
-	@rm -rf ../docker-envs
-	@mkdir ../docker-envs
-	@# @find ./ -type f -iname "Deployment" -exec templater -i env.tpl -f ../deployment.yaml {} > {}.env \;
-	@find yamls/ -type f -name "*.yaml" -exec sh -c 'filename=$$(basename {} -openreplay.yaml); \
-				templater -i tpls/env.tpl -f {} > ../docker-envs/$${filename}.env' \;
-	@# Replace all http/https for COMMON_DOMAIN_NAME with COMMON_PROTOCOL
-	@find ../docker-envs/ -type f -name "*.env" -exec sed -i 's|http[s]\?://\$${COMMON_DOMAIN_NAME}|\$${COMMON_PROTOCOL}://\$${COMMON_DOMAIN_NAME}|g' {} \;
-
-.PHONY: create-compose
-create-compose: create-envs ## Create docker-compose.yml
-	@echo creating docker-compose yaml
-	$(eval FILES := $(shell find yamls/ -type f -name "*.yaml" -exec basename {} .yaml \; | tr '\n' ',' | sed 's/,$$//'))
-	@#echo "Files found: $(FILES)"
-	@FILES=$(FILES) templater -i tpls/docker-compose.tpl -f ../../helmcharts/vars.yaml -f vars.yaml > ../docker-compose.yaml

scripts/docker-compose/hacks/tpls/docker-compose.tpl

@@ -1,228 +0,0 @@
-{{/* # vim: ft=helm: */}}
-# vim: ft=yaml
-version: '3'
-
-services:
-
-  postgresql:
-    image: bitnami/postgresql:${POSTGRES_VERSION}
-    container_name: postgres
-    volumes:
-      - pgdata:/bitnami/postgresql
-    networks:
-      openreplay-net:
-        aliases:
-          - postgresql.db.svc.cluster.local
-    environment:
-      POSTGRESQL_PASSWORD: "{{.Values.global.postgresql.postgresqlPassword}}"
-
-  clickhouse:
-    image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}
-    container_name: clickhouse
-    volumes:
-      - clickhouse:/var/lib/clickhouse
-    networks:
-      openreplay-net:
-        aliases:
-          - clickhouse-openreplay-clickhouse.db.svc.cluster.local
-    environment:
-      CLICKHOUSE_USER: "default"
-      CLICKHOUSE_PASSWORD: ""
-      CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: "1"
-
-  redis:
-    image: bitnami/redis:${REDIS_VERSION}
-    container_name: redis
-    volumes:
-      - redisdata:/bitnami/redis/data
-    networks:
-      openreplay-net:
-        aliases:
-          - redis-master.db.svc.cluster.local
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
-
-  minio:
-    image: bitnami/minio:${MINIO_VERSION}
-    container_name: minio
-    volumes:
-      - miniodata:/bitnami/minio/data
-    networks:
-      openreplay-net:
-        aliases:
-          - minio.db.svc.cluster.local
-    ports:
-      - 9001:9001
-    environment:
-      MINIO_ROOT_USER: {{.Values.minio.global.minio.accessKey}}
-      MINIO_ROOT_PASSWORD: {{.Values.minio.global.minio.secretKey}}
-
-  fs-permission:
-    image: debian:stable-slim
-    container_name: fs-permission
-    profiles:
-      - "migration"
-    volumes:
-      - shared-volume:/mnt/efs
-      - miniodata:/mnt/minio
-      - pgdata:/mnt/postgres
-    entrypoint:
-      - /bin/bash
-      - -c
-      - |
-        chown -R 1001:1001 /mnt/{efs,minio,postgres}
-    restart: on-failure
-
-  minio-migration:
-    image: bitnami/minio:2020.10.9-debian-10-r6
-    container_name: minio-migration
-    profiles:
-      - "migration"
-    depends_on:
-      - minio
-      - fs-permission
-    networks:
-      - openreplay-net
-    volumes:
-      - ../helmcharts/openreplay/files/minio.sh:/tmp/minio.sh
-    environment:
-      MINIO_HOST: http://minio.db.svc.cluster.local:9000
-      MINIO_ACCESS_KEY: {{.Values.minio.global.minio.accessKey}}
-      MINIO_SECRET_KEY: {{.Values.minio.global.minio.secretKey}}
-    user: root
-    entrypoint:
-      - /bin/bash
-      - -c
-      - |
-          apt update && apt install netcat -y
-          # Wait for Minio to be ready
-          until nc -z -v -w30 minio 9000; do
-              echo "Waiting for Minio server to be ready..."
-              sleep 1
-          done
-          bash /tmp/minio.sh init || exit 100
-
-  db-migration:
-    image: bitnami/postgresql:14.5.0
-    container_name: db-migration
-    profiles:
-      - "migration"
-    depends_on:
-      - postgresql
-      - minio-migration
-    networks:
-      - openreplay-net
-    volumes:
-      - ../schema/db/init_dbs/postgresql/init_schema.sql:/tmp/init_schema.sql
-    environment:
-      PGHOST: postgresql
-      PGPORT: 5432
-      PGDATABASE: postgres
-      PGUSER: postgres
-      PGPASSWORD: {{.Values.global.postgresql.postgresqlPassword}}
-    entrypoint:
-      - /bin/bash
-      - -c
-      - |
-          until psql -c '\q'; do
-          echo "PostgreSQL is unavailable - sleeping"
-          sleep 1
-          done
-          echo "PostgreSQL is up - executing command"
-          psql -v ON_ERROR_STOP=1 -f /tmp/init_schema.sql
-
-  clickhouse-migration:
-    image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}
-    container_name: clickhouse-migration
-    profiles:
-      - "migration"
-    depends_on:
-      - clickhouse
-      - minio-migration
-    networks:
-      - openreplay-net
-    volumes:
-      - ../schema/db/init_dbs/clickhouse/create/init_schema.sql:/tmp/init_schema.sql
-    environment:
-      CH_HOST: "{{.Values.global.clickhouse.chHost}}"
-      CH_PORT: "{{.Values.global.clickhouse.service.webPort}}"
-      CH_PORT_HTTP: "{{.Values.global.clickhouse.service.dataPort}}"
-      CH_USERNAME: "{{.Values.global.clickhouse.username}}"
-      CH_PASSWORD: "{{.Values.global.clickhouse.password}}"
-    entrypoint:
-      - /bin/bash
-      - -c
-      - |
-          # Checking variable is empty. Shell independant method.
-          # Wait for Minio to be ready
-          until nc -z -v -w30 {{.Values.global.clickhouse.chHost}} {{.Values.global.clickhouse.service.webPort}}; do
-              echo "Waiting for Minio server to be ready..."
-              sleep 1
-          done
-
-          echo "clickhouse is up - executing command"
-          clickhouse-client -h {{.Values.global.clickhouse.chHost}} --user {{.Values.global.clickhouse.username}} --port {{.Values.global.clickhouse.service.webPort}} --multiquery < /tmp/init_schema.sql || true
-
-  {{- define "service" -}}
-  {{- $service_name := . }}
-  {{- $container_name := (splitList "-" $service_name) | first | printf "%s" }}
-  {{print $service_name}}:
-    image: public.ecr.aws/p1t3u8a3/{{$container_name}}:${COMMON_VERSION}
-    domainname: app.svc.cluster.local
-    container_name: {{print $container_name}}
-    networks:
-      openreplay-net:
-        aliases:
-          - {{print $container_name}}-openreplay
-          - {{print $container_name}}-openreplay.app.svc.cluster.local
-    volumes:
-      - shared-volume:/mnt/efs
-    env_file:
-      - docker-envs/{{print $container_name}}.env
-    environment: {}  # Fallback empty environment if env_file is missing
-    restart: unless-stopped
-  {{ end -}}
-
-  {{- range $file := split "," (env "FILES")}}
-  {{ template "service" $file}}
-  {{- end}}
-
-  nginx-openreplay:
-    image: nginx:latest
-    container_name: nginx
-    networks:
-      - openreplay-net
-    volumes:
-      - ./nginx.conf:/etc/nginx/conf.d/default.conf
-    restart: unless-stopped
-
-
-  caddy:
-    image: caddy:latest
-    container_name: caddy
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - ./Caddyfile:/etc/caddy/Caddyfile
-      - caddy_data:/data
-      - caddy_config:/config
-    networks:
-      - openreplay-net
-    environment:
-      - ACME_AGREE=true # Agree to Let's Encrypt Subscriber Agreement
-      - CADDY_DOMAIN=${CADDY_DOMAIN}
-    restart: unless-stopped
-
-
-volumes:
-  pgdata:
-  clickhouse:
-  redisdata:
-  miniodata:
-  shared-volume:
-  caddy_data:
-  caddy_config:
-
-networks:
-  openreplay-net:

scripts/docker-compose/hacks/tpls/env.tpl

@@ -1,6 +0,0 @@
-{{- $excludedKeys := list "POD_NAMESPACE" -}}
-{{ range (index .Values.spec.template.spec.containers 0).env -}}
-{{- if not (has .name $excludedKeys) -}}
-{{ .name }}="{{ if eq .value "<no value>" }}{{ else }}{{ .value }}{{ end }}"
-{{ end -}}
-{{ end -}}

scripts/docker-compose/hacks/vars.yaml

@@ -1,26 +0,0 @@
-postgresql: &postgres
-  postgresqlPassword: '${COMMON_PG_PASSWORD}'
-minio:
-  global:
-    minio:
-      accessKey: &accessKey '${COMMON_S3_KEY}'
-      secretKey: &secretKey '${COMMON_S3_SECRET}'
-global:
-  pg_connection_string: "postgres://postgres:${COMMON_PG_PASSWORD}@postgresql.db.svc.cluster.local:5432/postgres?sslmode=disable"
-  postgresql: *postgres
-  assistKey: '${COMMON_ASSIST_KEY}'
-  assistJWTSecret: '${COMMON_ASSIST_JWT_SECRET}'
-  jwtSecret: '${COMMON_JWT_SECRET}'
-  jwtSpotSecret: '${COMMON_JWT_SPOT_SECRET}'
-  tokenSecret: '${COMMON_TOKEN_SECRET}'
-  domainName: "${COMMON_DOMAIN_NAME}"
-  ORSecureAccess: false
-  s3:
-    accessKey: *accessKey
-    secretKey: *secretKey
-chalice:
-  env:
-    JWT_REFRESH_SECRET: "${COMMON_JWT_REFRESH_SECRET}"
-    JWT_SPOT_REFRESH_SECRET: "${COMMON_JWT_SPOT_REFRESH_SECRET}"
-    POD_NAMESPACE: app
-    CLUSTER_URL: svc.cluster.local

scripts/docker-compose/heuristics.env

@@ -0,0 +1,4 @@
+LICENSE_KEY=''
+KAFKA_SERVERS='kafka.db.svc.cluster.local:9092'
+KAFKA_USE_SSL='false'
+REDIS_STRING='redis://redis:6379'

scripts/docker-compose/http.env

@@ -0,0 +1,12 @@
+CACHE_ASSETS='true'
+TOKEN_SECRET='secret_token_string'
+AWS_ACCESS_KEY_ID=${COMMON_S3_KEY}
+AWS_SECRET_ACCESS_KEY=${COMMON_S3_SECRET}
+AWS_REGION='us-east-1'
+LICENSE_KEY=''
+KAFKA_SERVERS='kafka.db.svc.cluster.local:9092'
+KAFKA_USE_SSL='false'
+pg_password="${COMMON_PG_PASSWORD}"
+POSTGRES_STRING="postgres://postgres:${COMMON_PG_PASSWORD}@postgresql:5432/postgres"
+REDIS_STRING='redis://redis:6379'
+BUCKET_NAME='uxtesting-records'

scripts/docker-compose/imagestorage.env

@@ -0,0 +1,10 @@
+AWS_ACCESS_KEY_ID=${COMMON_S3_KEY}
+AWS_SECRET_ACCESS_KEY=${COMMON_S3_SECRET}
+AWS_ENDPOINT='http://minio:9000'
+AWS_REGION='us-east-1'
+BUCKET_NAME=mobs
+LICENSE_KEY=''
+KAFKA_SERVERS='kafka.db.svc.cluster.local:9092'
+KAFKA_USE_SSL='false'
+REDIS_STRING='redis://redis:6379'
+FS_CLEAN_HRS='24'