Merge pull request #683 from tailwarden/feature/tech-952

Fix routing
tailwarden · Mar 31, 2023 · 1d49704 · 1d49704
2 parents 55be150 + bce3ba1
commit 1d49704
Show file tree

Hide file tree

Showing 5 changed files with 224 additions and 153 deletions.
diff --git a/dashboard/components/dashboard/components/cloud-map/DashboardCloudMapChart.tsx b/dashboard/components/dashboard/components/cloud-map/DashboardCloudMapChart.tsx
@@ -5,6 +5,7 @@ import {
   Geography,
   Marker
 } from 'react-simple-maps';
+import Link from 'next/link';
 import { DashboardCloudMapRegions } from './hooks/useCloudMap';
 import { DashboardCloudMapTooltipProps } from './hooks/useCloudMapTooltip';
 
@@ -54,12 +55,7 @@ function DashboardCloudMapChart({
       </Geographies>
       {regionsAscendingByNumberOfResources &&
         regionsAscendingByNumberOfResources.map((region, idx) => (
-          <a
-            key={idx}
-            href={`/inventory?region:IS:${region.label}`}
-            target="_blank"
-            rel="noreferrer"
-          >
+          <Link key={idx} href={`/inventory?region:IS:${region.label}`}>
             <Marker
               coordinates={[Number(region.longitude), Number(region.latitude)]}
               onMouseEnter={e =>
@@ -87,7 +83,7 @@ function DashboardCloudMapChart({
                 strokeWidth={1.5}
               />
             </Marker>
-          </a>
+          </Link>
         ))}
     </ComposableMap>
   );

diff --git a/...oard/components/dashboard/components/resources-manager/hooks/useResourcesManagerChart.tsx b/...oard/components/dashboard/components/resources-manager/hooks/useResourcesManagerChart.tsx
@@ -1,5 +1,6 @@
 import { ChartData, ChartOptions } from 'chart.js';
 import { Dispatch, SetStateAction, useState } from 'react';
+import { useRouter } from 'next/router';
 import formatNumber from '../../../../../utils/formatNumber';
 import {
   ResourcesManagerData,
@@ -23,6 +24,7 @@ function useResourcesManagerChart({
   setQuery,
   initialQuery
 }: useResourcesManagerChartProps) {
+  const router = useRouter();
   const colors = ['#FF9A87', '#6DB7FF', '#B6D3B4', '#FFB459', '#59ACAC'];
 
   /* To be un-commented when 'view' is supported 
@@ -78,10 +80,7 @@ function useResourcesManagerChart({
       const clickedIndex = legendItem[0].index || 0;
       const labels = legend.config.data.labels ?? [];
 
-      window.open(
-        `./inventory?${currentQuery}:IS:${labels[clickedIndex]}`,
-        '_blank'
-      );
+      router.push(`/inventory?${currentQuery}:IS:${labels[clickedIndex]}`);
     },
     aspectRatio: 2,
     layout: {

diff --git a/dashboard/components/navbar/Navbar.tsx b/dashboard/components/navbar/Navbar.tsx
@@ -20,7 +20,7 @@ function Navbar() {
       <div className="flex items-center gap-8 text-sm font-semibold text-black-400">
         <Link href="/dashboard">
           <Image
-            src="./assets/img/komiser.svg"
+            src="/assets/img/komiser.svg"
             width={40}
             height={40}
             alt="Komiser logo"

diff --git a/dashboard/next.config.js b/dashboard/next.config.js
@@ -4,7 +4,8 @@ const nextConfig = {
   swcMinify: true,
   images: {
     unoptimized: true
-  }
+  },
+  trailingSlash: true
 };
 
 module.exports = nextConfig;
diff --git a/internal/api/v1/template.go b/internal/api/v1/template.go