fix: revamp dashbord pathname to use singular noun

instill-ai · Jul 2, 2024 · 3256047 · 3256047
1 parent e78c94d
commit 3256047
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/apps/console/src/app/[entity]/dashboard/page.tsx b/apps/console/src/app/[entity]/dashboard/page.tsx
@@ -5,5 +5,5 @@ type Props = {
 };
 
 export default async function Page({ params }: Props) {
-  redirect(`/${params.entity}/dashboard/pipelines`);
+  redirect(`/${params.entity}/dashboard/pipeline`);
 }
diff --git a/...entity]/dashboard/pipelines/[id]/page.tsx → ...[entity]/dashboard/pipeline/[id]/page.tsx b/...entity]/dashboard/pipelines/[id]/page.tsx → ...[entity]/dashboard/pipeline/[id]/page.tsx
diff --git a/...tity]/dashboard/pipelines/[id]/render.tsx → ...ntity]/dashboard/pipeline/[id]/render.tsx b/...tity]/dashboard/pipelines/[id]/render.tsx → ...ntity]/dashboard/pipeline/[id]/render.tsx
diff --git a/...app/[entity]/dashboard/pipelines/page.tsx → .../app/[entity]/dashboard/pipeline/page.tsx b/...app/[entity]/dashboard/pipelines/page.tsx → .../app/[entity]/dashboard/pipeline/page.tsx
diff --git a/...p/[entity]/dashboard/pipelines/render.tsx → ...pp/[entity]/dashboard/pipeline/render.tsx b/...p/[entity]/dashboard/pipelines/render.tsx → ...pp/[entity]/dashboard/pipeline/render.tsx
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@instill-ai/toolkit",
-  "version": "0.95.0-rc.19",
+  "version": "0.95.0-rc.22",
   "description": "Instill AI's frontend toolkit",
   "repository": "https://github.com/instill-ai/design-system.git",
   "bugs": "https://github.com/instill-ai/design-system/issues",

diff --git a/packages/toolkit/src/components/top-bar/NavLinks.tsx b/packages/toolkit/src/components/top-bar/NavLinks.tsx
@@ -32,7 +32,7 @@ const navLinkItems: NavLinkProps[] = [
     title: "Models",
   },
   {
-    pathname: "dashboard",
+    pathname: "dashboard/pipeline",
     Icon: Icons.BarChartSquare02,
     title: "Dashboard",
   },

diff --git a/packages/toolkit/src/view/dashboard/DashboardContainer.tsx b/packages/toolkit/src/view/dashboard/DashboardContainer.tsx
@@ -7,7 +7,7 @@ import { ToggleGroup } from "@instill-ai/design-system";
 
 import { useRouteInfo } from "../../lib";
 
-type DashboardType = "pipeline" | "credits";
+type DashboardType = "pipeline" | "credit";
 
 export const DashboardContainer = ({
   children,
@@ -21,8 +21,8 @@ export const DashboardContainer = ({
   const type = React.useMemo(() => {
     if (pathname.includes("pipeline")) {
       return "pipeline";
-    } else if (pathname.includes("credits")) {
-      return "credits";
+    } else if (pathname.includes("credit")) {
+      return "credit";
     }
   }, [pathname]);
 
@@ -34,9 +34,9 @@ export const DashboardContainer = ({
           value={type}
           onValueChange={(value: DashboardType) => {
             if (value === "pipeline") {
-              router.push(`/${routeInfo.data.namespaceId}/dashboard/pipelines`);
+              router.push(`/${routeInfo.data.namespaceId}/dashboard/pipeline`);
             } else {
-              router.push(`/${routeInfo.data.namespaceId}/dashboard/credits`);
+              router.push(`/${routeInfo.data.namespaceId}/dashboard/credit`);
             }
           }}
         >
@@ -47,10 +47,10 @@ export const DashboardContainer = ({
             Pipeline
           </ToggleGroup.Item>
           <ToggleGroup.Item
-            value="credits"
-            className={type === "credits" ? "pointer-events-none" : undefined}
+            value="credit"
+            className={type === "credit" ? "pointer-events-none" : undefined}
           >
-            Credits
+            Credit
           </ToggleGroup.Item>
         </ToggleGroup.Root>
       </div>

diff --git a/packages/toolkit/src/view/dashboard/DashboardPipelinesTable.tsx b/packages/toolkit/src/view/dashboard/DashboardPipelinesTable.tsx
@@ -36,7 +36,7 @@ export const DashboardPipelinesTable = (
               className="h-5 w-5"
             /> */}
             <Link
-              href={`/${entity}/dashboard/pipelines/${row.getValue(
+              href={`/${entity}/dashboard/pipeline/${row.getValue(
                 "pipelineId",
               )}${days ? "?days=" + days : ""}`}
             >