fix context decoding issue in Installed component (#563)

remove redundant code

correct encode decode

Co-authored-by: Aleksandr Cupacenko <alcu@danskebank.lt>

charts/helm-dashboard/Chart.yaml

@@ -5,5 +5,5 @@ name: helm-dashboard
 description: A GUI Dashboard for Helm by Komodor
 icon: "https://raw.githubusercontent.com/komodorio/helm-dashboard/refs/heads/main/images/logo.svg"
 
-version: 2.0.1
+version: 2.0.2
-appVersion: "1.3.3" 
+appVersion: "2.0.2" 

charts/helm-dashboard/templates/_helpers.tpl

@@ -11,16 +11,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "helm-dashboard.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
 {{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
+{{- $fullname := default (ternary .Release.Name (printf "%s-%s" .Release.Name $name) (contains $name .Release.Name)) .Values.fullnameOverride }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- $fullname | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -54,11 +47,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Create the name of the service account to use
 */}}
 {{- define "helm-dashboard.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
+{{- default (.Values.serviceAccount.create | ternary (include "helm-dashboard.fullname" .) "default") .Values.serviceAccount.name }}
-{{- default (include "helm-dashboard.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -74,10 +63,7 @@ Return the proper image name
 */}}
 {{- define "helm-dashboard.image" -}}
 {{- $image := .Values.image -}}
-{{- $tag := .Chart.AppVersion -}}
+{{- $tag := default .Chart.AppVersion $image.tag -}}
-{{- if $image.tag -}}
-{{- $tag = $image.tag -}}
-{{- end -}}
 {{- $_ := set $image "tag" $tag -}}
 {{ include "common.images.image" (dict "imageRoot" $_ "global" .Values.global) }}
 {{- end -}}

charts/helm-dashboard/values.yaml

@@ -17,6 +17,8 @@ image:
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
+  # Specifies the exact image digest to pull.
+  digest: ""
   imagePullSecrets: []
 
 nameOverride: ""

frontend/package-lock.json

@@ -16161,9 +16161,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
+      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",

frontend/src/App.tsx

@@ -35,7 +35,7 @@ const PageLayout = () => {
 const SyncContext: React.FC = () => {
   const { context } = useParams();
   if (context) {
-    apiService.setCluster(context);
+    apiService.setCluster(decodeURIComponent(context));
   }
 
   return <Outlet />;

frontend/src/pages/Installed.tsx

@@ -21,7 +21,7 @@ function Installed() {
 
   const handleClusterChange = (clusterName: string) => {
     navigate({
-      pathname: `/${clusterName}/installed`,
+      pathname: `/${encodeURIComponent(clusterName)}/installed`,
     });
   };
 

frontend/yarn.lock

@@ -5147,9 +5147,9 @@ cross-fetch@^3.1.5:
     node-fetch "^2.6.12"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
+  version "7.0.6"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

plugin.yaml

@@ -1,5 +1,5 @@
 name: "dashboard"
-version: "1.3.3" 
+version: "2.0.2" 
 usage: "A simplified way of working with Helm"
 description: "View HELM situation in nice web UI"
 command: "$HELM_PLUGIN_DIR/bin/helm-dashboard"