From d3c9ecaf16f9171a1774d7ba7c4595335ea5d27b Mon Sep 17 00:00:00 2001
From: Falk Wolsky <fw@business-inventor.com>
Date: Wed, 19 Jun 2024 10:49:07 +0200
Subject: [PATCH 1/2] Revert "Fix kanban draggable bug"

---
 client/packages/lowcoder/src/layout/gridItem.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/packages/lowcoder/src/layout/gridItem.tsx b/client/packages/lowcoder/src/layout/gridItem.tsx
index 43fde1073..6ff2b813e 100644
--- a/client/packages/lowcoder/src/layout/gridItem.tsx
+++ b/client/packages/lowcoder/src/layout/gridItem.tsx
@@ -141,9 +141,7 @@ export function GridItem(props: GridItemProps) {
         onDrag={onDrag}
         onDragEnd={onDragEnd}
         onMouseDown={(e) => {
-          if (isDraggable) {
-            e.stopPropagation();
-          }
+          e.stopPropagation();
           const event = new MouseEvent("mousedown");
           document.dispatchEvent(event);
         }}

From bff5546613cee1333422ff14fbaceed507f1eec7 Mon Sep 17 00:00:00 2001
From: lin onetwo <linonetwo012@gmail.com>
Date: Sat, 29 Jun 2024 14:57:32 +0800
Subject: [PATCH 2/2] feat: support external redis auth

---
 deploy/helm/templates/api-service/configMap.yaml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/deploy/helm/templates/api-service/configMap.yaml b/deploy/helm/templates/api-service/configMap.yaml
index 6cbb38ca2..f48801bc4 100644
--- a/deploy/helm/templates/api-service/configMap.yaml
+++ b/deploy/helm/templates/api-service/configMap.yaml
@@ -1,6 +1,9 @@
 {{- $nameSpace := include "lowcoder.namespace" . -}}
 {{- $name := include "lowcoder.fullname" . -}}
 {{- $lowcoderDatabase := first .Values.mongodb.auth.databases -}}
+{{- $redisSecret := lookup "v1" "Secret" $nameSpace .Values.redis.auth.existingSecret | default dict -}}
+{{- $redisPassword := (index $redisSecret.data .Values.redis.auth.existingSecretPasswordKey | default "" | b64dec) -}}
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -13,9 +16,17 @@ metadata:
   {{- end }}
 data:
   {{- if .Values.redis.enabled }}
+  {{- if .Values.redis.auth.enabled }}
+  LOWCODER_REDIS_URL: "redis://{{ $redisPassword }}@{{ $name }}-redis-master.{{ $nameSpace }}.svc.cluster.local:6379"
+  {{- else }}
   LOWCODER_REDIS_URL: "redis://{{ $name }}-redis-master.{{ $nameSpace }}.svc.cluster.local:6379"
+  {{- end }}
   {{- else }}
-  LOWCODER_REDIS_URL: {{ .Values.redis.externalUrl | quote }}
+  {{- if .Values.redis.auth.enabled }}
+  LOWCODER_REDIS_URL: "redis://{{ $redisPassword }}@{{ .Values.redis.externalUrl }}"
+  {{- else }}
+  LOWCODER_REDIS_URL: "redis://{{ .Values.redis.externalUrl }}"
+  {{- end }}
   {{- end }}
   {{- if .Values.global.config.nodeServiceUrl }}
   LOWCODER_NODE_SERVICE_URL: {{ .Values.global.config.nodeServiceUrl | quote }}