Merge branch 'main' into dev

Author: FalkWolsky

client/packages/lowcoder/src/components/CompName.tsx

@@ -115,6 +115,12 @@ export const CompName = (props: Iprops) => {
 
 
   if (compInfo.isRemote) {
+    // Falk: Displaying the current version of the component
+    items.push({
+      text: trans("history.currentVersion") + ": " + compInfo.packageVersion,
+      onClick: () => {
+      },
+    });
     items.push({
       text: trans("history.currentVersion") + ": " + compInfo.packageVersion,
       onClick: () => {
@@ -127,6 +133,7 @@ export const CompName = (props: Iprops) => {
       onClick: () => {
         handleUpgrade();
       },
+      
     });
   }
 

client/packages/lowcoder/src/pages/editor/editorView.tsx

@@ -374,6 +374,9 @@ function EditorView(props: EditorViewProps) {
   // we check if we are on the public cloud
   const isLowCoderDomain = window.location.hostname === 'app.lowcoder.cloud';
 
+  // we check if we are on the public cloud
+  const isLowCoderDomain = window.location.hostname === 'app.lowcoder.cloud';
+
   if (readOnly && hideHeader) {
     return (
       <CustomShortcutWrapper>
@@ -464,7 +467,6 @@ function EditorView(props: EditorViewProps) {
             <script key="clearbit-script" src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js" referrerPolicy="strict-origin-when-cross-origin" type="text/javascript"></script>
         ]}
       </Helmet>
-
       {showNewUserGuide && <EditorTutorials />}
       <EditorGlobalHotKeys
         disabled={readOnly}

client/packages/lowcoder/src/pages/editor/right/PluginPanel/index.tsx

@@ -36,7 +36,6 @@ export default function PluginPanel() {
       }),
     [commonSettings?.npmPlugins]
   );
-  
   const handleSetNpmPlugins = (nextNpmPlugins: string[]) => {
     dispatch(
       setCommonSettings({

deploy/helm/Chart.yaml

@@ -13,10 +13,10 @@ appVersion: "latest"
 dependencies:
   - condition: redis.enabled
     name: redis
-    repository: https://charts.bitnami.com/bitnami
-    version: 17.0.10
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 19.1.0
   - condition: mongodb.enabled
     name: mongodb
-    repository: https://charts.bitnami.com/bitnami
-    version: 13.6.2
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 15.1.4
 

deploy/helm/templates/_helpers.tpl

@@ -62,7 +62,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "lowcoder.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "lowcoder.name" . }}
+{{- $name := include "lowcoder.name" . -}}
+{{- $componentName := .component | default "" -}}
+{{- if ne $componentName "" -}}
+app.kubernetes.io/name: {{ $name }}-{{ $componentName }}
+{{- else -}}
+app.kubernetes.io/name: {{ $name }}
+{{- end }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

deploy/helm/templates/api-service/deployment.yaml

@@ -10,15 +10,15 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "lowcoder.selectorLabels" . | nindent 6 }}
+      {{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "lowcoder.selectorLabels" . | nindent 8 }}
+        {{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

deploy/helm/templates/api-service/service.yaml

@@ -17,4 +17,4 @@ spec:
       {{- end }}
     {{- end }}
   selector:
-    {{- include "lowcoder.selectorLabels" . | nindent 4 }}
+    {{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

deploy/helm/templates/frontend/deployment.yaml

@@ -10,15 +10,15 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "lowcoder.selectorLabels" . | nindent 6 }}
+      {{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "lowcoder.selectorLabels" . | nindent 8 }}
+        {{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

deploy/helm/templates/frontend/service.yaml

@@ -17,4 +17,4 @@ spec:
       {{- end }}
     {{- end }}
   selector:
-    {{- include "lowcoder.selectorLabels" . | nindent 4 }}
+    {{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

deploy/helm/templates/node-service/deployment.yaml

@@ -10,15 +10,15 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "lowcoder.selectorLabels" . | nindent 6 }}
+      {{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "lowcoder.selectorLabels" . | nindent 8 }}
+        {{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

deploy/helm/templates/node-service/service.yaml

@@ -17,4 +17,4 @@ spec:
       {{- end }}
     {{- end }}
   selector:
-    {{- include "lowcoder.selectorLabels" . | nindent 4 }}
+    {{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

deploy/helm/values.yaml

@@ -136,9 +136,9 @@ frontend:
     #tag: "latest"
 
   service:
-    type: NodePort
+    type: ClusterIP
     port: 80
-    nodePort: 30099
+    #nodePort: 30099
 
   replicaCount: 1
   autoscaling: