From 04dce192cb89214f97711c2a5910c3bc982082d5 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Tue, 7 Apr 2020 18:17:21 +0200
Subject: [PATCH 1/2] Fix broken link in Deploy App buton

---
 dashboard/src/components/AppList/AppList.tsx         |  3 ++-
 .../AppList/__snapshots__/AppList.test.tsx.snap      | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dashboard/src/components/AppList/AppList.tsx b/dashboard/src/components/AppList/AppList.tsx
index 0c57e729239..1dca1675365 100644
--- a/dashboard/src/components/AppList/AppList.tsx
+++ b/dashboard/src/components/AppList/AppList.tsx
@@ -63,6 +63,7 @@ class AppList extends React.Component<IAppListProps, IAppListState> {
     const {
       apps: { error, isFetching },
       isFetchingResources,
+      namespace,
     } = this.props;
     return (
       <section className="AppList">
@@ -75,7 +76,7 @@ class AppList extends React.Component<IAppListProps, IAppListState> {
           </div>
           <div className="col-3 text-r align-center">
             {!error && (
-              <Link to="/catalog">
+              <Link to={`/ns/${namespace}/catalog`}>
                 <button className="deploy-button button button-accent">Deploy App</button>
               </Link>
             )}
diff --git a/dashboard/src/components/AppList/__snapshots__/AppList.test.tsx.snap b/dashboard/src/components/AppList/__snapshots__/AppList.test.tsx.snap
index f67fc0e7887..f7839c67cbc 100644
--- a/dashboard/src/components/AppList/__snapshots__/AppList.test.tsx.snap
+++ b/dashboard/src/components/AppList/__snapshots__/AppList.test.tsx.snap
@@ -40,7 +40,7 @@ exports[`when apps available matches the snapshot 1`] = `
       className="col-3 text-r align-center"
     >
       <Link
-        to="/catalog"
+        to="/ns/default/catalog"
       >
         <button
           className="deploy-button button button-accent"
@@ -117,7 +117,7 @@ exports[`when custom resources available matches the snapshot 1`] = `
       className="col-3 text-r align-center"
     >
       <Link
-        to="/catalog"
+        to="/ns/default/catalog"
       >
         <button
           className="deploy-button button button-accent"
@@ -277,7 +277,7 @@ exports[`when fetched but not apps available matches the snapshot 1`] = `
       className="col-3 text-r align-center"
     >
       <Link
-        to="/catalog"
+        to="/ns/default/catalog"
       >
         <button
           className="deploy-button button button-accent"
@@ -348,7 +348,7 @@ exports[`while fetching apps loading spinner matches the snapshot 1`] = `
       className="col-3 text-r align-center"
     >
       <Link
-        to="/catalog"
+        to="/ns/default/catalog"
       >
         <button
           className="deploy-button button button-accent"
@@ -419,7 +419,7 @@ exports[`while fetching apps loading spinner matches the snapshot 2`] = `
       className="col-3 text-r align-center"
     >
       <Link
-        to="/catalog"
+        to="/ns/default/catalog"
       >
         <button
           className="deploy-button button button-accent"
@@ -490,7 +490,7 @@ exports[`while fetching apps matches the snapshot 1`] = `
       className="col-3 text-r align-center"
     >
       <Link
-        to="/catalog"
+        to="/ns/default/catalog"
       >
         <button
           className="deploy-button button button-accent"

From c70a503de478a2b040c0e1070a8d12211f80f5a4 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Tue, 7 Apr 2020 18:42:24 +0200
Subject: [PATCH 2/2] Fix link in Catalog card

---
 dashboard/src/components/Catalog/CatalogItem.tsx             | 5 ++++-
 .../Catalog/__snapshots__/CatalogItem.test.tsx.snap          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dashboard/src/components/Catalog/CatalogItem.tsx b/dashboard/src/components/Catalog/CatalogItem.tsx
index 4e43efcd02c..6685aa75c07 100644
--- a/dashboard/src/components/Catalog/CatalogItem.tsx
+++ b/dashboard/src/components/Catalog/CatalogItem.tsx
@@ -44,7 +44,10 @@ const CatalogItem: React.SFC<ICatalogItemProps> = props => {
   let subIcon;
   if (type === "chart") {
     tag1 = (
-      <Link className="ListItem__content__info_tag_link" to={`/catalog/${repoName}`}>
+      <Link
+        className="ListItem__content__info_tag_link"
+        to={`/ns/${namespace}/catalog/${repoName}`}
+      >
         {repoName}
       </Link>
     );
diff --git a/dashboard/src/components/Catalog/__snapshots__/CatalogItem.test.tsx.snap b/dashboard/src/components/Catalog/__snapshots__/CatalogItem.test.tsx.snap
index a86ada9e3df..2d388286229 100644
--- a/dashboard/src/components/Catalog/__snapshots__/CatalogItem.test.tsx.snap
+++ b/dashboard/src/components/Catalog/__snapshots__/CatalogItem.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`should render an item 1`] = `
   tag1Content={
     <Unknown
       className="ListItem__content__info_tag_link"
-      to="/catalog/undefined"
+      to="/ns/kubeapps/catalog/undefined"
     />
   }
   title="foo"