Skip to content

Open-source status page, incident response and uptime monitoring

Feat: adding clone action to motion page (#921)

Priyank Rajai9ec3169c8214
diff --git a/apps/web/public/assets/changelog/clone-monitor.png b/apps/web/public/assets/changelog/clone-monitor.png
new file mode 100644
index 000000000..dcc6702a7
Binary files /dev/null and b/apps/web/public/assets/changelog/clone-monitor.png differ
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
index 6878437b3..480d238b3 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
@@ -99,7 +99,7 @@ export default async function MonitorPage({
maintenance.monitors.includes(monitor.id)
);
- return { monitor, metrics: current, data, incidents, maintenances, tags };
+ return { monitor, metrics: current, data, incidents, maintenances, tags, isLimitReached };
})
);
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx
index e840616c3..6e17a62ac 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx
@@ -30,7 +30,6 @@ export default async function EditPage({
// default is request
const search = searchParamsSchema.safeParse(searchParams);
-
return (
<MonitorForm
defaultSection={search.success ? search.data.section : undefined}
diff --git a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
index bd4eaeb54..ebade132d 100644
--- a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
@@ -4,7 +4,7 @@ import type { Row } from "@tanstack/react-table";
import { MoreHorizontal } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
-import * as React from "react";
+import { useState, useTransition } from "react";
import { z } from "zod";
import { selectMonitorSchema } from "@openstatus/db/src/schema";
@@ -28,9 +28,8 @@ import {
import { LoadingAnimation } from "@/components/loading-animation";
import type { RegionChecker } from "@/components/ping-response-analysis/utils";
-import { toastAction } from "@/lib/toast";
+import { toastAction, toast } from "@/lib/toast";
import { api } from "@/trpc/client";
-
interface DataTableRowActionsProps<TData> {
row: Row<TData>;
}
@@ -38,12 +37,12 @@ interface DataTableRowActionsProps<TData> {
export function DataTableRowActions<TData>({
row,
}: DataTableRowActionsProps<TData>) {
- const { monitor } = z
- .object({ monitor: selectMonitorSchema })
+ const { monitor, isLimitReached } = z
+ .object({ monitor: selectMonitorSchema, isLimitReached: z.boolean() })
.parse(row.original);
const router = useRouter();
- const [alertOpen, setAlertOpen] = React.useState(false);
- const [isPending, startTransition] = React.useTransition();
+ const [alertOpen, setAlertOpen] = useState(false);
+ const [isPending, startTransition] = useTransition();
async function onDelete() {
startTransition(async () => {
@@ -85,6 +84,41 @@ export function DataTableRowActions<TData>({
}
});
}
+ async function onClone() {
+ startTransition(async () => {
+ try {
+ const id = monitor.id;
+ if (!id) return;
+
+ const selectedMonitorData = await api.monitor.getMonitorById.query({
+ id,
+ });
+
+ const { notificationIds, pageIds, monitorTagIds } =
+ await api.monitor.getMonitorRelationsById.query({ id });
+
+ const cloneMonitorData = {
+ ...selectedMonitorData,
+ name: `${selectedMonitorData.name} - copy`,
+ tags: monitorTagIds,
+ notifications: notificationIds,
+ pages: pageIds,
+ active: false,
+ id: undefined,
+ updatedAt: undefined,
+ createdAt: undefined,
+ };
+
+ await api.monitor.create.mutate(cloneMonitorData);
+
+ toast.success("Monitor cloned!");
+ router.refresh();
+ } catch (error) {
+ console.log("error", error);
+ toastAction("error");
+ }
+ });
+ }
return (
<AlertDialog open={alertOpen} onOpenChange={(value) => setAlertOpen(value)}>
@@ -105,6 +139,9 @@ export function DataTableRowActions<TData>({
<Link href={`./monitors/${monitor.id}/overview`}>
<DropdownMenuItem>Details</DropdownMenuItem>
</Link>
+ <DropdownMenuItem onClick={onClone} disabled={isLimitReached}>
+ Clone
+ </DropdownMenuItem>
<DropdownMenuItem onClick={onTest}>Test</DropdownMenuItem>
<DropdownMenuSeparator />
<AlertDialogTrigger asChild>
diff --git a/apps/web/src/content/changelog/clone-monitor.mdx b/apps/web/src/content/changelog/clone-monitor.mdx
new file mode 100644
index 000000000..0676ff82a
--- /dev/null
+++ b/apps/web/src/content/changelog/clone-monitor.mdx
@@ -0,0 +1,11 @@
+---
+title: Clone Monitor
+description: Set custom request timeouts and degradation timing.
+image: /assets/changelog/clone-monitor.png
+publishedAt: 2024-07-14
+---
+Sometimes you need to create a copy of your monitor with the same settings quickly and easily.
+
+You can now clone a monitor directly from the action menu in the monitor table.
+
+We have added this feature to the monitor settings.
\ No newline at end of file
diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.ts
index 19e046014..5d1817418 100644
--- a/packages/api/src/router/monitor.ts
+++ b/packages/api/src/router/monitor.ts
@@ -43,7 +43,7 @@ export const monitorRouter = createTRPCRouter({
await opts.ctx.db.query.monitor.findMany({
where: and(
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
+ isNull(monitor.deletedAt),
),
})
).length;
@@ -120,7 +120,7 @@ export const monitorRouter = createTRPCRouter({
const allNotifications = await opts.ctx.db.query.notification.findMany({
where: and(
eq(notification.workspaceId, opts.ctx.workspace.id),
- inArray(notification.id, notifications)
+ inArray(notification.id, notifications),
),
});
@@ -136,7 +136,7 @@ export const monitorRouter = createTRPCRouter({
const allTags = await opts.ctx.db.query.monitorTag.findMany({
where: and(
eq(monitorTag.workspaceId, opts.ctx.workspace.id),
- inArray(monitorTag.id, tags)
+ inArray(monitorTag.id, tags),
),
});
@@ -152,7 +152,7 @@ export const monitorRouter = createTRPCRouter({
const allPages = await opts.ctx.db.query.page.findMany({
where: and(
eq(page.workspaceId, opts.ctx.workspace.id),
- inArray(page.id, pages)
+ inArray(page.id, pages),
),
});
@@ -179,7 +179,7 @@ export const monitorRouter = createTRPCRouter({
where: and(
eq(monitor.id, opts.input.id),
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
+ isNull(monitor.deletedAt),
),
with: {
monitorTagsToMonitors: { with: { monitorTag: true } },
@@ -204,7 +204,7 @@ export const monitorRouter = createTRPCRouter({
maintenance: _monitor?.maintenancesToMonitors.some(
(item) =>
item.maintenance.from.getTime() <= Date.now() &&
- item.maintenance.to.getTime() >= Date.now()
+ item.maintenance.to.getTime() >= Date.now(),
),
});
@@ -226,7 +226,7 @@ export const monitorRouter = createTRPCRouter({
where: and(
eq(monitor.id, opts.input.id),
isNull(monitor.deletedAt),
- eq(monitor.public, true)
+ eq(monitor.public, true),
),
});
if (!_monitor) return undefined;
@@ -238,7 +238,7 @@ export const monitorRouter = createTRPCRouter({
});
const hasPageRelation = _page?.monitorsToPages.find(
- ({ monitorId }) => _monitor.id === monitorId
+ ({ monitorId }) => _monitor.id === monitorId,
);
if (!hasPageRelation) return undefined;
@@ -314,8 +314,8 @@ export const monitorRouter = createTRPCRouter({
and(
eq(monitor.id, opts.input.id),
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
- )
+ isNull(monitor.deletedAt),
+ ),
)
.returning()
.get();
@@ -330,7 +330,7 @@ export const monitorRouter = createTRPCRouter({
(x) =>
!currentMonitorNotifications
.map(({ notificationId }) => notificationId)
- ?.includes(x)
+ ?.includes(x),
);
if (addedNotifications.length > 0) {
@@ -354,9 +354,9 @@ export const monitorRouter = createTRPCRouter({
eq(notificationsToMonitors.monitorId, currentMonitor.id),
inArray(
notificationsToMonitors.notificationId,
- removedNotifications
- )
- )
+ removedNotifications,
+ ),
+ ),
)
.run();
}
@@ -371,7 +371,7 @@ export const monitorRouter = createTRPCRouter({
(x) =>
!currentMonitorTags
.map(({ monitorTagId }) => monitorTagId)
- ?.includes(x)
+ ?.includes(x),
);
if (addedTags.length > 0) {
@@ -393,8 +393,8 @@ export const monitorRouter = createTRPCRouter({
.where(
and(
eq(monitorTagsToMonitors.monitorId, currentMonitor.id),
- inArray(monitorTagsToMonitors.monitorTagId, removedTags)
- )
+ inArray(monitorTagsToMonitors.monitorTagId, removedTags),
+ ),
)
.run();
}
@@ -406,7 +406,7 @@ export const monitorRouter = createTRPCRouter({
.all();
const addedPages = pages.filter(
- (x) => !currentMonitorPages.map(({ pageId }) => pageId)?.includes(x)
+ (x) => !currentMonitorPages.map(({ pageId }) => pageId)?.includes(x),
);
if (addedPages.length > 0) {
@@ -428,8 +428,8 @@ export const monitorRouter = createTRPCRouter({
.where(
and(
eq(monitorsToPages.monitorId, currentMonitor.id),
- inArray(monitorsToPages.pageId, removedPages)
- )
+ inArray(monitorsToPages.pageId, removedPages),
+ ),
)
.run();
}
@@ -440,7 +440,7 @@ export const monitorRouter = createTRPCRouter({
insertMonitorSchema
.pick({ public: true, active: true })
.partial() // batched updates
- .extend({ ids: z.number().array() }) // array of monitor ids to update
+ .extend({ ids: z.number().array() }), // array of monitor ids to update
)
.mutation(async (opts) => {
const _monitors = await opts.ctx.db
@@ -450,8 +450,8 @@ export const monitorRouter = createTRPCRouter({
and(
inArray(monitor.id, opts.input.ids),
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
- )
+ isNull(monitor.deletedAt),
+ ),
);
}),
@@ -461,20 +461,20 @@ export const monitorRouter = createTRPCRouter({
ids: z.number().array(),
tagId: z.number(),
action: z.enum(["add", "remove"]),
- })
+ }),
)
.mutation(async (opts) => {
const _monitorTag = await opts.ctx.db.query.monitorTag.findFirst({
where: and(
eq(monitorTag.workspaceId, opts.ctx.workspace.id),
- eq(monitorTag.id, opts.input.tagId)
+ eq(monitorTag.id, opts.input.tagId),
),
});
const _monitors = await opts.ctx.db.query.monitor.findMany({
where: and(
eq(monitor.workspaceId, opts.ctx.workspace.id),
- inArray(monitor.id, opts.input.ids)
+ inArray(monitor.id, opts.input.ids),
),
});
@@ -492,7 +492,7 @@ export const monitorRouter = createTRPCRouter({
opts.input.ids.map((id) => ({
monitorId: id,
monitorTagId: opts.input.tagId,
- }))
+ })),
)
.onConflictDoNothing()
.run();
@@ -504,8 +504,8 @@ export const monitorRouter = createTRPCRouter({
.where(
and(
inArray(monitorTagsToMonitors.monitorId, opts.input.ids),
- eq(monitorTagsToMonitors.monitorTagId, opts.input.tagId)
- )
+ eq(monitorTagsToMonitors.monitorTagId, opts.input.tagId),
+ ),
)
.run();
}
@@ -520,8 +520,8 @@ export const monitorRouter = createTRPCRouter({
.where(
and(
eq(monitor.id, opts.input.id),
- eq(monitor.workspaceId, opts.ctx.workspace.id)
- )
+ eq(monitor.workspaceId, opts.ctx.workspace.id),
+ ),
)
.get();
if (!monitorToDelete) return;
@@ -560,8 +560,8 @@ export const monitorRouter = createTRPCRouter({
.where(
and(
inArray(monitor.id, opts.input.ids),
- eq(monitor.workspaceId, opts.ctx.workspace.id)
- )
+ eq(monitor.workspaceId, opts.ctx.workspace.id),
+ ),
)
.all();
@@ -601,7 +601,7 @@ export const monitorRouter = createTRPCRouter({
const monitors = await opts.ctx.db.query.monitor.findMany({
where: and(
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
+ isNull(monitor.deletedAt),
),
with: {
monitorTagsToMonitors: { with: { monitorTag: true } },
@@ -614,7 +614,7 @@ export const monitorRouter = createTRPCRouter({
monitorTagsToMonitors: z
.array(z.object({ monitorTag: selectMonitorTagSchema }))
.default([]),
- })
+ }),
)
.parse(monitors);
}),
@@ -625,7 +625,7 @@ export const monitorRouter = createTRPCRouter({
const _page = await opts.ctx.db.query.page.findFirst({
where: and(
eq(page.id, opts.input.id),
- eq(page.workspaceId, opts.ctx.workspace.id)
+ eq(page.workspaceId, opts.ctx.workspace.id),
),
});
@@ -634,7 +634,7 @@ export const monitorRouter = createTRPCRouter({
const monitors = await opts.ctx.db.query.monitor.findMany({
where: and(
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
+ isNull(monitor.deletedAt),
),
with: {
monitorTagsToMonitors: { with: { monitorTag: true } },
@@ -650,14 +650,14 @@ export const monitorRouter = createTRPCRouter({
monitorTagsToMonitors: z
.array(z.object({ monitorTag: selectMonitorTagSchema }))
.default([]),
- })
+ }),
)
.parse(
monitors.filter((monitor) =>
monitor.monitorsToPages
.map(({ pageId }) => pageId)
- .includes(_page.id)
- )
+ .includes(_page.id),
+ ),
);
}),
@@ -671,8 +671,8 @@ export const monitorRouter = createTRPCRouter({
and(
eq(monitor.id, opts.input.id),
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
- )
+ isNull(monitor.deletedAt),
+ ),
)
.get();
@@ -691,8 +691,8 @@ export const monitorRouter = createTRPCRouter({
.where(
and(
eq(monitor.id, opts.input.id),
- eq(monitor.workspaceId, opts.ctx.workspace.id)
- )
+ eq(monitor.workspaceId, opts.ctx.workspace.id),
+ ),
)
.run();
}),
@@ -720,8 +720,8 @@ export const monitorRouter = createTRPCRouter({
notification,
and(
eq(notificationsToMonitors.notificationId, notification.id),
- eq(notification.workspaceId, opts.ctx.workspace.id)
- )
+ eq(notification.workspaceId, opts.ctx.workspace.id),
+ ),
)
.where(eq(notificationsToMonitors.monitorId, opts.input.id))
.all();
@@ -734,11 +734,41 @@ export const monitorRouter = createTRPCRouter({
await opts.ctx.db.query.monitor.findMany({
where: and(
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt)
+ isNull(monitor.deletedAt),
),
})
).length;
return monitorNumbers >= monitorLimit;
}),
+ getMonitorRelationsById: protectedProcedure
+ .input(z.object({ id: z.number() }))
+ .query(async (opts) => {
+ const _monitor = await opts.ctx.db.query.monitor.findFirst({
+ where: and(
+ eq(monitor.id, opts.input.id),
+ eq(monitor.workspaceId, opts.ctx.workspace.id),
+ isNull(monitor.deletedAt),
+ ),
+ with: {
+ monitorTagsToMonitors: true,
+ monitorsToNotifications: true,
+ monitorsToPages: true,
+ },
+ });
+
+ const parsedMonitorNotification = _monitor?.monitorsToNotifications.map(
+ ({ notificationId }) => notificationId,
+ );
+ const parsedPages = _monitor?.monitorsToPages.map((val) => val.pageId);
+ const parsedTags = _monitor?.monitorTagsToMonitors.map(
+ ({ monitorTagId }) => monitorTagId,
+ );
+
+ return {
+ notificationIds: parsedMonitorNotification,
+ pageIds: parsedPages,
+ monitorTagIds: parsedTags,
+ };
+ }),
});