Skip to content

Commit f569b89

Browse files
committed
Change the routes from “metrics” to “dashboards” and redirect
1 parent 0ca5a4b commit f569b89

File tree

5 files changed

+43
-3
lines changed

5 files changed

+43
-3
lines changed

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.$dashboardKey/route.tsx renamed to apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.$dashboardKey/route.tsx

File renamed without changes.

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.custom.$dashboardId/route.tsx renamed to apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.custom.$dashboardId/route.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import {
5555
v3BillingPath,
5656
v3BuiltInDashboardPath,
5757
} from "~/utils/pathBuilder";
58-
import { MetricDashboard } from "../_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.$dashboardKey/route";
58+
import { MetricDashboard } from "../_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.$dashboardKey/route";
5959
import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
6060
import { Type } from "lucide-react";
6161

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
2+
import { z } from "zod";
3+
import { EnvironmentParamSchema, v3BuiltInDashboardPath } from "~/utils/pathBuilder";
4+
5+
const ParamSchema = EnvironmentParamSchema.extend({
6+
dashboardKey: z.string(),
7+
});
8+
9+
export const loader = async ({ params }: LoaderFunctionArgs) => {
10+
const { organizationSlug, projectParam, envParam, dashboardKey } = ParamSchema.parse(params);
11+
return redirect(
12+
v3BuiltInDashboardPath(
13+
{ slug: organizationSlug },
14+
{ slug: projectParam },
15+
{ slug: envParam },
16+
dashboardKey
17+
),
18+
301
19+
);
20+
};
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
2+
import { z } from "zod";
3+
import { EnvironmentParamSchema, v3CustomDashboardPath } from "~/utils/pathBuilder";
4+
5+
const ParamSchema = EnvironmentParamSchema.extend({
6+
dashboardId: z.string(),
7+
});
8+
9+
export const loader = async ({ params }: LoaderFunctionArgs) => {
10+
const { organizationSlug, projectParam, envParam, dashboardId } = ParamSchema.parse(params);
11+
return redirect(
12+
v3CustomDashboardPath(
13+
{ slug: organizationSlug },
14+
{ slug: projectParam },
15+
{ slug: envParam },
16+
{ friendlyId: dashboardId }
17+
),
18+
301
19+
);
20+
};

apps/webapp/app/utils/pathBuilder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ export function v3CustomDashboardPath(
284284
environment: EnvironmentForPath,
285285
dashboard: { friendlyId: string }
286286
) {
287-
return `${v3EnvironmentPath(organization, project, environment)}/metrics/custom/${
287+
return `${v3EnvironmentPath(organization, project, environment)}/dashboards/custom/${
288288
dashboard.friendlyId
289289
}`;
290290
}
@@ -295,7 +295,7 @@ export function v3BuiltInDashboardPath(
295295
environment: EnvironmentForPath,
296296
key: string
297297
) {
298-
return `${v3EnvironmentPath(organization, project, environment)}/metrics/${key}`;
298+
return `${v3EnvironmentPath(organization, project, environment)}/dashboards/${key}`;
299299
}
300300

301301
export function v3TestTaskPath(

0 commit comments

Comments
 (0)