From 9bfd1a54ef710ac3bc6d773b88245732809194b5 Mon Sep 17 00:00:00 2001
From: --global <--global>
Date: Mon, 14 Feb 2022 16:54:53 +0100
Subject: [PATCH 1/4] chore(http): check for custom endpoint for caching

Signed-off-by: --global <--global>
---
 .../openreplay/charts/assets/templates/deployment.yaml        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
index 1af5164ca..1c8216468 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
@@ -59,7 +59,11 @@ spec:
             # Ref: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
             # We need https://bucketname.s3endpoint
             - name: ASSETS_ORIGIN
+            {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }}
+              value: 'https://{{ .Values.global.domainName }}/{{.Values.global.s3.assetsBucket}}'
+            {{- else }}
               value: {{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }}
+            {{- end }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'

From f97277269c9e0ab9829c3a3dd0d49f6fe27bde03 Mon Sep 17 00:00:00 2001
From: --global <--global>
Date: Tue, 15 Feb 2022 05:57:55 +0100
Subject: [PATCH 2/4] fix(migration): template file variable values

---
 scripts/helmcharts/vars_template.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/helmcharts/vars_template.yaml b/scripts/helmcharts/vars_template.yaml
index 2230e0a75..1e008250d 100644
--- a/scripts/helmcharts/vars_template.yaml
+++ b/scripts/helmcharts/vars_template.yaml
@@ -48,11 +48,11 @@ global:
   kafka: *kafka
   redis: *redis
   s3:
-    region: "us-east-1"
-    endpoint: "http://minio.db.svc.cluster.local:9000"
-    assetsBucket: "sessions-assets"
-    recordingsBucket: "mobs"
-    sourcemapsBucket: "sourcemaps"
+    region: "{{ aws_region }}"
+    endpoint: "{{ s3_endpoint }}"
+    assetsBucket: "{{ assets_bucket }}"
+    recordingsBucket: "{{ recordings_bucket }}"
+    sourcemapsBucket: "{{ sourcemaps_bucket }}"
     # if you're using one node installation, where
     # you're using local s3, make sure these variables
     # are same as minio.global.minio.accesskey and  secretKey

From 1ad96045b82035ed249b8f926a8d769b5bd287cf Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 15 Feb 2022 06:30:54 +0100
Subject: [PATCH 3/4] fix(install): minio download path

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/openreplay/files/minio.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helmcharts/openreplay/files/minio.sh b/scripts/helmcharts/openreplay/files/minio.sh
index dc8fbdbb0..1cc3e0460 100644
--- a/scripts/helmcharts/openreplay/files/minio.sh
+++ b/scripts/helmcharts/openreplay/files/minio.sh
@@ -35,7 +35,7 @@ mc policy set download minio/frontend
 mc policy set download minio/sessions-assets
 mc policy set download minio/static
 
-curl -L https://github.com/openreplay/openreplay/releases/download/${CHART_APP_VERSION}/frontend.tar.gz -O
+curl -L https://github.com/openreplay/openreplay/releases/download/v${CHART_APP_VERSION}/frontend.tar.gz -O
 tar -xf frontend.tar.gz
 mc cp --recursive frontend/ minio/frontend/
 }

From da5fcc85bc8657aec4a0d058ad4b30022ed4beea Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 15 Feb 2022 13:59:43 +0100
Subject: [PATCH 4/4] fix(ui) - do not pause the live session on opening a
 fetch modal

---
 frontend/app/components/Session_/Fetch/Fetch.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/app/components/Session_/Fetch/Fetch.js b/frontend/app/components/Session_/Fetch/Fetch.js
index 8bc4f2117..2db36f76f 100644
--- a/frontend/app/components/Session_/Fetch/Fetch.js
+++ b/frontend/app/components/Session_/Fetch/Fetch.js
@@ -12,6 +12,7 @@ import { setTimelinePointer } from 'Duck/sessions';
 
 @connectPlayer(state => ({
   list: state.fetchList,
+  livePlay: state.livePlay,
 }))
 @connect(state => ({
   timelinePointer: state.getIn(['sessions', 'timelinePointer']),
@@ -36,13 +37,17 @@ export default class Fetch extends React.PureComponent {
   }
 
   setCurrent = (item, index) => {
-    pause()
-    jump(item.time)
+    if (!this.props.livePlay) {
+      pause();
+      jump(item.time)
+    }
     this.setState({ current: item, currentIndex: index });
   }
 
   onRowClick = (item, index) => {
-    pause()
+    if (!this.props.livePlay) {
+      pause();
+    }
     this.setState({ current: item, currentIndex: index, showFetchDetails: true });
     this.props.setTimelinePointer(null);
   }