ui: fix double metric selection in list

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>

.github/workflows/patch-build.yaml

@@ -98,7 +98,7 @@ jobs:
             local current_version new_version
 
             current_version=$(yq eval '.AppVersion' "$chart_path")
-            new_version=$(echo "$current_version" | awk -F. '{$NF += 2; print $1"."$2"."$3}')
+            new_version=$(echo "$current_version" | awk -F. '{$NF += 1; print $1"."$2"."$3}')
             echo "$new_version"
         }
 
@@ -119,7 +119,6 @@ jobs:
         build_managed() {
             local service=$1
             local version=$2
-            local log_file="/tmp/managed_${service}.txt"
 
             echo "Building managed service: $service"
             clone_msaas
@@ -132,9 +131,9 @@ jobs:
 
             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"
 
-            if ! eval "$build_cmd" >>"$log_file" 2>&1; then
+            echo "Executing: $build_cmd"
+            if ! eval "$build_cmd" 2>&1; then
                 echo "Build failed for $service"
-                cat "$log_file"
                 exit 1
             fi
         }
@@ -215,7 +214,7 @@ jobs:
 
                 # Build FOSS and EE versions
                 build_service "$service" "$version" "$foss_build_args"
-                build_service "$service" "$version" "$ee_build_args"
+                build_service "$service" "${version}-ee" "$ee_build_args"
 
                 # Build managed version for specific services
                 if [[ "$service" != "chalice" && "$service" != "frontend" ]]; then
@@ -238,16 +237,16 @@ jobs:
         main "$SERVICES_INPUT"
         
 
-    # - name: Create Pull Request
-    #   uses: repo-sync/pull-request@v2
-    #   with:
-    #     github_token: ${{ secrets.ACTIONS_COMMMIT_TOKEN }}
-    #     source_branch: ${{ env.BRANCH_NAME }}
-    #     destination_branch: "main"
-    #     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.
+    - name: Create Pull Request
+      uses: repo-sync/pull-request@v2
+      with:
+        github_token: ${{ secrets.ACTIONS_COMMMIT_TOKEN }}
+        source_branch: ${{ env.BRANCH_NAME }}
+        destination_branch: "main"
+        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.
 
     # - name: Debug Job
     #   if: ${{ failure() }}

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,10 +95,9 @@ 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})
             )
@@ -112,9 +111,10 @@ 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

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

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

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

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

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

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

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

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

frontend/app/mstore/dashboardStore.ts

@@ -1,12 +1,13 @@
 import { makeAutoObservable, runInAction, reaction } from 'mobx';
 import { dashboardService, metricService } from 'App/services';
 import { toast } from 'react-toastify';
-import Period, { LAST_24_HOURS, LAST_7_DAYS } from 'Types/app/period';
+import Period, { LAST_24_HOURS } 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;
@@ -90,16 +91,20 @@ export default class DashboardStore {
       () => 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)
-  }
+    this.setDensity(defaultOption.key);
+  };
 
   setDensity = (density: number) => {
     this.selectedDensity = density;
@@ -462,7 +467,7 @@ export default class DashboardStore {
     this.isSaving = true;
     try {
       try {
-        const response = await dashboardService.addWidget(dashboard, metricIds);
+        await dashboardService.addWidget(dashboard, metricIds);
         toast.success('Card added to dashboard.');
       } catch {
         toast.error('Card could not be added.');
@@ -472,6 +477,17 @@ 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,
@@ -545,7 +561,7 @@ export default class DashboardStore {
         const data = await metricService.getMetricChartData(
           metric,
           params,
-          isSaved
+          isSaved,
         );
         resolve(metric.setData(data, period, isComparison, density));
       } catch (error) {

scripts/docker-compose/nginx.conf

@@ -54,6 +54,25 @@ server {
       add_header 'Access-Control-Allow-Headers' 'Content-Type,Authorization,Content-Encoding';
       add_header 'Access-Control-Expose-Headers' 'Content-Length';
     }
+    location /integrations/ {
+      rewrite ^/integrations/(.*) /$1 break;
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "Upgrade";
+      proxy_set_header X-Forwarded-For $real_ip;
+      proxy_set_header X-Forwarded-Host $real_ip;
+      proxy_set_header X-Real-IP $real_ip;
+      proxy_set_header Host $host;
+      proxy_pass http://integrations-openreplay:8080;
+      proxy_read_timeout 300;
+      proxy_connect_timeout 120;
+      proxy_send_timeout 300;
+      # CORS Headers
+      add_header 'Access-Control-Allow-Origin' '*';
+      add_header 'Access-Control-Allow-Methods' 'POST,PATCH,OPTIONS,DELETE';
+      add_header 'Access-Control-Allow-Headers' 'Content-Type,Authorization,Content-Encoding,X-Openreplay-Batch';
+      add_header 'Access-Control-Expose-Headers' 'Content-Length';
+    }
 
     location /api/ {
       rewrite ^/api/(.*) /$1 break;

scripts/helmcharts/openreplay/charts/frontend/Chart.yaml

@@ -18,4 +18,4 @@ version: 0.1.10
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-AppVersion: "v1.22.39"
+AppVersion: "v1.22.42"