Avoid double v prefix in the AppList (#2123)

vmware-tanzu · Oct 26, 2020 · 8f27769 · 8f27769
1 parent e5a1bea
commit 8f27769
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/dashboard/src/components/AppList/AppListItem.test.tsx b/dashboard/src/components/AppList/AppListItem.test.tsx
@@ -79,3 +79,19 @@ it("should add a second label with the app update available", () => {
   const tooltip = wrapper.find(Tooltip);
   expect(tooltip.text()).toBe("New App Version: 1.1.0");
 });
+
+it("doesn't include a double v prefix", () => {
+  const props = {
+    ...defaultProps,
+    app: {
+      ...defaultProps.app,
+      chartMetadata: {
+        name: "foo",
+        appVersion: "v1.0.0",
+      },
+      updateInfo: {},
+    },
+  } as IAppListItemProps;
+  const wrapper = mountWrapper(defaultStore, <AppListItem {...props} />);
+  expect(wrapper.find("span").findWhere(s => s.text() === "App: foo v1.0.0")).toExist();
+});
diff --git a/dashboard/src/components/AppList/AppListItem.tsx b/dashboard/src/components/AppList/AppListItem.tsx
@@ -60,7 +60,9 @@ function AppListItem(props: IAppListItemProps) {
         <div>
           <span>
             App: {app.chartMetadata.name}{" "}
-            {app.chartMetadata.appVersion ? `v${app.chartMetadata.appVersion}` : ""}
+            {app.chartMetadata.appVersion
+              ? `v${app.chartMetadata.appVersion.replace(/^v/, "")}`
+              : ""}
           </span>
           <br />
           <span>Chart: {app.chartMetadata.version}</span>

diff --git a/script/chart_sync_utils.sh b/script/chart_sync_utils.sh
@@ -71,6 +71,7 @@ replaceImage() {
 updateRepo() {
     local targetRepo=${1:?}
     local targetTag=${2:?}
+    local targetTagWithoutV=${targetTag#v}
     local targetChartPath="${targetRepo}/${CHART_REPO_PATH}"
     local chartYaml="${targetChartPath}/Chart.yaml"
     if [ ! -f "${chartYaml}" ]; then
@@ -80,7 +81,7 @@ updateRepo() {
     rm -rf "${targetChartPath}"
     cp -R "${KUBEAPPS_CHART_DIR}" "${targetChartPath}"
     # Update Chart.yaml with new version
-    sed -i.bk 's/appVersion: DEVEL/appVersion: '"${targetTag}"'/g' "${chartYaml}"
+    sed -i.bk 's/appVersion: DEVEL/appVersion: '"${targetTagWithoutV}"'/g' "${chartYaml}"
     rm "${targetChartPath}/Chart.yaml.bk"
     # Replace images for the latest available
     replaceImage dashboard "${targetChartPath}/values.yaml"