apps/web/public/assets/changelog/monitor-tags.png

This is a binary file and will not be displayed.

+7 -1

apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/loading.tsx

··· 1 1 import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"; 2 2 + import { DataTableToolbarSkeleton } from "@/components/data-table/data-table-toolbar-skeleton"; 2 3 3 4 export default function Loading() { 4 4 - return <DataTableSkeleton />; 5 5 + return ( 6 6 + <div className="space-y-4"> 7 7 + <DataTableToolbarSkeleton /> 8 8 + <DataTableSkeleton /> 9 9 + </div> 10 10 + ); 5 11 }

+7 -2

apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx

··· 34 34 ); 35 35 36 36 const _incidents = await api.incident.getIncidentsByWorkspace.query(); 37 37 + const tags = await api.monitorTag.getMonitorTagsByWorkspace.query(); 37 38 38 39 // maybe not very efficient? 39 40 // use Suspense and Client call instead? ··· 57 58 (incident) => incident.monitorId === monitor.id, 58 59 ); 59 60 60 60 - return { monitor, metrics: current, data, incidents }; 61 61 + const tags = monitor.monitorTagsToMonitors.map( 62 62 + ({ monitorTag }) => monitorTag, 63 63 + ); 64 64 + 65 65 + return { monitor, metrics: current, data, incidents, tags }; 61 66 }), 62 67 ); 63 68 ··· 69 74 70 75 return ( 71 76 <> 72 72 - <DataTable columns={columns} data={monitorsWithData} /> 77 77 + <DataTable columns={columns} data={monitorsWithData} tags={tags} /> 73 78 {isLimitReached ? <Limit /> : null} 74 79 {/* <RefreshWidget defaultValue={lastCronTimestamp} /> */} 75 80 </>

+8

apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx

··· 26 26 27 27 const pages = await api.page.getPagesByWorkspace.query(); 28 28 29 29 + const tags = await api.monitorTag.getMonitorTagsByWorkspace.query(); 30 30 + 29 31 // default is request 30 32 const search = searchParamsSchema.safeParse(searchParams); 31 33 ··· 40 42 ) 41 43 .map(({ id }) => id), 42 44 notifications: monitorNotifications?.map(({ id }) => id), 45 45 + tags: tags 46 46 + .filter((tag) => 47 47 + tag.monitor.map(({ monitorId }) => monitorId).includes(id), 48 48 + ) 49 49 + .map(({ id }) => id), 43 50 }} 44 51 plan={workspace?.plan} 45 52 notifications={notifications} 53 53 + tags={tags} 46 54 pages={pages} 47 55 /> 48 56 );

+2 -2

apps/web/src/components/data-table/data-table-faceted-filter.tsx

··· 118 118 <option.icon className="text-muted-foreground mr-2 h-4 w-4" /> 119 119 )} 120 120 <span>{option.label}</span> 121 121 - {facets?.get(option.value) && ( 121 121 + {facets?.get(option.value) ? ( 122 122 <span className="ml-auto flex h-4 w-4 items-center justify-center font-mono text-xs"> 123 123 {facets.get(option.value)} 124 124 </span> 125 125 - )} 125 125 + ) : null} 126 126 </CommandItem> 127 127 ); 128 128 })}

+11

apps/web/src/components/data-table/data-table-toolbar-skeleton.tsx

··· 1 1 + import { Skeleton } from "@openstatus/ui"; 2 2 + 3 3 + export function DataTableToolbarSkeleton() { 4 4 + return ( 5 5 + <div className="flex flex-wrap items-center justify-between gap-3"> 6 6 + <div className="flex flex-1 items-center gap-2"> 7 7 + <Skeleton className="h-8 w-[150px] lg:w-[250px]" /> 8 8 + </div> 9 9 + </div> 10 10 + ); 11 11 + }

+45 -1

apps/web/src/components/data-table/monitor/columns.tsx

··· 4 4 import type { ColumnDef } from "@tanstack/react-table"; 5 5 import { formatDistanceToNowStrict } from "date-fns"; 6 6 7 7 - import type { Incident, Monitor } from "@openstatus/db/src/schema"; 7 7 + import type { Incident, Monitor, MonitorTag } from "@openstatus/db/src/schema"; 8 8 import type { 9 9 Monitor as MonitorTracker, 10 10 ResponseTimeMetrics, 11 11 } from "@openstatus/tinybird"; 12 12 import { Tracker } from "@openstatus/tracker"; 13 13 import { 14 14 + Badge, 14 15 Tooltip, 15 16 TooltipContent, 16 17 TooltipProvider, ··· 18 19 } from "@openstatus/ui"; 19 20 20 21 import { StatusDotWithTooltip } from "@/components/monitor/status-dot-with-tooltip"; 22 22 + import { TagBadge } from "@/components/monitor/tag-badge"; 21 23 import { Bar } from "@/components/tracker/tracker"; 22 24 import { DataTableRowActions } from "./data-table-row-actions"; 23 25 ··· 26 28 metrics?: ResponseTimeMetrics; 27 29 data?: MonitorTracker[]; 28 30 incidents?: Incident[]; 31 31 + tags?: MonitorTag[]; 29 32 }>[] = [ 30 33 { 31 34 accessorKey: "name", 35 35 + accessorFn: (row) => row.monitor.name, // used for filtering as name is nested within the monitor object 32 36 header: "Name", 33 37 cell: ({ row }) => { 34 38 const { active, status, name } = row.original.monitor; ··· 40 44 <StatusDotWithTooltip active={active} status={status} /> 41 45 <span className="truncate group-hover:underline">{name}</span> 42 46 </Link> 47 47 + ); 48 48 + }, 49 49 + }, 50 50 + { 51 51 + accessorKey: "tags", 52 52 + header: "Tags", 53 53 + cell: ({ row }) => { 54 54 + const { tags } = row.original; 55 55 + const [first, second, ...rest] = tags || []; 56 56 + return ( 57 57 + <div className="flex gap-2"> 58 58 + {first ? <TagBadge {...first} /> : null} 59 59 + {second ? <TagBadge {...second} /> : null} 60 60 + {rest.length > 0 ? <TagsTooltip tags={rest || []} /> : null} 61 61 + </div> 62 62 + ); 63 63 + }, 64 64 + filterFn: (row, id, value) => { 65 65 + if (!Array.isArray(value)) return true; 66 66 + // REMINDER: if one value is found, return true 67 67 + // we could consider restricting it to all the values have to be found 68 68 + return value.some( 69 69 + (item) => row.original.tags?.some((tag) => tag.name === item), 43 70 ); 44 71 }, 45 72 }, ··· 126 153 }, 127 154 }, 128 155 ]; 156 156 + 157 157 + function TagsTooltip({ tags }: { tags: MonitorTag[] }) { 158 158 + return ( 159 159 + <TooltipProvider> 160 160 + <Tooltip delayDuration={200}> 161 161 + <TooltipTrigger> 162 162 + <Badge variant="secondary">+{tags.length}</Badge> 163 163 + </TooltipTrigger> 164 164 + <TooltipContent side="top" className="flex gap-2"> 165 165 + {tags.map((tag) => ( 166 166 + <TagBadge key={tag.id} {...tag} /> 167 167 + ))} 168 168 + </TooltipContent> 169 169 + </Tooltip> 170 170 + </TooltipProvider> 171 171 + ); 172 172 + } 129 173 130 174 function HeaderTooltip({ label, content }: { label: string; content: string }) { 131 175 return (

+2 -3

apps/web/src/components/data-table/monitor/data-table-row-actions.tsx

··· 64 64 try { 65 65 const { jobType, ...rest } = monitor; 66 66 if (!monitor.id) return; 67 67 - await api.monitor.update.mutate({ 68 68 - ...rest, 69 69 - active: !monitor.active, 67 67 + await api.monitor.toggleMonitorActive.mutate({ 68 68 + id: monitor.id, 70 69 }); 71 70 toastAction("success"); 72 71 router.refresh();

+56

apps/web/src/components/data-table/monitor/data-table-toolbar.tsx

··· 1 1 + "use client"; 2 2 + 3 3 + import type { Table } from "@tanstack/react-table"; 4 4 + import { X } from "lucide-react"; 5 5 + 6 6 + import type { MonitorTag } from "@openstatus/db/src/schema"; 7 7 + import { Button, Input } from "@openstatus/ui"; 8 8 + 9 9 + import { DataTableFacetedFilter } from "../data-table-faceted-filter"; 10 10 + 11 11 + interface DataTableToolbarProps<TData> { 12 12 + table: Table<TData>; 13 13 + tags?: MonitorTag[]; 14 14 + } 15 15 + 16 16 + export function DataTableToolbar<TData>({ 17 17 + table, 18 18 + tags, 19 19 + }: DataTableToolbarProps<TData>) { 20 20 + const isFiltered = table.getState().columnFilters.length > 0; 21 21 + 22 22 + return ( 23 23 + <div className="flex flex-wrap items-center justify-between gap-3"> 24 24 + <div className="flex flex-1 items-center gap-2"> 25 25 + <Input 26 26 + placeholder="Filter names..." 27 27 + value={(table.getColumn("name")?.getFilterValue() as string) ?? ""} 28 28 + onChange={(event) => 29 29 + table.getColumn("name")?.setFilterValue(event.target.value) 30 30 + } 31 31 + className="h-8 w-[150px] lg:w-[250px]" 32 32 + /> 33 33 + {table.getColumn("tags") && tags && ( 34 34 + <DataTableFacetedFilter 35 35 + column={table.getColumn("tags")} 36 36 + title="Tags" 37 37 + options={tags?.map((tag) => ({ 38 38 + label: tag.name, 39 39 + value: tag.name, 40 40 + }))} 41 41 + /> 42 42 + )} 43 43 + {isFiltered && ( 44 44 + <Button 45 45 + variant="ghost" 46 46 + onClick={() => table.resetColumnFilters()} 47 47 + className="h-8 px-2 lg:px-3" 48 48 + > 49 49 + Reset 50 50 + <X className="ml-2 h-4 w-4" /> 51 51 + </Button> 52 52 + )} 53 53 + </div> 54 54 + </div> 55 55 + ); 56 56 + }

+94 -46

apps/web/src/components/data-table/monitor/data-table.tsx

··· 1 1 "use client"; 2 2 3 3 import * as React from "react"; 4 4 - import type { ColumnDef } from "@tanstack/react-table"; 4 4 + import type { 5 5 + ColumnDef, 6 6 + ColumnFiltersState, 7 7 + Table as TTable, 8 8 + } from "@tanstack/react-table"; 5 9 import { 6 10 flexRender, 7 11 getCoreRowModel, 12 12 + getFacetedRowModel, 13 13 + getFilteredRowModel, 8 14 useReactTable, 9 15 } from "@tanstack/react-table"; 16 16 + import { z } from "zod"; 10 17 18 18 + import { selectMonitorTagSchema } from "@openstatus/db/src/schema"; 19 19 + import type { MonitorTag } from "@openstatus/db/src/schema"; 11 20 import { 12 21 Table, 13 22 TableBody, ··· 17 26 TableRow, 18 27 } from "@openstatus/ui"; 19 28 29 29 + import { DataTableToolbar } from "./data-table-toolbar"; 30 30 + 20 31 interface DataTableProps<TData, TValue> { 21 32 columns: ColumnDef<TData, TValue>[]; 22 33 data: TData[]; 34 34 + tags?: MonitorTag[]; 23 35 } 24 36 25 25 - // FIXME: right now, the mobile layout is messed up 26 26 - // https://github.com/TanStack/table/discussions/3192#discussioncomment-6458134 27 27 - 28 37 export function DataTable<TData, TValue>({ 29 38 columns, 30 39 data, 40 40 + tags, 31 41 }: DataTableProps<TData, TValue>) { 42 42 + const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>( 43 43 + [], 44 44 + ); 32 45 const table = useReactTable({ 33 46 data, 34 47 columns, 48 48 + state: { 49 49 + columnFilters, 50 50 + }, 51 51 + onColumnFiltersChange: setColumnFilters, 52 52 + getFilteredRowModel: getFilteredRowModel(), 35 53 getCoreRowModel: getCoreRowModel(), 54 54 + getFacetedRowModel: getFacetedRowModel(), 55 55 + // getFacetedUniqueValues: getFacetedUniqueValues(), 56 56 + // REMINDER: We cannot use the default getFacetedUniqueValues as it doesnt support Array of Objects 57 57 + getFacetedUniqueValues: (table: TTable<TData>, columnId: string) => () => { 58 58 + const map = new Map(); 59 59 + if (columnId === "tags") { 60 60 + tags?.forEach((tag) => { 61 61 + const tagsNumber = data.reduce((prev, curr) => { 62 62 + const values = z 63 63 + .object({ tags: z.array(selectMonitorTagSchema) }) 64 64 + .safeParse(curr); 65 65 + if (!values.success) return prev; 66 66 + if (values.data.tags?.find((t) => t.name === tag.name)) 67 67 + return prev + 1; 68 68 + return prev; 69 69 + }, 0); 70 70 + map.set(tag.name, tagsNumber); 71 71 + }); 72 72 + } 73 73 + return map; 74 74 + }, 36 75 }); 37 76 38 77 return ( 39 39 - <div className="rounded-md border"> 40 40 - <Table> 41 41 - <TableHeader className="bg-muted/50"> 42 42 - {table.getHeaderGroups().map((headerGroup) => ( 43 43 - <TableRow key={headerGroup.id} className="hover:bg-transparent"> 44 44 - {headerGroup.headers.map((header) => { 45 45 - return ( 46 46 - <TableHead key={header.id}> 47 47 - {header.isPlaceholder 48 48 - ? null 49 49 - : flexRender( 50 50 - header.column.columnDef.header, 51 51 - header.getContext(), 52 52 - )} 53 53 - </TableHead> 54 54 - ); 55 55 - })} 56 56 - </TableRow> 57 57 - ))} 58 58 - </TableHeader> 59 59 - <TableBody> 60 60 - {table.getRowModel().rows?.length ? ( 61 61 - table.getRowModel().rows.map((row) => ( 62 62 - <TableRow 63 63 - key={row.id} 64 64 - data-state={row.getIsSelected() && "selected"} 65 65 - > 66 66 - {row.getVisibleCells().map((cell) => ( 67 67 - <TableCell key={cell.id}> 68 68 - {flexRender(cell.column.columnDef.cell, cell.getContext())} 69 69 - </TableCell> 70 70 - ))} 78 78 + <div className="space-y-4"> 79 79 + <DataTableToolbar table={table} tags={tags} /> 80 80 + <div className="rounded-md border"> 81 81 + <Table> 82 82 + <TableHeader className="bg-muted/50"> 83 83 + {table.getHeaderGroups().map((headerGroup) => ( 84 84 + <TableRow key={headerGroup.id} className="hover:bg-transparent"> 85 85 + {headerGroup.headers.map((header) => { 86 86 + return ( 87 87 + <TableHead key={header.id}> 88 88 + {header.isPlaceholder 89 89 + ? null 90 90 + : flexRender( 91 91 + header.column.columnDef.header, 92 92 + header.getContext(), 93 93 + )} 94 94 + </TableHead> 95 95 + ); 96 96 + })} 71 97 </TableRow> 72 72 - )) 73 73 - ) : ( 74 74 - <TableRow> 75 75 - <TableCell colSpan={columns.length} className="h-24 text-center"> 76 76 - No results. 77 77 - </TableCell> 78 78 - </TableRow> 79 79 - )} 80 80 - </TableBody> 81 81 - </Table> 98 98 + ))} 99 99 + </TableHeader> 100 100 + <TableBody> 101 101 + {table.getRowModel().rows?.length ? ( 102 102 + table.getRowModel().rows.map((row) => ( 103 103 + <TableRow 104 104 + key={row.id} 105 105 + data-state={row.getIsSelected() && "selected"} 106 106 + > 107 107 + {row.getVisibleCells().map((cell) => ( 108 108 + <TableCell key={cell.id}> 109 109 + {flexRender( 110 110 + cell.column.columnDef.cell, 111 111 + cell.getContext(), 112 112 + )} 113 113 + </TableCell> 114 114 + ))} 115 115 + </TableRow> 116 116 + )) 117 117 + ) : ( 118 118 + <TableRow> 119 119 + <TableCell 120 120 + colSpan={columns.length} 121 121 + className="h-24 text-center" 122 122 + > 123 123 + No results. 124 124 + </TableCell> 125 125 + </TableRow> 126 126 + )} 127 127 + </TableBody> 128 128 + </Table> 129 129 + </div> 82 130 </div> 83 131 ); 84 132 }

+97

apps/web/src/components/forms/monitor-tag/form.tsx

··· 1 1 + "use client"; 2 2 + 3 3 + import * as React from "react"; 4 4 + import { useRouter } from "next/navigation"; 5 5 + import { zodResolver } from "@hookform/resolvers/zod"; 6 6 + import { useForm } from "react-hook-form"; 7 7 + 8 8 + import { insertMonitorTagSchema } from "@openstatus/db/src/schema"; 9 9 + import type { InsertMonitorTag, MonitorTag } from "@openstatus/db/src/schema"; 10 10 + import { 11 11 + Form, 12 12 + FormControl, 13 13 + FormField, 14 14 + FormItem, 15 15 + FormLabel, 16 16 + FormMessage, 17 17 + Input, 18 18 + } from "@openstatus/ui"; 19 19 + 20 20 + import { toastAction } from "@/lib/toast"; 21 21 + import { api } from "@/trpc/client"; 22 22 + import { SaveButton } from "../shared/save-button"; 23 23 + 24 24 + interface Props { 25 25 + defaultValues?: MonitorTag; 26 26 + } 27 27 + 28 28 + export function MonitorTagForm({ defaultValues }: Props) { 29 29 + const form = useForm<InsertMonitorTag>({ 30 30 + resolver: zodResolver(insertMonitorTagSchema), 31 31 + defaultValues, 32 32 + }); 33 33 + const router = useRouter(); 34 34 + const [isPending, startTransition] = React.useTransition(); 35 35 + 36 36 + const onSubmit = ({ ...props }: InsertMonitorTag) => { 37 37 + startTransition(async () => { 38 38 + try { 39 39 + if (defaultValues) { 40 40 + await api.monitorTag.update.mutate({ ...props }); 41 41 + } else { 42 42 + await api.monitorTag.create.mutate({ ...props }); 43 43 + } 44 44 + router.refresh(); 45 45 + toastAction("saved"); 46 46 + } catch { 47 47 + toastAction("error"); 48 48 + } 49 49 + }); 50 50 + }; 51 51 + 52 52 + return ( 53 53 + <Form {...form}> 54 54 + <form 55 55 + onSubmit={async (e) => { 56 56 + e.preventDefault(); 57 57 + form.handleSubmit(onSubmit)(e); 58 58 + }} 59 59 + className="grid w-full gap-6" 60 60 + > 61 61 + <div className="flex gap-6"> 62 62 + <FormField 63 63 + control={form.control} 64 64 + name="name" 65 65 + render={({ field }) => ( 66 66 + <FormItem> 67 67 + <FormLabel>Name</FormLabel> 68 68 + <FormControl> 69 69 + <Input placeholder="API" {...field} /> 70 70 + </FormControl> 71 71 + <FormMessage /> 72 72 + </FormItem> 73 73 + )} 74 74 + /> 75 75 + <FormField 76 76 + control={form.control} 77 77 + name="color" 78 78 + render={({ field }) => ( 79 79 + <FormItem className="w-12"> 80 80 + <FormLabel>Color</FormLabel> 81 81 + <FormControl> 82 82 + <Input type="color" {...field} /> 83 83 + </FormControl> 84 84 + <FormMessage /> 85 85 + </FormItem> 86 86 + )} 87 87 + /> 88 88 + </div> 89 89 + <SaveButton 90 90 + isPending={isPending} 91 91 + isDirty={form.formState.isDirty} 92 92 + onSubmit={form.handleSubmit(onSubmit)} 93 93 + /> 94 94 + </form> 95 95 + </Form> 96 96 + ); 97 97 + }

+11 -7

apps/web/src/components/forms/monitor/form.tsx

··· 8 8 import type { 9 9 InsertMonitor, 10 10 MonitorFlyRegion, 11 11 + MonitorTag, 11 12 Notification, 12 13 Page, 13 14 WorkspacePlan, ··· 39 40 defaultValues?: InsertMonitor; 40 41 plan?: WorkspacePlan; 41 42 notifications?: Notification[]; 43 43 + tags?: MonitorTag[]; 42 44 pages?: Page[]; 43 45 nextUrl?: string; 44 46 } ··· 49 51 plan = "free", 50 52 notifications, 51 53 pages, 54 54 + tags, 52 55 nextUrl, 53 56 }: Props) { 54 57 const form = useForm<InsertMonitor>({ ··· 69 72 method: defaultValues?.method ?? "GET", 70 73 notifications: defaultValues?.notifications ?? [], 71 74 pages: defaultValues?.pages ?? [], 75 75 + tags: defaultValues?.tags ?? [], 72 76 }, 73 77 }); 74 78 const router = useRouter(); ··· 98 102 const onSubmit = ({ ...props }: InsertMonitor) => { 99 103 startTransition(async () => { 100 104 try { 101 101 - const pingResult = await pingEndpoint(); 102 102 - const isOk = pingResult?.status >= 200 && pingResult?.status < 300; 103 103 - if (!isOk) { 104 104 - setPingFailed(true); 105 105 - return; 106 106 - } 105 105 + // const pingResult = await pingEndpoint(); 106 106 + // const isOk = pingResult?.status >= 200 && pingResult?.status < 300; 107 107 + // if (!isOk) { 108 108 + // setPingFailed(true); 109 109 + // return; 110 110 + // } 107 111 await handleDataUpdateOrInsertion(props); 108 112 } catch { 109 113 toastAction("error"); ··· 140 144 onKeyDown={(e) => e.key === "Enter" && e.preventDefault()} 141 145 className="flex w-full flex-col gap-6" 142 146 > 143 143 - <General {...{ form, plan }} /> 147 147 + <General {...{ form, plan, tags }} /> 144 148 <Tabs 145 149 defaultValue={defaultSection} 146 150 className="w-full"

+66 -34

apps/web/src/components/forms/monitor/general.tsx

··· 3 3 import * as React from "react"; 4 4 import type { UseFormReturn } from "react-hook-form"; 5 5 6 6 - import type { InsertMonitor, WorkspacePlan } from "@openstatus/db/src/schema"; 6 6 + import type { 7 7 + InsertMonitor, 8 8 + MonitorTag, 9 9 + WorkspacePlan, 10 10 + } from "@openstatus/db/src/schema"; 7 11 import { 8 12 FormControl, 9 13 FormDescription, ··· 15 19 Switch, 16 20 } from "@openstatus/ui"; 17 21 22 22 + import { TagBadge } from "@/components/monitor/tag-badge"; 18 23 import { SectionHeader } from "../shared/section-header"; 24 24 + import { TagsMultiBox } from "./tags-multi-box"; 19 25 20 26 interface Props { 21 27 form: UseFormReturn<InsertMonitor>; 22 28 plan: WorkspacePlan; 29 29 + tags?: MonitorTag[]; 23 30 } 24 31 25 25 - export function General({ form }: Props) { 32 32 + export function General({ form, tags }: Props) { 33 33 + const watchTags = form.watch("tags"); 26 34 return ( 27 35 <div className="grid gap-4 sm:grid-cols-3 sm:gap-6"> 28 36 <SectionHeader 29 37 title="Basic Information" 30 38 description="Be able to find your monitor easily." 31 39 /> 32 32 - <div className="flex w-full gap-4 sm:col-span-2"> 33 33 - <FormField 34 34 - control={form.control} 35 35 - name="name" 36 36 - render={({ field }) => ( 37 37 - <FormItem className="w-full"> 38 38 - <FormLabel>Name</FormLabel> 39 39 - <FormControl> 40 40 - <Input placeholder="Documenso" {...field} /> 41 41 - </FormControl> 42 42 - <FormDescription>Displayed on the status page.</FormDescription> 43 43 - <FormMessage /> 44 44 - </FormItem> 45 45 - )} 46 46 - /> 47 47 - <FormField 48 48 - control={form.control} 49 49 - name="active" 50 50 - render={({ field }) => ( 51 51 - <FormItem className="flex flex-row items-center justify-between space-x-1 space-y-0"> 52 52 - <FormLabel>Active</FormLabel> 53 53 - <FormControl> 54 54 - <Switch 55 55 - checked={field.value || false} 56 56 - onCheckedChange={(value) => field.onChange(value)} 57 57 - /> 58 58 - </FormControl> 59 59 - <FormMessage /> 60 60 - </FormItem> 61 61 - )} 62 62 - /> 40 40 + <div className="flex w-full flex-col gap-4 sm:col-span-2"> 41 41 + <div className="flex w-full gap-4"> 42 42 + <FormField 43 43 + control={form.control} 44 44 + name="name" 45 45 + render={({ field }) => ( 46 46 + <FormItem className="w-full"> 47 47 + <FormLabel>Name</FormLabel> 48 48 + <FormControl> 49 49 + <Input placeholder="Documenso" {...field} /> 50 50 + </FormControl> 51 51 + <FormDescription>Displayed on the status page.</FormDescription> 52 52 + <FormMessage /> 53 53 + </FormItem> 54 54 + )} 55 55 + /> 56 56 + <FormField 57 57 + control={form.control} 58 58 + name="active" 59 59 + render={({ field }) => ( 60 60 + <FormItem className="flex flex-row items-center justify-between space-x-1 space-y-0"> 61 61 + <FormLabel>Active</FormLabel> 62 62 + <FormControl> 63 63 + <Switch 64 64 + checked={field.value || false} 65 65 + onCheckedChange={(value) => field.onChange(value)} 66 66 + /> 67 67 + </FormControl> 68 68 + <FormMessage /> 69 69 + </FormItem> 70 70 + )} 71 71 + /> 72 72 + </div> 73 73 + <div className="grid gap-4 sm:grid-cols-3"> 74 74 + <FormField 75 75 + control={form.control} 76 76 + name="tags" 77 77 + render={({ field }) => ( 78 78 + <FormItem className="sm:col-span-2"> 79 79 + <FormLabel>Tags</FormLabel> 80 80 + <FormControl> 81 81 + <TagsMultiBox 82 82 + tags={tags} 83 83 + onChange={field.onChange} 84 84 + values={field.value} 85 85 + // {...field} 86 86 + /> 87 87 + </FormControl> 88 88 + <FormDescription> 89 89 + Easily categorize your monitors. 90 90 + </FormDescription> 91 91 + <FormMessage /> 92 92 + </FormItem> 93 93 + )} 94 94 + /> 95 95 + </div> 63 96 </div> 64 64 - {/* TODO: add FancyBox with "Create Tag option" once `monitor_tabs` db table is set up */} 65 97 </div> 66 98 ); 67 99 }

+391

apps/web/src/components/forms/monitor/tags-multi-box.tsx

··· 1 1 + "use client"; 2 2 + 3 3 + import * as React from "react"; 4 4 + import { Check, ChevronsUpDown, Edit2 } from "lucide-react"; 5 5 + 6 6 + import type { MonitorTag } from "@openstatus/db/src/schema"; 7 7 + import { 8 8 + Accordion, 9 9 + AccordionContent, 10 10 + AccordionItem, 11 11 + AccordionTrigger, 12 12 + AlertDialog, 13 13 + AlertDialogAction, 14 14 + AlertDialogCancel, 15 15 + AlertDialogContent, 16 16 + AlertDialogDescription, 17 17 + AlertDialogFooter, 18 18 + AlertDialogHeader, 19 19 + AlertDialogTitle, 20 20 + AlertDialogTrigger, 21 21 + Button, 22 22 + Command, 23 23 + CommandGroup, 24 24 + CommandInput, 25 25 + CommandItem, 26 26 + CommandSeparator, 27 27 + Dialog, 28 28 + DialogContent, 29 29 + DialogDescription, 30 30 + DialogHeader, 31 31 + DialogTitle, 32 32 + Input, 33 33 + Label, 34 34 + Popover, 35 35 + PopoverContent, 36 36 + PopoverTrigger, 37 37 + } from "@openstatus/ui"; 38 38 + 39 39 + import { Icons } from "@/components/icons"; 40 40 + import { LoadingAnimation } from "@/components/loading-animation"; 41 41 + import { TagBadge } from "@/components/monitor/tag-badge"; 42 42 + import { toastAction } from "@/lib/toast"; 43 43 + import { cn } from "@/lib/utils"; 44 44 + import { api } from "@/trpc/client"; 45 45 + 46 46 + const colors = [ 47 47 + "#ff5c5c", // Red 48 48 + "#6fcf97", // Green 49 49 + "#70a1ff", // Blue 50 50 + "#ffb74d", // Orange 51 51 + "#b19cd9", // Violet 52 52 + "#7986cb", // Indigo 53 53 + "#64b5f6", // Turquoise 54 54 + "#ffee58", // Yellow 55 55 + "#f06292", // Pink 56 56 + "#ff77ff", // Fuchsia 57 57 + "#808080", // Gray 58 58 + ]; 59 59 + 60 60 + interface TagsMultiBoxProps { 61 61 + tags?: MonitorTag[]; 62 62 + values: number[]; // values from the form 63 63 + onChange: (values: number[]) => void; 64 64 + } 65 65 + 66 66 + export function TagsMultiBox({ 67 67 + tags: defaultTags, 68 68 + values, 69 69 + onChange, 70 70 + }: TagsMultiBoxProps) { 71 71 + const inputRef = React.useRef<HTMLInputElement>(null); 72 72 + const [tags, setTags] = React.useState<MonitorTag[]>(defaultTags || []); 73 73 + const [openCombobox, setOpenCombobox] = React.useState(false); 74 74 + const [openDialog, setOpenDialog] = React.useState(false); 75 75 + const [inputValue, setInputValue] = React.useState<string>(""); 76 76 + 77 77 + const create = async (name: string) => { 78 78 + try { 79 79 + const randomIndex = Math.floor(Math.random() * colors.length); 80 80 + const newTag = await api.monitorTag.create.mutate({ 81 81 + name: name.trim(), 82 82 + color: colors[randomIndex] || "#808080", // gray as default 83 83 + }); 84 84 + toastAction("saved"); 85 85 + setTags((prev) => [...prev, newTag]); 86 86 + // TODO: seems like the new value is not taken into account.... 87 87 + // That's mainly because we only update the id, and not the name! Same is for the update() function 88 88 + onChange([...values, newTag.id]); 89 89 + } catch { 90 90 + toastAction("error"); 91 91 + } 92 92 + }; 93 93 + 94 94 + const toggle = (item: MonitorTag) => { 95 95 + onChange( 96 96 + values?.includes(item.id) 97 97 + ? values.filter((v) => v !== item.id) 98 98 + : [...values, item.id], 99 99 + ); 100 100 + inputRef?.current?.focus(); 101 101 + }; 102 102 + 103 103 + const update = async (tag: MonitorTag) => { 104 104 + try { 105 105 + const updateTag = await api.monitorTag.update.mutate(tag); 106 106 + if (!updateTag) return; 107 107 + setTags((prev) => prev.map((f) => (f.id === tag.id ? updateTag : f))); 108 108 + toastAction("saved"); 109 109 + } catch { 110 110 + toastAction("error"); 111 111 + } 112 112 + }; 113 113 + 114 114 + const _delete = async (item: MonitorTag) => { 115 115 + try { 116 116 + await api.monitorTag.delete.mutate({ id: item.id }); 117 117 + setTags((prev) => prev.filter((f) => f.id !== item.id)); 118 118 + onChange(values?.filter((v) => v !== item.id)); 119 119 + toastAction("deleted"); 120 120 + } catch { 121 121 + toastAction("error"); 122 122 + } 123 123 + }; 124 124 + 125 125 + const onComboboxOpenChange = (value: boolean) => { 126 126 + inputRef.current?.blur(); // HACK: otherwise, would scroll automatically to the bottom of page 127 127 + setOpenCombobox(value); 128 128 + }; 129 129 + 130 130 + return ( 131 131 + <div className="w-full"> 132 132 + <Popover open={openCombobox} onOpenChange={onComboboxOpenChange}> 133 133 + <PopoverTrigger asChild> 134 134 + <Button 135 135 + variant="outline" 136 136 + role="combobox" 137 137 + aria-expanded={openCombobox} 138 138 + className="text-foreground h-auto w-full justify-between" 139 139 + > 140 140 + <span className="flex flex-wrap gap-2 truncate"> 141 141 + {values.length > 0 142 142 + ? values.map((id) => { 143 143 + const tag = tags.find((tag) => tag.id === id); 144 144 + return tag ? <TagBadge key={tag.id} {...tag} /> : null; 145 145 + }) 146 146 + : "Select tags"} 147 147 + </span> 148 148 + <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /> 149 149 + </Button> 150 150 + </PopoverTrigger> 151 151 + <PopoverContent className="w-full p-0"> 152 152 + <Command className="w-[var(--radix-popover-trigger-width)]" loop> 153 153 + <CommandInput 154 154 + ref={inputRef} 155 155 + placeholder="Search tag..." 156 156 + value={inputValue} 157 157 + onValueChange={setInputValue} 158 158 + /> 159 159 + <CommandGroup className="max-h-[145px] overflow-auto"> 160 160 + {tags.map((item) => { 161 161 + const isActive = values?.includes(item.id); 162 162 + return ( 163 163 + <CommandItem 164 164 + key={item.id} 165 165 + value={item.name} 166 166 + onSelect={() => toggle(item)} 167 167 + > 168 168 + <Check 169 169 + className={cn( 170 170 + "mr-2 h-4 w-4", 171 171 + isActive ? "opacity-100" : "opacity-0", 172 172 + )} 173 173 + /> 174 174 + <div className="flex-1">{item.name}</div> 175 175 + <div 176 176 + className="h-4 w-4 rounded-full" 177 177 + style={{ backgroundColor: item.color }} 178 178 + /> 179 179 + </CommandItem> 180 180 + ); 181 181 + })} 182 182 + <CommandItemCreate 183 183 + onSelect={() => create(inputValue)} 184 184 + {...{ inputValue, tags }} 185 185 + /> 186 186 + </CommandGroup> 187 187 + <CommandSeparator alwaysRender /> 188 188 + <CommandGroup> 189 189 + <CommandItem 190 190 + value={`:${inputValue}:`} // HACK: that way, the edit button will always be shown 191 191 + className="text-muted-foreground text-xs" 192 192 + onSelect={() => setOpenDialog(true)} 193 193 + > 194 194 + <div className={cn("mr-2 h-4 w-4")} /> 195 195 + <Edit2 className="mr-2 h-2.5 w-2.5" /> 196 196 + Edit tags 197 197 + </CommandItem> 198 198 + </CommandGroup> 199 199 + </Command> 200 200 + </PopoverContent> 201 201 + </Popover> 202 202 + <Dialog 203 203 + open={openDialog} 204 204 + onOpenChange={(open) => { 205 205 + if (!open) setOpenCombobox(true); 206 206 + setOpenDialog(open); 207 207 + }} 208 208 + > 209 209 + <DialogContent className="flex max-h-[90vh] flex-col"> 210 210 + <DialogHeader> 211 211 + <DialogTitle>Edit Tags</DialogTitle> 212 212 + <DialogDescription> 213 213 + Update or delete tags. Create a tag through the combobox. 214 214 + </DialogDescription> 215 215 + </DialogHeader> 216 216 + <div className="flex-1 overflow-scroll"> 217 217 + {tags.map((item) => { 218 218 + return ( 219 219 + <DialogListItem 220 220 + key={item.id} 221 221 + onDelete={() => _delete(item)} 222 222 + onSubmit={async (values) => { 223 223 + await update({ 224 224 + ...item, 225 225 + ...values, 226 226 + }); 227 227 + }} 228 228 + {...item} 229 229 + /> 230 230 + ); 231 231 + })} 232 232 + </div> 233 233 + </DialogContent> 234 234 + </Dialog> 235 235 + </div> 236 236 + ); 237 237 + } 238 238 + 239 239 + const CommandItemCreate = ({ 240 240 + inputValue, 241 241 + tags, 242 242 + onSelect, 243 243 + }: { 244 244 + inputValue: string; 245 245 + tags: MonitorTag[]; 246 246 + onSelect: () => Promise<void>; 247 247 + }) => { 248 248 + const [isPending, startTransition] = React.useTransition(); 249 249 + const hasNoTag = !tags 250 250 + .map(({ name }) => name.toLowerCase()) 251 251 + .includes(`${inputValue.toLowerCase()}`); 252 252 + 253 253 + const render = inputValue !== "" && hasNoTag; 254 254 + 255 255 + if (!render) return null; 256 256 + 257 257 + // BUG: whenever a space is appended, the Create-Button will not be shown. 258 258 + return ( 259 259 + <CommandItem 260 260 + key={`${inputValue}`} 261 261 + value={`${inputValue}`} 262 262 + className="text-muted-foreground text-xs" 263 263 + onSelect={() => { 264 264 + startTransition(async () => { 265 265 + await onSelect(); 266 266 + }); 267 267 + }} 268 268 + disabled={isPending} 269 269 + > 270 270 + <div className={cn("mr-2 h-4 w-4")} /> 271 271 + {isPending ? "Creating" : "Create"} new label &quot;{inputValue}&quot; 272 272 + </CommandItem> 273 273 + ); 274 274 + }; 275 275 + 276 276 + const DialogListItem = ({ 277 277 + id, 278 278 + name, 279 279 + color, 280 280 + onSubmit, 281 281 + onDelete, 282 282 + }: MonitorTag & { 283 283 + onSubmit: (values: { name: string; color: string }) => Promise<void>; 284 284 + onDelete: () => Promise<void>; 285 285 + }) => { 286 286 + const inputRef = React.useRef<HTMLInputElement>(null); 287 287 + const [accordionValue, setAccordionValue] = React.useState<string>(""); 288 288 + const [inputValue, setInputValue] = React.useState<string>(name); 289 289 + const [colorValue, setColorValue] = React.useState<string>(color); 290 290 + const [isPending, startTransition] = React.useTransition(); 291 291 + const disabled = name === inputValue && color === colorValue; 292 292 + 293 293 + React.useEffect(() => { 294 294 + if (accordionValue !== "") { 295 295 + inputRef.current?.focus(); 296 296 + } 297 297 + }, [accordionValue]); 298 298 + 299 299 + // const handleSubmit = () => {} 300 300 + // const handleDelete = () => {} 301 301 + 302 302 + return ( 303 303 + <Accordion 304 304 + key={id} 305 305 + type="single" // will never work as we have only one accordion for each tag 306 306 + collapsible 307 307 + value={accordionValue} 308 308 + onValueChange={setAccordionValue} 309 309 + > 310 310 + <AccordionItem value={`item-${id}`}> 311 311 + <AccordionTrigger className="w-full hover:no-underline"> 312 312 + <TagBadge color={color} name={name} /> 313 313 + </AccordionTrigger> 314 314 + <AccordionContent> 315 315 + {/* REMINDER: cannot nest form within form! HOTFIX: no form */} 316 316 + <div className="flex items-end gap-4 px-1"> 317 317 + <div className="grid w-full gap-3"> 318 318 + <Label htmlFor="name">Label name</Label> 319 319 + <Input 320 320 + ref={inputRef} 321 321 + id="name" 322 322 + value={inputValue} 323 323 + onChange={(e) => setInputValue(e.target.value)} 324 324 + className="h-8" 325 325 + /> 326 326 + </div> 327 327 + <div className="grid gap-3"> 328 328 + <Label htmlFor="color">Color</Label> 329 329 + <Input 330 330 + id="color" 331 331 + type="color" 332 332 + value={colorValue} 333 333 + onChange={(e) => setColorValue(e.target.value)} 334 334 + className="h-8 px-2 py-1" 335 335 + /> 336 336 + </div> 337 337 + {/* FIXME: shouldnt saves the monitor form */} 338 338 + <Button 339 339 + onClick={() => { 340 340 + startTransition(() => { 341 341 + onSubmit({ 342 342 + name: inputValue.trim(), 343 343 + color: colorValue, 344 344 + }); 345 345 + setAccordionValue(""); 346 346 + }); 347 347 + }} 348 348 + disabled={disabled || isPending} 349 349 + > 350 350 + {isPending ? <LoadingAnimation /> : "Save"} 351 351 + </Button> 352 352 + <div className="flex items-center gap-4"> 353 353 + <AlertDialog> 354 354 + <AlertDialogTrigger asChild> 355 355 + <Button 356 356 + size="icon" 357 357 + variant="destructive" 358 358 + disabled={isPending} 359 359 + > 360 360 + <Icons.trash className="h-4 w-4" /> 361 361 + </Button> 362 362 + </AlertDialogTrigger> 363 363 + <AlertDialogContent> 364 364 + <AlertDialogHeader> 365 365 + <AlertDialogTitle>Are you sure sure?</AlertDialogTitle> 366 366 + <AlertDialogDescription> 367 367 + You are about to delete the tag{" "} 368 368 + <TagBadge color={color} name={name} /> . 369 369 + </AlertDialogDescription> 370 370 + </AlertDialogHeader> 371 371 + <AlertDialogFooter> 372 372 + <AlertDialogCancel>Cancel</AlertDialogCancel> 373 373 + <AlertDialogAction 374 374 + onClick={() => { 375 375 + startTransition(async () => { 376 376 + await onDelete(); 377 377 + }); 378 378 + }} 379 379 + > 380 380 + {isPending ? <LoadingAnimation /> : "Delete"} 381 381 + </AlertDialogAction> 382 382 + </AlertDialogFooter> 383 383 + </AlertDialogContent> 384 384 + </AlertDialog> 385 385 + </div> 386 386 + </div> 387 387 + </AccordionContent> 388 388 + </AccordionItem> 389 389 + </Accordion> 390 390 + ); 391 391 + };

+18

apps/web/src/components/monitor/tag-badge.tsx

··· 1 1 + import { Badge } from "@openstatus/ui"; 2 2 + 3 3 + function getStyle(color: string) { 4 4 + return { 5 5 + borderColor: `${color}20`, 6 6 + backgroundColor: `${color}30`, 7 7 + color, 8 8 + }; 9 9 + } 10 10 + 11 11 + interface TagBadgeProps { 12 12 + name: string; 13 13 + color: string; 14 14 + } 15 15 + 16 16 + export function TagBadge({ color, name }: TagBadgeProps) { 17 17 + return <Badge style={getStyle(color)}>{name}</Badge>; 18 18 + }

+11

apps/web/src/content/changelog/monitor-tags.mdx

··· 1 1 + --- 2 2 + title: Monitor Tags 3 3 + description: Easily categorize your monitors with tags. 4 4 + image: /assets/changelog/monitor-tags.png 5 5 + publishedAt: 2024-03-20 6 6 + --- 7 7 + 8 8 + You can now create tags for your monitors to easily categorize them. Tags can be 9 9 + used to filter monitors on the dashboard and in the monitor list. 10 10 + 11 11 + Create, update or delete a tag via your monitor settings.

+2

packages/api/src/edge.ts

··· 3 3 import { integrationRouter } from "./router/integration"; 4 4 import { invitationRouter } from "./router/invitation"; 5 5 import { monitorRouter } from "./router/monitor"; 6 6 + import { monitorTagRouter } from "./router/monitorTag"; 6 7 import { notificationRouter } from "./router/notification"; 7 8 import { pageRouter } from "./router/page"; 8 9 import { pageSubscriberRouter } from "./router/pageSubscriber"; ··· 26 27 incident: incidentRouter, 27 28 pageSubscriber: pageSubscriberRouter, 28 29 tinybird: tinybirdRouter, 30 30 + monitorTag: monitorTagRouter, 29 31 });

+121 -14

packages/api/src/router/monitor.ts

··· 9 9 monitorPeriodicitySchema, 10 10 monitorStatusTable, 11 11 monitorsToPages, 12 12 + monitorTag, 13 13 + monitorTagsToMonitors, 12 14 notification, 13 15 notificationsToMonitors, 14 16 page, 15 17 selectMonitorSchema, 16 18 selectMonitorStatusSchema, 19 19 + selectMonitorTagSchema, 17 20 selectNotificationSchema, 18 21 } from "@openstatus/db/src/schema"; 19 22 import { allPlans } from "@openstatus/plans"; ··· 56 59 } 57 60 58 61 // FIXME: this is a hotfix 59 59 - const { regions, headers, notifications, id, pages, ...data } = 62 62 + const { regions, headers, notifications, id, pages, tags, ...data } = 60 63 opts.input; 61 64 62 65 const newMonitor = await opts.ctx.db ··· 73 76 .get(); 74 77 75 78 if (notifications.length > 0) { 76 76 - // We should make sure the user has access to the notifications 77 79 const allNotifications = await opts.ctx.db.query.notification.findMany({ 78 78 - where: inArray(notification.id, notifications), 80 80 + where: and( 81 81 + eq(notification.workspaceId, opts.ctx.workspace.id), 82 82 + inArray(notification.id, notifications), 83 83 + ), 79 84 }); 80 85 81 86 const values = allNotifications.map((notification) => ({ ··· 86 91 await opts.ctx.db.insert(notificationsToMonitors).values(values).run(); 87 92 } 88 93 94 94 + if (tags.length > 0) { 95 95 + const allTags = await opts.ctx.db.query.monitorTag.findMany({ 96 96 + where: and( 97 97 + eq(monitorTag.workspaceId, opts.ctx.workspace.id), 98 98 + inArray(monitorTag.id, tags), 99 99 + ), 100 100 + }); 101 101 + 102 102 + const values = allTags.map((monitorTag) => ({ 103 103 + monitorId: newMonitor.id, 104 104 + monitorTagId: monitorTag.id, 105 105 + })); 106 106 + 107 107 + await opts.ctx.db.insert(monitorTagsToMonitors).values(values).run(); 108 108 + } 109 109 + 89 110 if (pages.length > 0) { 90 90 - // We should make sure the user has access to the notifications 91 111 const allPages = await opts.ctx.db.query.page.findMany({ 92 92 - where: inArray(page.id, pages), 112 112 + where: and( 113 113 + eq(page.workspaceId, opts.ctx.workspace.id), 114 114 + inArray(page.id, pages), 115 115 + ), 93 116 }); 94 117 95 118 const values = allPages.map((page) => ({ ··· 126 149 const parsedMonitor = selectMonitorSchema.safeParse(currentMonitor); 127 150 128 151 if (!parsedMonitor.success) { 152 152 + console.log(parsedMonitor.error); 129 153 throw new TRPCError({ 130 154 code: "UNAUTHORIZED", 131 155 message: "You are not allowed to access the monitor.", 132 156 }); 133 157 } 134 134 - return selectMonitorSchema.parse(currentMonitor); 158 158 + return parsedMonitor.data; 135 159 }), 136 160 137 161 update: protectedProcedure ··· 153 177 }); 154 178 } 155 179 156 156 - const { regions, headers, notifications, pages, ...data } = opts.input; 180 180 + console.log(opts.input); 181 181 + 182 182 + const { regions, headers, notifications, pages, tags, ...data } = 183 183 + opts.input; 157 184 158 185 const currentMonitor = await opts.ctx.db 159 186 .update(monitor) ··· 213 240 .run(); 214 241 } 215 242 243 243 + const currentMonitorTags = await opts.ctx.db 244 244 + .select() 245 245 + .from(monitorTagsToMonitors) 246 246 + .where(eq(monitorTagsToMonitors.monitorId, currentMonitor.id)) 247 247 + .all(); 248 248 + 249 249 + const addedTags = tags.filter( 250 250 + (x) => 251 251 + !currentMonitorTags 252 252 + .map(({ monitorTagId }) => monitorTagId) 253 253 + ?.includes(x), 254 254 + ); 255 255 + 256 256 + if (addedTags.length > 0) { 257 257 + const values = addedTags.map((monitorTagId) => ({ 258 258 + monitorId: currentMonitor.id, 259 259 + monitorTagId, 260 260 + })); 261 261 + 262 262 + await opts.ctx.db.insert(monitorTagsToMonitors).values(values).run(); 263 263 + } 264 264 + 265 265 + const removedTags = currentMonitorTags 266 266 + .map(({ monitorTagId }) => monitorTagId) 267 267 + .filter((x) => !tags?.includes(x)); 268 268 + 269 269 + if (removedTags.length > 0) { 270 270 + await opts.ctx.db 271 271 + .delete(monitorTagsToMonitors) 272 272 + .where( 273 273 + and( 274 274 + eq(monitorTagsToMonitors.monitorId, currentMonitor.id), 275 275 + inArray(monitorTagsToMonitors.monitorTagId, removedTags), 276 276 + ), 277 277 + ) 278 278 + .run(); 279 279 + } 280 280 + 216 281 const currentMonitorPages = await opts.ctx.db 217 282 .select() 218 283 .from(monitorsToPages) ··· 270 335 .run(); 271 336 }), 272 337 273 273 - getMonitorsByWorkspace: protectedProcedure 274 274 - .output(z.array(selectMonitorSchema)) 275 275 - .query(async (opts) => { 276 276 - const monitors = await opts.ctx.db 338 338 + getMonitorsByWorkspace: protectedProcedure.query(async (opts) => { 339 339 + const monitors = await opts.ctx.db.query.monitor.findMany({ 340 340 + where: eq(monitor.workspaceId, opts.ctx.workspace.id), 341 341 + with: { 342 342 + monitorTagsToMonitors: { with: { monitorTag: true } }, 343 343 + }, 344 344 + }); 345 345 + 346 346 + return z 347 347 + .array( 348 348 + selectMonitorSchema.extend({ 349 349 + monitorTagsToMonitors: z 350 350 + .array(z.object({ monitorTag: selectMonitorTagSchema })) 351 351 + .default([]), 352 352 + }), 353 353 + ) 354 354 + .parse(monitors); 355 355 + }), 356 356 + 357 357 + toggleMonitorActive: protectedProcedure 358 358 + .input(z.object({ id: z.number() })) 359 359 + .mutation(async (opts) => { 360 360 + const monitorToUpdate = await opts.ctx.db 277 361 .select() 278 362 .from(monitor) 279 279 - .where(eq(monitor.workspaceId, opts.ctx.workspace.id)) 280 280 - .all(); 363 363 + .where( 364 364 + and( 365 365 + eq(monitor.id, opts.input.id), 366 366 + eq(monitor.workspaceId, opts.ctx.workspace.id), 367 367 + ), 368 368 + ) 369 369 + .get(); 370 370 + 371 371 + if (!monitorToUpdate) { 372 372 + throw new TRPCError({ 373 373 + code: "NOT_FOUND", 374 374 + message: "Monitor not found.", 375 375 + }); 376 376 + } 281 377 282 282 - return z.array(selectMonitorSchema).parse(monitors); 378 378 + await opts.ctx.db 379 379 + .update(monitor) 380 380 + .set({ 381 381 + active: !monitorToUpdate.active, 382 382 + }) 383 383 + .where( 384 384 + and( 385 385 + eq(monitor.id, opts.input.id), 386 386 + eq(monitor.workspaceId, opts.ctx.workspace.id), 387 387 + ), 388 388 + ) 389 389 + .run(); 283 390 }), 284 391 285 392 // rename to getActiveMonitorsCount

+61

packages/api/src/router/monitorTag.ts

··· 1 1 + import { TRPCError } from "@trpc/server"; 2 2 + import { z } from "zod"; 3 3 + 4 4 + import { and, eq } from "@openstatus/db"; 5 5 + import { insertMonitorTagSchema, monitorTag } from "@openstatus/db/src/schema"; 6 6 + 7 7 + import { createTRPCRouter, protectedProcedure } from "../trpc"; 8 8 + 9 9 + export const monitorTagRouter = createTRPCRouter({ 10 10 + getMonitorTagsByWorkspace: protectedProcedure.query(async (opts) => { 11 11 + return opts.ctx.db.query.monitorTag.findMany({ 12 12 + where: eq(monitorTag.workspaceId, opts.ctx.workspace.id), 13 13 + with: { monitor: true }, 14 14 + }); 15 15 + }), 16 16 + 17 17 + update: protectedProcedure 18 18 + .input(insertMonitorTagSchema) 19 19 + .mutation(async (opts) => { 20 20 + if (!opts.input.id) return; 21 21 + return await opts.ctx.db 22 22 + .update(monitorTag) 23 23 + .set({ name: opts.input.name, color: opts.input.color }) 24 24 + .where( 25 25 + and( 26 26 + eq(monitorTag.workspaceId, opts.ctx.workspace.id), 27 27 + eq(monitorTag.id, opts.input.id), 28 28 + ), 29 29 + ) 30 30 + .returning() 31 31 + .get(); 32 32 + }), 33 33 + 34 34 + delete: protectedProcedure 35 35 + .input(z.object({ id: z.number() })) 36 36 + .mutation(async (opts) => { 37 37 + await opts.ctx.db 38 38 + .delete(monitorTag) 39 39 + .where( 40 40 + and( 41 41 + eq(monitorTag.id, opts.input.id), 42 42 + eq(monitorTag.workspaceId, opts.ctx.workspace.id), 43 43 + ), 44 44 + ) 45 45 + .run(); 46 46 + }), 47 47 + 48 48 + create: protectedProcedure 49 49 + .input(z.object({ name: z.string(), color: z.string() })) 50 50 + .mutation(async (opts) => { 51 51 + return opts.ctx.db 52 52 + .insert(monitorTag) 53 53 + .values({ 54 54 + name: opts.input.name, 55 55 + color: opts.input.color, 56 56 + workspaceId: opts.ctx.workspace.id, 57 57 + }) 58 58 + .returning() 59 59 + .get(); 60 60 + }), 61 61 + });

+18

packages/db/drizzle/0021_reflective_nico_minoru.sql

··· 1 1 + CREATE TABLE `monitor_tag` ( 2 2 + `id` integer PRIMARY KEY NOT NULL, 3 3 + `workspace_id` integer NOT NULL, 4 4 + `name` text NOT NULL, 5 5 + `color` text NOT NULL, 6 6 + `created_at` integer DEFAULT (strftime('%s', 'now')), 7 7 + `updated_at` integer DEFAULT (strftime('%s', 'now')), 8 8 + FOREIGN KEY (`workspace_id`) REFERENCES `workspace`(`id`) ON UPDATE no action ON DELETE cascade 9 9 + ); 10 10 + --> statement-breakpoint 11 11 + CREATE TABLE `monitor_tag_to_monitor` ( 12 12 + `monitor_id` integer NOT NULL, 13 13 + `monitor_tag_id` integer NOT NULL, 14 14 + `created_at` integer DEFAULT (strftime('%s', 'now')), 15 15 + PRIMARY KEY(`monitor_id`, `monitor_tag_id`), 16 16 + FOREIGN KEY (`monitor_id`) REFERENCES `monitor`(`id`) ON UPDATE no action ON DELETE cascade, 17 17 + FOREIGN KEY (`monitor_tag_id`) REFERENCES `monitor_tag`(`id`) ON UPDATE no action ON DELETE cascade 18 18 + );

+1605

packages/db/drizzle/meta/0021_snapshot.json

··· 1 1 + { 2 2 + "version": "5", 3 3 + "dialect": "sqlite", 4 4 + "id": "44c2bbb5-69d5-40e8-b301-f2569bc2e499", 5 5 + "prevId": "47000fd1-f273-4406-8380-803a0a63bc59", 6 6 + "tables": { 7 7 + "status_report_to_monitors": { 8 8 + "name": "status_report_to_monitors", 9 9 + "columns": { 10 10 + "monitor_id": { 11 11 + "name": "monitor_id", 12 12 + "type": "integer", 13 13 + "primaryKey": false, 14 14 + "notNull": true, 15 15 + "autoincrement": false 16 16 + }, 17 17 + "status_report_id": { 18 18 + "name": "status_report_id", 19 19 + "type": "integer", 20 20 + "primaryKey": false, 21 21 + "notNull": true, 22 22 + "autoincrement": false 23 23 + }, 24 24 + "created_at": { 25 25 + "name": "created_at", 26 26 + "type": "integer", 27 27 + "primaryKey": false, 28 28 + "notNull": false, 29 29 + "autoincrement": false, 30 30 + "default": "(strftime('%s', 'now'))" 31 31 + } 32 32 + }, 33 33 + "indexes": {}, 34 34 + "foreignKeys": { 35 35 + "status_report_to_monitors_monitor_id_monitor_id_fk": { 36 36 + "name": "status_report_to_monitors_monitor_id_monitor_id_fk", 37 37 + "tableFrom": "status_report_to_monitors", 38 38 + "tableTo": "monitor", 39 39 + "columnsFrom": [ 40 40 + "monitor_id" 41 41 + ], 42 42 + "columnsTo": [ 43 43 + "id" 44 44 + ], 45 45 + "onDelete": "cascade", 46 46 + "onUpdate": "no action" 47 47 + }, 48 48 + "status_report_to_monitors_status_report_id_status_report_id_fk": { 49 49 + "name": "status_report_to_monitors_status_report_id_status_report_id_fk", 50 50 + "tableFrom": "status_report_to_monitors", 51 51 + "tableTo": "status_report", 52 52 + "columnsFrom": [ 53 53 + "status_report_id" 54 54 + ], 55 55 + "columnsTo": [ 56 56 + "id" 57 57 + ], 58 58 + "onDelete": "cascade", 59 59 + "onUpdate": "no action" 60 60 + } 61 61 + }, 62 62 + "compositePrimaryKeys": { 63 63 + "status_report_to_monitors_monitor_id_status_report_id_pk": { 64 64 + "columns": [ 65 65 + "monitor_id", 66 66 + "status_report_id" 67 67 + ], 68 68 + "name": "status_report_to_monitors_monitor_id_status_report_id_pk" 69 69 + } 70 70 + }, 71 71 + "uniqueConstraints": {} 72 72 + }, 73 73 + "status_reports_to_pages": { 74 74 + "name": "status_reports_to_pages", 75 75 + "columns": { 76 76 + "page_id": { 77 77 + "name": "page_id", 78 78 + "type": "integer", 79 79 + "primaryKey": false, 80 80 + "notNull": true, 81 81 + "autoincrement": false 82 82 + }, 83 83 + "status_report_id": { 84 84 + "name": "status_report_id", 85 85 + "type": "integer", 86 86 + "primaryKey": false, 87 87 + "notNull": true, 88 88 + "autoincrement": false 89 89 + }, 90 90 + "created_at": { 91 91 + "name": "created_at", 92 92 + "type": "integer", 93 93 + "primaryKey": false, 94 94 + "notNull": false, 95 95 + "autoincrement": false, 96 96 + "default": "(strftime('%s', 'now'))" 97 97 + } 98 98 + }, 99 99 + "indexes": {}, 100 100 + "foreignKeys": { 101 101 + "status_reports_to_pages_page_id_page_id_fk": { 102 102 + "name": "status_reports_to_pages_page_id_page_id_fk", 103 103 + "tableFrom": "status_reports_to_pages", 104 104 + "tableTo": "page", 105 105 + "columnsFrom": [ 106 106 + "page_id" 107 107 + ], 108 108 + "columnsTo": [ 109 109 + "id" 110 110 + ], 111 111 + "onDelete": "cascade", 112 112 + "onUpdate": "no action" 113 113 + }, 114 114 + "status_reports_to_pages_status_report_id_status_report_id_fk": { 115 115 + "name": "status_reports_to_pages_status_report_id_status_report_id_fk", 116 116 + "tableFrom": "status_reports_to_pages", 117 117 + "tableTo": "status_report", 118 118 + "columnsFrom": [ 119 119 + "status_report_id" 120 120 + ], 121 121 + "columnsTo": [ 122 122 + "id" 123 123 + ], 124 124 + "onDelete": "cascade", 125 125 + "onUpdate": "no action" 126 126 + } 127 127 + }, 128 128 + "compositePrimaryKeys": { 129 129 + "status_reports_to_pages_page_id_status_report_id_pk": { 130 130 + "columns": [ 131 131 + "page_id", 132 132 + "status_report_id" 133 133 + ], 134 134 + "name": "status_reports_to_pages_page_id_status_report_id_pk" 135 135 + } 136 136 + }, 137 137 + "uniqueConstraints": {} 138 138 + }, 139 139 + "status_report": { 140 140 + "name": "status_report", 141 141 + "columns": { 142 142 + "id": { 143 143 + "name": "id", 144 144 + "type": "integer", 145 145 + "primaryKey": true, 146 146 + "notNull": true, 147 147 + "autoincrement": false 148 148 + }, 149 149 + "status": { 150 150 + "name": "status", 151 151 + "type": "text", 152 152 + "primaryKey": false, 153 153 + "notNull": true, 154 154 + "autoincrement": false 155 155 + }, 156 156 + "title": { 157 157 + "name": "title", 158 158 + "type": "text(256)", 159 159 + "primaryKey": false, 160 160 + "notNull": true, 161 161 + "autoincrement": false 162 162 + }, 163 163 + "workspace_id": { 164 164 + "name": "workspace_id", 165 165 + "type": "integer", 166 166 + "primaryKey": false, 167 167 + "notNull": false, 168 168 + "autoincrement": false 169 169 + }, 170 170 + "created_at": { 171 171 + "name": "created_at", 172 172 + "type": "integer", 173 173 + "primaryKey": false, 174 174 + "notNull": false, 175 175 + "autoincrement": false, 176 176 + "default": "(strftime('%s', 'now'))" 177 177 + }, 178 178 + "updated_at": { 179 179 + "name": "updated_at", 180 180 + "type": "integer", 181 181 + "primaryKey": false, 182 182 + "notNull": false, 183 183 + "autoincrement": false, 184 184 + "default": "(strftime('%s', 'now'))" 185 185 + } 186 186 + }, 187 187 + "indexes": {}, 188 188 + "foreignKeys": { 189 189 + "status_report_workspace_id_workspace_id_fk": { 190 190 + "name": "status_report_workspace_id_workspace_id_fk", 191 191 + "tableFrom": "status_report", 192 192 + "tableTo": "workspace", 193 193 + "columnsFrom": [ 194 194 + "workspace_id" 195 195 + ], 196 196 + "columnsTo": [ 197 197 + "id" 198 198 + ], 199 199 + "onDelete": "no action", 200 200 + "onUpdate": "no action" 201 201 + } 202 202 + }, 203 203 + "compositePrimaryKeys": {}, 204 204 + "uniqueConstraints": {} 205 205 + }, 206 206 + "status_report_update": { 207 207 + "name": "status_report_update", 208 208 + "columns": { 209 209 + "id": { 210 210 + "name": "id", 211 211 + "type": "integer", 212 212 + "primaryKey": true, 213 213 + "notNull": true, 214 214 + "autoincrement": false 215 215 + }, 216 216 + "status": { 217 217 + "name": "status", 218 218 + "type": "text(4)", 219 219 + "primaryKey": false, 220 220 + "notNull": true, 221 221 + "autoincrement": false 222 222 + }, 223 223 + "date": { 224 224 + "name": "date", 225 225 + "type": "integer", 226 226 + "primaryKey": false, 227 227 + "notNull": true, 228 228 + "autoincrement": false 229 229 + }, 230 230 + "message": { 231 231 + "name": "message", 232 232 + "type": "text", 233 233 + "primaryKey": false, 234 234 + "notNull": true, 235 235 + "autoincrement": false 236 236 + }, 237 237 + "status_report_id": { 238 238 + "name": "status_report_id", 239 239 + "type": "integer", 240 240 + "primaryKey": false, 241 241 + "notNull": true, 242 242 + "autoincrement": false 243 243 + }, 244 244 + "created_at": { 245 245 + "name": "created_at", 246 246 + "type": "integer", 247 247 + "primaryKey": false, 248 248 + "notNull": false, 249 249 + "autoincrement": false, 250 250 + "default": "(strftime('%s', 'now'))" 251 251 + }, 252 252 + "updated_at": { 253 253 + "name": "updated_at", 254 254 + "type": "integer", 255 255 + "primaryKey": false, 256 256 + "notNull": false, 257 257 + "autoincrement": false, 258 258 + "default": "(strftime('%s', 'now'))" 259 259 + } 260 260 + }, 261 261 + "indexes": {}, 262 262 + "foreignKeys": { 263 263 + "status_report_update_status_report_id_status_report_id_fk": { 264 264 + "name": "status_report_update_status_report_id_status_report_id_fk", 265 265 + "tableFrom": "status_report_update", 266 266 + "tableTo": "status_report", 267 267 + "columnsFrom": [ 268 268 + "status_report_id" 269 269 + ], 270 270 + "columnsTo": [ 271 271 + "id" 272 272 + ], 273 273 + "onDelete": "cascade", 274 274 + "onUpdate": "no action" 275 275 + } 276 276 + }, 277 277 + "compositePrimaryKeys": {}, 278 278 + "uniqueConstraints": {} 279 279 + }, 280 280 + "integration": { 281 281 + "name": "integration", 282 282 + "columns": { 283 283 + "id": { 284 284 + "name": "id", 285 285 + "type": "integer", 286 286 + "primaryKey": true, 287 287 + "notNull": true, 288 288 + "autoincrement": false 289 289 + }, 290 290 + "name": { 291 291 + "name": "name", 292 292 + "type": "text(256)", 293 293 + "primaryKey": false, 294 294 + "notNull": true, 295 295 + "autoincrement": false 296 296 + }, 297 297 + "workspace_id": { 298 298 + "name": "workspace_id", 299 299 + "type": "integer", 300 300 + "primaryKey": false, 301 301 + "notNull": false, 302 302 + "autoincrement": false 303 303 + }, 304 304 + "credential": { 305 305 + "name": "credential", 306 306 + "type": "text", 307 307 + "primaryKey": false, 308 308 + "notNull": false, 309 309 + "autoincrement": false 310 310 + }, 311 311 + "external_id": { 312 312 + "name": "external_id", 313 313 + "type": "text", 314 314 + "primaryKey": false, 315 315 + "notNull": true, 316 316 + "autoincrement": false 317 317 + }, 318 318 + "created_at": { 319 319 + "name": "created_at", 320 320 + "type": "integer", 321 321 + "primaryKey": false, 322 322 + "notNull": false, 323 323 + "autoincrement": false, 324 324 + "default": "(strftime('%s', 'now'))" 325 325 + }, 326 326 + "updated_at": { 327 327 + "name": "updated_at", 328 328 + "type": "integer", 329 329 + "primaryKey": false, 330 330 + "notNull": false, 331 331 + "autoincrement": false, 332 332 + "default": "(strftime('%s', 'now'))" 333 333 + }, 334 334 + "data": { 335 335 + "name": "data", 336 336 + "type": "text", 337 337 + "primaryKey": false, 338 338 + "notNull": true, 339 339 + "autoincrement": false 340 340 + } 341 341 + }, 342 342 + "indexes": {}, 343 343 + "foreignKeys": { 344 344 + "integration_workspace_id_workspace_id_fk": { 345 345 + "name": "integration_workspace_id_workspace_id_fk", 346 346 + "tableFrom": "integration", 347 347 + "tableTo": "workspace", 348 348 + "columnsFrom": [ 349 349 + "workspace_id" 350 350 + ], 351 351 + "columnsTo": [ 352 352 + "id" 353 353 + ], 354 354 + "onDelete": "no action", 355 355 + "onUpdate": "no action" 356 356 + } 357 357 + }, 358 358 + "compositePrimaryKeys": {}, 359 359 + "uniqueConstraints": {} 360 360 + }, 361 361 + "page": { 362 362 + "name": "page", 363 363 + "columns": { 364 364 + "id": { 365 365 + "name": "id", 366 366 + "type": "integer", 367 367 + "primaryKey": true, 368 368 + "notNull": true, 369 369 + "autoincrement": false 370 370 + }, 371 371 + "workspace_id": { 372 372 + "name": "workspace_id", 373 373 + "type": "integer", 374 374 + "primaryKey": false, 375 375 + "notNull": true, 376 376 + "autoincrement": false 377 377 + }, 378 378 + "title": { 379 379 + "name": "title", 380 380 + "type": "text", 381 381 + "primaryKey": false, 382 382 + "notNull": true, 383 383 + "autoincrement": false 384 384 + }, 385 385 + "description": { 386 386 + "name": "description", 387 387 + "type": "text", 388 388 + "primaryKey": false, 389 389 + "notNull": true, 390 390 + "autoincrement": false 391 391 + }, 392 392 + "icon": { 393 393 + "name": "icon", 394 394 + "type": "text(256)", 395 395 + "primaryKey": false, 396 396 + "notNull": false, 397 397 + "autoincrement": false, 398 398 + "default": "''" 399 399 + }, 400 400 + "slug": { 401 401 + "name": "slug", 402 402 + "type": "text(256)", 403 403 + "primaryKey": false, 404 404 + "notNull": true, 405 405 + "autoincrement": false 406 406 + }, 407 407 + "custom_domain": { 408 408 + "name": "custom_domain", 409 409 + "type": "text(256)", 410 410 + "primaryKey": false, 411 411 + "notNull": true, 412 412 + "autoincrement": false 413 413 + }, 414 414 + "published": { 415 415 + "name": "published", 416 416 + "type": "integer", 417 417 + "primaryKey": false, 418 418 + "notNull": false, 419 419 + "autoincrement": false, 420 420 + "default": false 421 421 + }, 422 422 + "created_at": { 423 423 + "name": "created_at", 424 424 + "type": "integer", 425 425 + "primaryKey": false, 426 426 + "notNull": false, 427 427 + "autoincrement": false, 428 428 + "default": "(strftime('%s', 'now'))" 429 429 + }, 430 430 + "updated_at": { 431 431 + "name": "updated_at", 432 432 + "type": "integer", 433 433 + "primaryKey": false, 434 434 + "notNull": false, 435 435 + "autoincrement": false, 436 436 + "default": "(strftime('%s', 'now'))" 437 437 + } 438 438 + }, 439 439 + "indexes": { 440 440 + "page_slug_unique": { 441 441 + "name": "page_slug_unique", 442 442 + "columns": [ 443 443 + "slug" 444 444 + ], 445 445 + "isUnique": true 446 446 + } 447 447 + }, 448 448 + "foreignKeys": { 449 449 + "page_workspace_id_workspace_id_fk": { 450 450 + "name": "page_workspace_id_workspace_id_fk", 451 451 + "tableFrom": "page", 452 452 + "tableTo": "workspace", 453 453 + "columnsFrom": [ 454 454 + "workspace_id" 455 455 + ], 456 456 + "columnsTo": [ 457 457 + "id" 458 458 + ], 459 459 + "onDelete": "cascade", 460 460 + "onUpdate": "no action" 461 461 + } 462 462 + }, 463 463 + "compositePrimaryKeys": {}, 464 464 + "uniqueConstraints": {} 465 465 + }, 466 466 + "monitor": { 467 467 + "name": "monitor", 468 468 + "columns": { 469 469 + "id": { 470 470 + "name": "id", 471 471 + "type": "integer", 472 472 + "primaryKey": true, 473 473 + "notNull": true, 474 474 + "autoincrement": false 475 475 + }, 476 476 + "job_type": { 477 477 + "name": "job_type", 478 478 + "type": "text", 479 479 + "primaryKey": false, 480 480 + "notNull": true, 481 481 + "autoincrement": false, 482 482 + "default": "'other'" 483 483 + }, 484 484 + "periodicity": { 485 485 + "name": "periodicity", 486 486 + "type": "text", 487 487 + "primaryKey": false, 488 488 + "notNull": true, 489 489 + "autoincrement": false, 490 490 + "default": "'other'" 491 491 + }, 492 492 + "status": { 493 493 + "name": "status", 494 494 + "type": "text", 495 495 + "primaryKey": false, 496 496 + "notNull": true, 497 497 + "autoincrement": false, 498 498 + "default": "'active'" 499 499 + }, 500 500 + "active": { 501 501 + "name": "active", 502 502 + "type": "integer", 503 503 + "primaryKey": false, 504 504 + "notNull": false, 505 505 + "autoincrement": false, 506 506 + "default": false 507 507 + }, 508 508 + "regions": { 509 509 + "name": "regions", 510 510 + "type": "text", 511 511 + "primaryKey": false, 512 512 + "notNull": true, 513 513 + "autoincrement": false, 514 514 + "default": "''" 515 515 + }, 516 516 + "url": { 517 517 + "name": "url", 518 518 + "type": "text(2048)", 519 519 + "primaryKey": false, 520 520 + "notNull": true, 521 521 + "autoincrement": false 522 522 + }, 523 523 + "name": { 524 524 + "name": "name", 525 525 + "type": "text(256)", 526 526 + "primaryKey": false, 527 527 + "notNull": true, 528 528 + "autoincrement": false, 529 529 + "default": "''" 530 530 + }, 531 531 + "description": { 532 532 + "name": "description", 533 533 + "type": "text", 534 534 + "primaryKey": false, 535 535 + "notNull": true, 536 536 + "autoincrement": false, 537 537 + "default": "''" 538 538 + }, 539 539 + "headers": { 540 540 + "name": "headers", 541 541 + "type": "text", 542 542 + "primaryKey": false, 543 543 + "notNull": false, 544 544 + "autoincrement": false, 545 545 + "default": "''" 546 546 + }, 547 547 + "body": { 548 548 + "name": "body", 549 549 + "type": "text", 550 550 + "primaryKey": false, 551 551 + "notNull": false, 552 552 + "autoincrement": false, 553 553 + "default": "''" 554 554 + }, 555 555 + "method": { 556 556 + "name": "method", 557 557 + "type": "text", 558 558 + "primaryKey": false, 559 559 + "notNull": false, 560 560 + "autoincrement": false, 561 561 + "default": "'GET'" 562 562 + }, 563 563 + "workspace_id": { 564 564 + "name": "workspace_id", 565 565 + "type": "integer", 566 566 + "primaryKey": false, 567 567 + "notNull": false, 568 568 + "autoincrement": false 569 569 + }, 570 570 + "created_at": { 571 571 + "name": "created_at", 572 572 + "type": "integer", 573 573 + "primaryKey": false, 574 574 + "notNull": false, 575 575 + "autoincrement": false, 576 576 + "default": "(strftime('%s', 'now'))" 577 577 + }, 578 578 + "updated_at": { 579 579 + "name": "updated_at", 580 580 + "type": "integer", 581 581 + "primaryKey": false, 582 582 + "notNull": false, 583 583 + "autoincrement": false, 584 584 + "default": "(strftime('%s', 'now'))" 585 585 + } 586 586 + }, 587 587 + "indexes": {}, 588 588 + "foreignKeys": { 589 589 + "monitor_workspace_id_workspace_id_fk": { 590 590 + "name": "monitor_workspace_id_workspace_id_fk", 591 591 + "tableFrom": "monitor", 592 592 + "tableTo": "workspace", 593 593 + "columnsFrom": [ 594 594 + "workspace_id" 595 595 + ], 596 596 + "columnsTo": [ 597 597 + "id" 598 598 + ], 599 599 + "onDelete": "no action", 600 600 + "onUpdate": "no action" 601 601 + } 602 602 + }, 603 603 + "compositePrimaryKeys": {}, 604 604 + "uniqueConstraints": {} 605 605 + }, 606 606 + "monitors_to_pages": { 607 607 + "name": "monitors_to_pages", 608 608 + "columns": { 609 609 + "monitor_id": { 610 610 + "name": "monitor_id", 611 611 + "type": "integer", 612 612 + "primaryKey": false, 613 613 + "notNull": true, 614 614 + "autoincrement": false 615 615 + }, 616 616 + "page_id": { 617 617 + "name": "page_id", 618 618 + "type": "integer", 619 619 + "primaryKey": false, 620 620 + "notNull": true, 621 621 + "autoincrement": false 622 622 + }, 623 623 + "created_at": { 624 624 + "name": "created_at", 625 625 + "type": "integer", 626 626 + "primaryKey": false, 627 627 + "notNull": false, 628 628 + "autoincrement": false, 629 629 + "default": "(strftime('%s', 'now'))" 630 630 + } 631 631 + }, 632 632 + "indexes": {}, 633 633 + "foreignKeys": { 634 634 + "monitors_to_pages_monitor_id_monitor_id_fk": { 635 635 + "name": "monitors_to_pages_monitor_id_monitor_id_fk", 636 636 + "tableFrom": "monitors_to_pages", 637 637 + "tableTo": "monitor", 638 638 + "columnsFrom": [ 639 639 + "monitor_id" 640 640 + ], 641 641 + "columnsTo": [ 642 642 + "id" 643 643 + ], 644 644 + "onDelete": "cascade", 645 645 + "onUpdate": "no action" 646 646 + }, 647 647 + "monitors_to_pages_page_id_page_id_fk": { 648 648 + "name": "monitors_to_pages_page_id_page_id_fk", 649 649 + "tableFrom": "monitors_to_pages", 650 650 + "tableTo": "page", 651 651 + "columnsFrom": [ 652 652 + "page_id" 653 653 + ], 654 654 + "columnsTo": [ 655 655 + "id" 656 656 + ], 657 657 + "onDelete": "cascade", 658 658 + "onUpdate": "no action" 659 659 + } 660 660 + }, 661 661 + "compositePrimaryKeys": { 662 662 + "monitors_to_pages_monitor_id_page_id_pk": { 663 663 + "columns": [ 664 664 + "monitor_id", 665 665 + "page_id" 666 666 + ], 667 667 + "name": "monitors_to_pages_monitor_id_page_id_pk" 668 668 + } 669 669 + }, 670 670 + "uniqueConstraints": {} 671 671 + }, 672 672 + "user": { 673 673 + "name": "user", 674 674 + "columns": { 675 675 + "id": { 676 676 + "name": "id", 677 677 + "type": "integer", 678 678 + "primaryKey": true, 679 679 + "notNull": true, 680 680 + "autoincrement": false 681 681 + }, 682 682 + "tenant_id": { 683 683 + "name": "tenant_id", 684 684 + "type": "text(256)", 685 685 + "primaryKey": false, 686 686 + "notNull": false, 687 687 + "autoincrement": false 688 688 + }, 689 689 + "first_name": { 690 690 + "name": "first_name", 691 691 + "type": "text", 692 692 + "primaryKey": false, 693 693 + "notNull": false, 694 694 + "autoincrement": false, 695 695 + "default": "''" 696 696 + }, 697 697 + "last_name": { 698 698 + "name": "last_name", 699 699 + "type": "text", 700 700 + "primaryKey": false, 701 701 + "notNull": false, 702 702 + "autoincrement": false, 703 703 + "default": "''" 704 704 + }, 705 705 + "email": { 706 706 + "name": "email", 707 707 + "type": "text", 708 708 + "primaryKey": false, 709 709 + "notNull": false, 710 710 + "autoincrement": false, 711 711 + "default": "''" 712 712 + }, 713 713 + "photo_url": { 714 714 + "name": "photo_url", 715 715 + "type": "text", 716 716 + "primaryKey": false, 717 717 + "notNull": false, 718 718 + "autoincrement": false, 719 719 + "default": "''" 720 720 + }, 721 721 + "created_at": { 722 722 + "name": "created_at", 723 723 + "type": "integer", 724 724 + "primaryKey": false, 725 725 + "notNull": false, 726 726 + "autoincrement": false, 727 727 + "default": "(strftime('%s', 'now'))" 728 728 + }, 729 729 + "updated_at": { 730 730 + "name": "updated_at", 731 731 + "type": "integer", 732 732 + "primaryKey": false, 733 733 + "notNull": false, 734 734 + "autoincrement": false, 735 735 + "default": "(strftime('%s', 'now'))" 736 736 + } 737 737 + }, 738 738 + "indexes": { 739 739 + "user_tenant_id_unique": { 740 740 + "name": "user_tenant_id_unique", 741 741 + "columns": [ 742 742 + "tenant_id" 743 743 + ], 744 744 + "isUnique": true 745 745 + } 746 746 + }, 747 747 + "foreignKeys": {}, 748 748 + "compositePrimaryKeys": {}, 749 749 + "uniqueConstraints": {} 750 750 + }, 751 751 + "users_to_workspaces": { 752 752 + "name": "users_to_workspaces", 753 753 + "columns": { 754 754 + "user_id": { 755 755 + "name": "user_id", 756 756 + "type": "integer", 757 757 + "primaryKey": false, 758 758 + "notNull": true, 759 759 + "autoincrement": false 760 760 + }, 761 761 + "workspace_id": { 762 762 + "name": "workspace_id", 763 763 + "type": "integer", 764 764 + "primaryKey": false, 765 765 + "notNull": true, 766 766 + "autoincrement": false 767 767 + }, 768 768 + "role": { 769 769 + "name": "role", 770 770 + "type": "text", 771 771 + "primaryKey": false, 772 772 + "notNull": true, 773 773 + "autoincrement": false, 774 774 + "default": "'member'" 775 775 + }, 776 776 + "created_at": { 777 777 + "name": "created_at", 778 778 + "type": "integer", 779 779 + "primaryKey": false, 780 780 + "notNull": false, 781 781 + "autoincrement": false, 782 782 + "default": "(strftime('%s', 'now'))" 783 783 + } 784 784 + }, 785 785 + "indexes": {}, 786 786 + "foreignKeys": { 787 787 + "users_to_workspaces_user_id_user_id_fk": { 788 788 + "name": "users_to_workspaces_user_id_user_id_fk", 789 789 + "tableFrom": "users_to_workspaces", 790 790 + "tableTo": "user", 791 791 + "columnsFrom": [ 792 792 + "user_id" 793 793 + ], 794 794 + "columnsTo": [ 795 795 + "id" 796 796 + ], 797 797 + "onDelete": "no action", 798 798 + "onUpdate": "no action" 799 799 + }, 800 800 + "users_to_workspaces_workspace_id_workspace_id_fk": { 801 801 + "name": "users_to_workspaces_workspace_id_workspace_id_fk", 802 802 + "tableFrom": "users_to_workspaces", 803 803 + "tableTo": "workspace", 804 804 + "columnsFrom": [ 805 805 + "workspace_id" 806 806 + ], 807 807 + "columnsTo": [ 808 808 + "id" 809 809 + ], 810 810 + "onDelete": "no action", 811 811 + "onUpdate": "no action" 812 812 + } 813 813 + }, 814 814 + "compositePrimaryKeys": { 815 815 + "users_to_workspaces_user_id_workspace_id_pk": { 816 816 + "columns": [ 817 817 + "user_id", 818 818 + "workspace_id" 819 819 + ], 820 820 + "name": "users_to_workspaces_user_id_workspace_id_pk" 821 821 + } 822 822 + }, 823 823 + "uniqueConstraints": {} 824 824 + }, 825 825 + "page_subscriber": { 826 826 + "name": "page_subscriber", 827 827 + "columns": { 828 828 + "id": { 829 829 + "name": "id", 830 830 + "type": "integer", 831 831 + "primaryKey": true, 832 832 + "notNull": true, 833 833 + "autoincrement": false 834 834 + }, 835 835 + "email": { 836 836 + "name": "email", 837 837 + "type": "text", 838 838 + "primaryKey": false, 839 839 + "notNull": true, 840 840 + "autoincrement": false 841 841 + }, 842 842 + "page_id": { 843 843 + "name": "page_id", 844 844 + "type": "integer", 845 845 + "primaryKey": false, 846 846 + "notNull": true, 847 847 + "autoincrement": false 848 848 + }, 849 849 + "token": { 850 850 + "name": "token", 851 851 + "type": "text", 852 852 + "primaryKey": false, 853 853 + "notNull": false, 854 854 + "autoincrement": false 855 855 + }, 856 856 + "accepted_at": { 857 857 + "name": "accepted_at", 858 858 + "type": "integer", 859 859 + "primaryKey": false, 860 860 + "notNull": false, 861 861 + "autoincrement": false 862 862 + }, 863 863 + "expires_at": { 864 864 + "name": "expires_at", 865 865 + "type": "integer", 866 866 + "primaryKey": false, 867 867 + "notNull": false, 868 868 + "autoincrement": false 869 869 + }, 870 870 + "created_at": { 871 871 + "name": "created_at", 872 872 + "type": "integer", 873 873 + "primaryKey": false, 874 874 + "notNull": false, 875 875 + "autoincrement": false, 876 876 + "default": "(strftime('%s', 'now'))" 877 877 + }, 878 878 + "updated_at": { 879 879 + "name": "updated_at", 880 880 + "type": "integer", 881 881 + "primaryKey": false, 882 882 + "notNull": false, 883 883 + "autoincrement": false, 884 884 + "default": "(strftime('%s', 'now'))" 885 885 + } 886 886 + }, 887 887 + "indexes": {}, 888 888 + "foreignKeys": { 889 889 + "page_subscriber_page_id_page_id_fk": { 890 890 + "name": "page_subscriber_page_id_page_id_fk", 891 891 + "tableFrom": "page_subscriber", 892 892 + "tableTo": "page", 893 893 + "columnsFrom": [ 894 894 + "page_id" 895 895 + ], 896 896 + "columnsTo": [ 897 897 + "id" 898 898 + ], 899 899 + "onDelete": "no action", 900 900 + "onUpdate": "no action" 901 901 + } 902 902 + }, 903 903 + "compositePrimaryKeys": {}, 904 904 + "uniqueConstraints": {} 905 905 + }, 906 906 + "workspace": { 907 907 + "name": "workspace", 908 908 + "columns": { 909 909 + "id": { 910 910 + "name": "id", 911 911 + "type": "integer", 912 912 + "primaryKey": true, 913 913 + "notNull": true, 914 914 + "autoincrement": false 915 915 + }, 916 916 + "slug": { 917 917 + "name": "slug", 918 918 + "type": "text", 919 919 + "primaryKey": false, 920 920 + "notNull": true, 921 921 + "autoincrement": false 922 922 + }, 923 923 + "name": { 924 924 + "name": "name", 925 925 + "type": "text", 926 926 + "primaryKey": false, 927 927 + "notNull": false, 928 928 + "autoincrement": false 929 929 + }, 930 930 + "stripe_id": { 931 931 + "name": "stripe_id", 932 932 + "type": "text(256)", 933 933 + "primaryKey": false, 934 934 + "notNull": false, 935 935 + "autoincrement": false 936 936 + }, 937 937 + "subscription_id": { 938 938 + "name": "subscription_id", 939 939 + "type": "text", 940 940 + "primaryKey": false, 941 941 + "notNull": false, 942 942 + "autoincrement": false 943 943 + }, 944 944 + "plan": { 945 945 + "name": "plan", 946 946 + "type": "text", 947 947 + "primaryKey": false, 948 948 + "notNull": false, 949 949 + "autoincrement": false 950 950 + }, 951 951 + "ends_at": { 952 952 + "name": "ends_at", 953 953 + "type": "integer", 954 954 + "primaryKey": false, 955 955 + "notNull": false, 956 956 + "autoincrement": false 957 957 + }, 958 958 + "paid_until": { 959 959 + "name": "paid_until", 960 960 + "type": "integer", 961 961 + "primaryKey": false, 962 962 + "notNull": false, 963 963 + "autoincrement": false 964 964 + }, 965 965 + "created_at": { 966 966 + "name": "created_at", 967 967 + "type": "integer", 968 968 + "primaryKey": false, 969 969 + "notNull": false, 970 970 + "autoincrement": false, 971 971 + "default": "(strftime('%s', 'now'))" 972 972 + }, 973 973 + "updated_at": { 974 974 + "name": "updated_at", 975 975 + "type": "integer", 976 976 + "primaryKey": false, 977 977 + "notNull": false, 978 978 + "autoincrement": false, 979 979 + "default": "(strftime('%s', 'now'))" 980 980 + } 981 981 + }, 982 982 + "indexes": { 983 983 + "workspace_slug_unique": { 984 984 + "name": "workspace_slug_unique", 985 985 + "columns": [ 986 986 + "slug" 987 987 + ], 988 988 + "isUnique": true 989 989 + }, 990 990 + "workspace_stripe_id_unique": { 991 991 + "name": "workspace_stripe_id_unique", 992 992 + "columns": [ 993 993 + "stripe_id" 994 994 + ], 995 995 + "isUnique": true 996 996 + } 997 997 + }, 998 998 + "foreignKeys": {}, 999 999 + "compositePrimaryKeys": {}, 1000 1000 + "uniqueConstraints": {} 1001 1001 + }, 1002 1002 + "notification": { 1003 1003 + "name": "notification", 1004 1004 + "columns": { 1005 1005 + "id": { 1006 1006 + "name": "id", 1007 1007 + "type": "integer", 1008 1008 + "primaryKey": true, 1009 1009 + "notNull": true, 1010 1010 + "autoincrement": false 1011 1011 + }, 1012 1012 + "name": { 1013 1013 + "name": "name", 1014 1014 + "type": "text", 1015 1015 + "primaryKey": false, 1016 1016 + "notNull": true, 1017 1017 + "autoincrement": false 1018 1018 + }, 1019 1019 + "provider": { 1020 1020 + "name": "provider", 1021 1021 + "type": "text", 1022 1022 + "primaryKey": false, 1023 1023 + "notNull": true, 1024 1024 + "autoincrement": false 1025 1025 + }, 1026 1026 + "data": { 1027 1027 + "name": "data", 1028 1028 + "type": "text", 1029 1029 + "primaryKey": false, 1030 1030 + "notNull": false, 1031 1031 + "autoincrement": false, 1032 1032 + "default": "'{}'" 1033 1033 + }, 1034 1034 + "workspace_id": { 1035 1035 + "name": "workspace_id", 1036 1036 + "type": "integer", 1037 1037 + "primaryKey": false, 1038 1038 + "notNull": false, 1039 1039 + "autoincrement": false 1040 1040 + }, 1041 1041 + "created_at": { 1042 1042 + "name": "created_at", 1043 1043 + "type": "integer", 1044 1044 + "primaryKey": false, 1045 1045 + "notNull": false, 1046 1046 + "autoincrement": false, 1047 1047 + "default": "(strftime('%s', 'now'))" 1048 1048 + }, 1049 1049 + "updated_at": { 1050 1050 + "name": "updated_at", 1051 1051 + "type": "integer", 1052 1052 + "primaryKey": false, 1053 1053 + "notNull": false, 1054 1054 + "autoincrement": false, 1055 1055 + "default": "(strftime('%s', 'now'))" 1056 1056 + } 1057 1057 + }, 1058 1058 + "indexes": {}, 1059 1059 + "foreignKeys": { 1060 1060 + "notification_workspace_id_workspace_id_fk": { 1061 1061 + "name": "notification_workspace_id_workspace_id_fk", 1062 1062 + "tableFrom": "notification", 1063 1063 + "tableTo": "workspace", 1064 1064 + "columnsFrom": [ 1065 1065 + "workspace_id" 1066 1066 + ], 1067 1067 + "columnsTo": [ 1068 1068 + "id" 1069 1069 + ], 1070 1070 + "onDelete": "no action", 1071 1071 + "onUpdate": "no action" 1072 1072 + } 1073 1073 + }, 1074 1074 + "compositePrimaryKeys": {}, 1075 1075 + "uniqueConstraints": {} 1076 1076 + }, 1077 1077 + "notifications_to_monitors": { 1078 1078 + "name": "notifications_to_monitors", 1079 1079 + "columns": { 1080 1080 + "monitor_id": { 1081 1081 + "name": "monitor_id", 1082 1082 + "type": "integer", 1083 1083 + "primaryKey": false, 1084 1084 + "notNull": true, 1085 1085 + "autoincrement": false 1086 1086 + }, 1087 1087 + "notification_id": { 1088 1088 + "name": "notification_id", 1089 1089 + "type": "integer", 1090 1090 + "primaryKey": false, 1091 1091 + "notNull": true, 1092 1092 + "autoincrement": false 1093 1093 + }, 1094 1094 + "created_at": { 1095 1095 + "name": "created_at", 1096 1096 + "type": "integer", 1097 1097 + "primaryKey": false, 1098 1098 + "notNull": false, 1099 1099 + "autoincrement": false, 1100 1100 + "default": "(strftime('%s', 'now'))" 1101 1101 + } 1102 1102 + }, 1103 1103 + "indexes": {}, 1104 1104 + "foreignKeys": { 1105 1105 + "notifications_to_monitors_monitor_id_monitor_id_fk": { 1106 1106 + "name": "notifications_to_monitors_monitor_id_monitor_id_fk", 1107 1107 + "tableFrom": "notifications_to_monitors", 1108 1108 + "tableTo": "monitor", 1109 1109 + "columnsFrom": [ 1110 1110 + "monitor_id" 1111 1111 + ], 1112 1112 + "columnsTo": [ 1113 1113 + "id" 1114 1114 + ], 1115 1115 + "onDelete": "cascade", 1116 1116 + "onUpdate": "no action" 1117 1117 + }, 1118 1118 + "notifications_to_monitors_notification_id_notification_id_fk": { 1119 1119 + "name": "notifications_to_monitors_notification_id_notification_id_fk", 1120 1120 + "tableFrom": "notifications_to_monitors", 1121 1121 + "tableTo": "notification", 1122 1122 + "columnsFrom": [ 1123 1123 + "notification_id" 1124 1124 + ], 1125 1125 + "columnsTo": [ 1126 1126 + "id" 1127 1127 + ], 1128 1128 + "onDelete": "cascade", 1129 1129 + "onUpdate": "no action" 1130 1130 + } 1131 1131 + }, 1132 1132 + "compositePrimaryKeys": { 1133 1133 + "notifications_to_monitors_monitor_id_notification_id_pk": { 1134 1134 + "columns": [ 1135 1135 + "monitor_id", 1136 1136 + "notification_id" 1137 1137 + ], 1138 1138 + "name": "notifications_to_monitors_monitor_id_notification_id_pk" 1139 1139 + } 1140 1140 + }, 1141 1141 + "uniqueConstraints": {} 1142 1142 + }, 1143 1143 + "monitor_status": { 1144 1144 + "name": "monitor_status", 1145 1145 + "columns": { 1146 1146 + "monitor_id": { 1147 1147 + "name": "monitor_id", 1148 1148 + "type": "integer", 1149 1149 + "primaryKey": false, 1150 1150 + "notNull": true, 1151 1151 + "autoincrement": false 1152 1152 + }, 1153 1153 + "region": { 1154 1154 + "name": "region", 1155 1155 + "type": "text", 1156 1156 + "primaryKey": false, 1157 1157 + "notNull": true, 1158 1158 + "autoincrement": false, 1159 1159 + "default": "''" 1160 1160 + }, 1161 1161 + "status": { 1162 1162 + "name": "status", 1163 1163 + "type": "text", 1164 1164 + "primaryKey": false, 1165 1165 + "notNull": true, 1166 1166 + "autoincrement": false, 1167 1167 + "default": "'active'" 1168 1168 + }, 1169 1169 + "created_at": { 1170 1170 + "name": "created_at", 1171 1171 + "type": "integer", 1172 1172 + "primaryKey": false, 1173 1173 + "notNull": false, 1174 1174 + "autoincrement": false, 1175 1175 + "default": "(strftime('%s', 'now'))" 1176 1176 + }, 1177 1177 + "updated_at": { 1178 1178 + "name": "updated_at", 1179 1179 + "type": "integer", 1180 1180 + "primaryKey": false, 1181 1181 + "notNull": false, 1182 1182 + "autoincrement": false, 1183 1183 + "default": "(strftime('%s', 'now'))" 1184 1184 + } 1185 1185 + }, 1186 1186 + "indexes": { 1187 1187 + "monitor_status_idx": { 1188 1188 + "name": "monitor_status_idx", 1189 1189 + "columns": [ 1190 1190 + "monitor_id", 1191 1191 + "region" 1192 1192 + ], 1193 1193 + "isUnique": false 1194 1194 + } 1195 1195 + }, 1196 1196 + "foreignKeys": { 1197 1197 + "monitor_status_monitor_id_monitor_id_fk": { 1198 1198 + "name": "monitor_status_monitor_id_monitor_id_fk", 1199 1199 + "tableFrom": "monitor_status", 1200 1200 + "tableTo": "monitor", 1201 1201 + "columnsFrom": [ 1202 1202 + "monitor_id" 1203 1203 + ], 1204 1204 + "columnsTo": [ 1205 1205 + "id" 1206 1206 + ], 1207 1207 + "onDelete": "cascade", 1208 1208 + "onUpdate": "no action" 1209 1209 + } 1210 1210 + }, 1211 1211 + "compositePrimaryKeys": { 1212 1212 + "monitor_status_monitor_id_region_pk": { 1213 1213 + "columns": [ 1214 1214 + "monitor_id", 1215 1215 + "region" 1216 1216 + ], 1217 1217 + "name": "monitor_status_monitor_id_region_pk" 1218 1218 + } 1219 1219 + }, 1220 1220 + "uniqueConstraints": {} 1221 1221 + }, 1222 1222 + "invitation": { 1223 1223 + "name": "invitation", 1224 1224 + "columns": { 1225 1225 + "id": { 1226 1226 + "name": "id", 1227 1227 + "type": "integer", 1228 1228 + "primaryKey": true, 1229 1229 + "notNull": true, 1230 1230 + "autoincrement": false 1231 1231 + }, 1232 1232 + "email": { 1233 1233 + "name": "email", 1234 1234 + "type": "text", 1235 1235 + "primaryKey": false, 1236 1236 + "notNull": true, 1237 1237 + "autoincrement": false 1238 1238 + }, 1239 1239 + "role": { 1240 1240 + "name": "role", 1241 1241 + "type": "text", 1242 1242 + "primaryKey": false, 1243 1243 + "notNull": true, 1244 1244 + "autoincrement": false, 1245 1245 + "default": "'member'" 1246 1246 + }, 1247 1247 + "workspace_id": { 1248 1248 + "name": "workspace_id", 1249 1249 + "type": "integer", 1250 1250 + "primaryKey": false, 1251 1251 + "notNull": true, 1252 1252 + "autoincrement": false 1253 1253 + }, 1254 1254 + "token": { 1255 1255 + "name": "token", 1256 1256 + "type": "text", 1257 1257 + "primaryKey": false, 1258 1258 + "notNull": true, 1259 1259 + "autoincrement": false 1260 1260 + }, 1261 1261 + "expires_at": { 1262 1262 + "name": "expires_at", 1263 1263 + "type": "integer", 1264 1264 + "primaryKey": false, 1265 1265 + "notNull": true, 1266 1266 + "autoincrement": false 1267 1267 + }, 1268 1268 + "created_at": { 1269 1269 + "name": "created_at", 1270 1270 + "type": "integer", 1271 1271 + "primaryKey": false, 1272 1272 + "notNull": false, 1273 1273 + "autoincrement": false, 1274 1274 + "default": "(strftime('%s', 'now'))" 1275 1275 + }, 1276 1276 + "accepted_at": { 1277 1277 + "name": "accepted_at", 1278 1278 + "type": "integer", 1279 1279 + "primaryKey": false, 1280 1280 + "notNull": false, 1281 1281 + "autoincrement": false 1282 1282 + } 1283 1283 + }, 1284 1284 + "indexes": {}, 1285 1285 + "foreignKeys": {}, 1286 1286 + "compositePrimaryKeys": {}, 1287 1287 + "uniqueConstraints": {} 1288 1288 + }, 1289 1289 + "incident": { 1290 1290 + "name": "incident", 1291 1291 + "columns": { 1292 1292 + "id": { 1293 1293 + "name": "id", 1294 1294 + "type": "integer", 1295 1295 + "primaryKey": true, 1296 1296 + "notNull": true, 1297 1297 + "autoincrement": false 1298 1298 + }, 1299 1299 + "title": { 1300 1300 + "name": "title", 1301 1301 + "type": "text", 1302 1302 + "primaryKey": false, 1303 1303 + "notNull": true, 1304 1304 + "autoincrement": false, 1305 1305 + "default": "''" 1306 1306 + }, 1307 1307 + "summary": { 1308 1308 + "name": "summary", 1309 1309 + "type": "text", 1310 1310 + "primaryKey": false, 1311 1311 + "notNull": true, 1312 1312 + "autoincrement": false, 1313 1313 + "default": "''" 1314 1314 + }, 1315 1315 + "status": { 1316 1316 + "name": "status", 1317 1317 + "type": "text", 1318 1318 + "primaryKey": false, 1319 1319 + "notNull": true, 1320 1320 + "autoincrement": false, 1321 1321 + "default": "'triage'" 1322 1322 + }, 1323 1323 + "monitor_id": { 1324 1324 + "name": "monitor_id", 1325 1325 + "type": "integer", 1326 1326 + "primaryKey": false, 1327 1327 + "notNull": false, 1328 1328 + "autoincrement": false 1329 1329 + }, 1330 1330 + "workspace_id": { 1331 1331 + "name": "workspace_id", 1332 1332 + "type": "integer", 1333 1333 + "primaryKey": false, 1334 1334 + "notNull": false, 1335 1335 + "autoincrement": false 1336 1336 + }, 1337 1337 + "started_at": { 1338 1338 + "name": "started_at", 1339 1339 + "type": "integer", 1340 1340 + "primaryKey": false, 1341 1341 + "notNull": true, 1342 1342 + "autoincrement": false, 1343 1343 + "default": "(strftime('%s', 'now'))" 1344 1344 + }, 1345 1345 + "acknowledged_at": { 1346 1346 + "name": "acknowledged_at", 1347 1347 + "type": "integer", 1348 1348 + "primaryKey": false, 1349 1349 + "notNull": false, 1350 1350 + "autoincrement": false 1351 1351 + }, 1352 1352 + "acknowledged_by": { 1353 1353 + "name": "acknowledged_by", 1354 1354 + "type": "integer", 1355 1355 + "primaryKey": false, 1356 1356 + "notNull": false, 1357 1357 + "autoincrement": false 1358 1358 + }, 1359 1359 + "resolved_at": { 1360 1360 + "name": "resolved_at", 1361 1361 + "type": "integer", 1362 1362 + "primaryKey": false, 1363 1363 + "notNull": false, 1364 1364 + "autoincrement": false 1365 1365 + }, 1366 1366 + "resolved_by": { 1367 1367 + "name": "resolved_by", 1368 1368 + "type": "integer", 1369 1369 + "primaryKey": false, 1370 1370 + "notNull": false, 1371 1371 + "autoincrement": false 1372 1372 + }, 1373 1373 + "auto_resolved": { 1374 1374 + "name": "auto_resolved", 1375 1375 + "type": "integer", 1376 1376 + "primaryKey": false, 1377 1377 + "notNull": false, 1378 1378 + "autoincrement": false, 1379 1379 + "default": false 1380 1380 + }, 1381 1381 + "created_at": { 1382 1382 + "name": "created_at", 1383 1383 + "type": "integer", 1384 1384 + "primaryKey": false, 1385 1385 + "notNull": false, 1386 1386 + "autoincrement": false, 1387 1387 + "default": "(strftime('%s', 'now'))" 1388 1388 + }, 1389 1389 + "updated_at": { 1390 1390 + "name": "updated_at", 1391 1391 + "type": "integer", 1392 1392 + "primaryKey": false, 1393 1393 + "notNull": false, 1394 1394 + "autoincrement": false, 1395 1395 + "default": "(strftime('%s', 'now'))" 1396 1396 + } 1397 1397 + }, 1398 1398 + "indexes": { 1399 1399 + "incident_monitor_id_started_at_unique": { 1400 1400 + "name": "incident_monitor_id_started_at_unique", 1401 1401 + "columns": [ 1402 1402 + "monitor_id", 1403 1403 + "started_at" 1404 1404 + ], 1405 1405 + "isUnique": true 1406 1406 + } 1407 1407 + }, 1408 1408 + "foreignKeys": { 1409 1409 + "incident_monitor_id_monitor_id_fk": { 1410 1410 + "name": "incident_monitor_id_monitor_id_fk", 1411 1411 + "tableFrom": "incident", 1412 1412 + "tableTo": "monitor", 1413 1413 + "columnsFrom": [ 1414 1414 + "monitor_id" 1415 1415 + ], 1416 1416 + "columnsTo": [ 1417 1417 + "id" 1418 1418 + ], 1419 1419 + "onDelete": "set default", 1420 1420 + "onUpdate": "no action" 1421 1421 + }, 1422 1422 + "incident_workspace_id_workspace_id_fk": { 1423 1423 + "name": "incident_workspace_id_workspace_id_fk", 1424 1424 + "tableFrom": "incident", 1425 1425 + "tableTo": "workspace", 1426 1426 + "columnsFrom": [ 1427 1427 + "workspace_id" 1428 1428 + ], 1429 1429 + "columnsTo": [ 1430 1430 + "id" 1431 1431 + ], 1432 1432 + "onDelete": "no action", 1433 1433 + "onUpdate": "no action" 1434 1434 + }, 1435 1435 + "incident_acknowledged_by_user_id_fk": { 1436 1436 + "name": "incident_acknowledged_by_user_id_fk", 1437 1437 + "tableFrom": "incident", 1438 1438 + "tableTo": "user", 1439 1439 + "columnsFrom": [ 1440 1440 + "acknowledged_by" 1441 1441 + ], 1442 1442 + "columnsTo": [ 1443 1443 + "id" 1444 1444 + ], 1445 1445 + "onDelete": "no action", 1446 1446 + "onUpdate": "no action" 1447 1447 + }, 1448 1448 + "incident_resolved_by_user_id_fk": { 1449 1449 + "name": "incident_resolved_by_user_id_fk", 1450 1450 + "tableFrom": "incident", 1451 1451 + "tableTo": "user", 1452 1452 + "columnsFrom": [ 1453 1453 + "resolved_by" 1454 1454 + ], 1455 1455 + "columnsTo": [ 1456 1456 + "id" 1457 1457 + ], 1458 1458 + "onDelete": "no action", 1459 1459 + "onUpdate": "no action" 1460 1460 + } 1461 1461 + }, 1462 1462 + "compositePrimaryKeys": {}, 1463 1463 + "uniqueConstraints": {} 1464 1464 + }, 1465 1465 + "monitor_tag": { 1466 1466 + "name": "monitor_tag", 1467 1467 + "columns": { 1468 1468 + "id": { 1469 1469 + "name": "id", 1470 1470 + "type": "integer", 1471 1471 + "primaryKey": true, 1472 1472 + "notNull": true, 1473 1473 + "autoincrement": false 1474 1474 + }, 1475 1475 + "workspace_id": { 1476 1476 + "name": "workspace_id", 1477 1477 + "type": "integer", 1478 1478 + "primaryKey": false, 1479 1479 + "notNull": true, 1480 1480 + "autoincrement": false 1481 1481 + }, 1482 1482 + "name": { 1483 1483 + "name": "name", 1484 1484 + "type": "text", 1485 1485 + "primaryKey": false, 1486 1486 + "notNull": true, 1487 1487 + "autoincrement": false 1488 1488 + }, 1489 1489 + "color": { 1490 1490 + "name": "color", 1491 1491 + "type": "text", 1492 1492 + "primaryKey": false, 1493 1493 + "notNull": true, 1494 1494 + "autoincrement": false 1495 1495 + }, 1496 1496 + "created_at": { 1497 1497 + "name": "created_at", 1498 1498 + "type": "integer", 1499 1499 + "primaryKey": false, 1500 1500 + "notNull": false, 1501 1501 + "autoincrement": false, 1502 1502 + "default": "(strftime('%s', 'now'))" 1503 1503 + }, 1504 1504 + "updated_at": { 1505 1505 + "name": "updated_at", 1506 1506 + "type": "integer", 1507 1507 + "primaryKey": false, 1508 1508 + "notNull": false, 1509 1509 + "autoincrement": false, 1510 1510 + "default": "(strftime('%s', 'now'))" 1511 1511 + } 1512 1512 + }, 1513 1513 + "indexes": {}, 1514 1514 + "foreignKeys": { 1515 1515 + "monitor_tag_workspace_id_workspace_id_fk": { 1516 1516 + "name": "monitor_tag_workspace_id_workspace_id_fk", 1517 1517 + "tableFrom": "monitor_tag", 1518 1518 + "tableTo": "workspace", 1519 1519 + "columnsFrom": [ 1520 1520 + "workspace_id" 1521 1521 + ], 1522 1522 + "columnsTo": [ 1523 1523 + "id" 1524 1524 + ], 1525 1525 + "onDelete": "cascade", 1526 1526 + "onUpdate": "no action" 1527 1527 + } 1528 1528 + }, 1529 1529 + "compositePrimaryKeys": {}, 1530 1530 + "uniqueConstraints": {} 1531 1531 + }, 1532 1532 + "monitor_tag_to_monitor": { 1533 1533 + "name": "monitor_tag_to_monitor", 1534 1534 + "columns": { 1535 1535 + "monitor_id": { 1536 1536 + "name": "monitor_id", 1537 1537 + "type": "integer", 1538 1538 + "primaryKey": false, 1539 1539 + "notNull": true, 1540 1540 + "autoincrement": false 1541 1541 + }, 1542 1542 + "monitor_tag_id": { 1543 1543 + "name": "monitor_tag_id", 1544 1544 + "type": "integer", 1545 1545 + "primaryKey": false, 1546 1546 + "notNull": true, 1547 1547 + "autoincrement": false 1548 1548 + }, 1549 1549 + "created_at": { 1550 1550 + "name": "created_at", 1551 1551 + "type": "integer", 1552 1552 + "primaryKey": false, 1553 1553 + "notNull": false, 1554 1554 + "autoincrement": false, 1555 1555 + "default": "(strftime('%s', 'now'))" 1556 1556 + } 1557 1557 + }, 1558 1558 + "indexes": {}, 1559 1559 + "foreignKeys": { 1560 1560 + "monitor_tag_to_monitor_monitor_id_monitor_id_fk": { 1561 1561 + "name": "monitor_tag_to_monitor_monitor_id_monitor_id_fk", 1562 1562 + "tableFrom": "monitor_tag_to_monitor", 1563 1563 + "tableTo": "monitor", 1564 1564 + "columnsFrom": [ 1565 1565 + "monitor_id" 1566 1566 + ], 1567 1567 + "columnsTo": [ 1568 1568 + "id" 1569 1569 + ], 1570 1570 + "onDelete": "cascade", 1571 1571 + "onUpdate": "no action" 1572 1572 + }, 1573 1573 + "monitor_tag_to_monitor_monitor_tag_id_monitor_tag_id_fk": { 1574 1574 + "name": "monitor_tag_to_monitor_monitor_tag_id_monitor_tag_id_fk", 1575 1575 + "tableFrom": "monitor_tag_to_monitor", 1576 1576 + "tableTo": "monitor_tag", 1577 1577 + "columnsFrom": [ 1578 1578 + "monitor_tag_id" 1579 1579 + ], 1580 1580 + "columnsTo": [ 1581 1581 + "id" 1582 1582 + ], 1583 1583 + "onDelete": "cascade", 1584 1584 + "onUpdate": "no action" 1585 1585 + } 1586 1586 + }, 1587 1587 + "compositePrimaryKeys": { 1588 1588 + "monitor_tag_to_monitor_monitor_id_monitor_tag_id_pk": { 1589 1589 + "columns": [ 1590 1590 + "monitor_id", 1591 1591 + "monitor_tag_id" 1592 1592 + ], 1593 1593 + "name": "monitor_tag_to_monitor_monitor_id_monitor_tag_id_pk" 1594 1594 + } 1595 1595 + }, 1596 1596 + "uniqueConstraints": {} 1597 1597 + } 1598 1598 + }, 1599 1599 + "enums": {}, 1600 1600 + "_meta": { 1601 1601 + "schemas": {}, 1602 1602 + "tables": {}, 1603 1603 + "columns": {} 1604 1604 + } 1605 1605 + }

+7

packages/db/drizzle/meta/_journal.json

··· 148 148 "when": 1707905605592, 149 149 "tag": "0020_flat_bedlam", 150 150 "breakpoints": true 151 151 + }, 152 152 + { 153 153 + "idx": 21, 154 154 + "version": "5", 155 155 + "when": 1710677383007, 156 156 + "tag": "0021_reflective_nico_minoru", 157 157 + "breakpoints": true 151 158 } 152 159 ] 153 160 }

+1

packages/db/src/schema/index.ts

··· 10 10 export * from "./monitor_status"; 11 11 export * from "./invitations"; 12 12 export * from "./incidents"; 13 13 + export * from "./monitor_tags";

+2

packages/db/src/schema/monitor_tags/index.ts

··· 1 1 + export * from "./monitor_tag"; 2 2 + export * from "./validation";

+67

packages/db/src/schema/monitor_tags/monitor_tag.ts

··· 1 1 + import { relations, sql } from "drizzle-orm"; 2 2 + import { 3 3 + integer, 4 4 + primaryKey, 5 5 + sqliteTable, 6 6 + text, 7 7 + } from "drizzle-orm/sqlite-core"; 8 8 + 9 9 + import { monitor } from "../monitors"; 10 10 + import { workspace } from "../workspaces"; 11 11 + 12 12 + export const monitorTag = sqliteTable("monitor_tag", { 13 13 + id: integer("id").primaryKey(), 14 14 + workspaceId: integer("workspace_id") 15 15 + .references(() => workspace.id, { onDelete: "cascade" }) 16 16 + .notNull(), 17 17 + 18 18 + name: text("name").notNull(), 19 19 + color: text("color").notNull(), 20 20 + 21 21 + createdAt: integer("created_at", { mode: "timestamp" }).default( 22 22 + sql`(strftime('%s', 'now'))`, 23 23 + ), 24 24 + updatedAt: integer("updated_at", { mode: "timestamp" }).default( 25 25 + sql`(strftime('%s', 'now'))`, 26 26 + ), 27 27 + }); 28 28 + 29 29 + export const monitorTagsToMonitors = sqliteTable( 30 30 + "monitor_tag_to_monitor", 31 31 + { 32 32 + monitorId: integer("monitor_id") 33 33 + .notNull() 34 34 + .references(() => monitor.id, { onDelete: "cascade" }), 35 35 + monitorTagId: integer("monitor_tag_id") 36 36 + .notNull() 37 37 + .references(() => monitorTag.id, { onDelete: "cascade" }), 38 38 + createdAt: integer("created_at", { mode: "timestamp" }).default( 39 39 + sql`(strftime('%s', 'now'))`, 40 40 + ), 41 41 + }, 42 42 + (t) => ({ 43 43 + pk: primaryKey(t.monitorId, t.monitorTagId), 44 44 + }), 45 45 + ); 46 46 + 47 47 + export const monitorTagsToMonitorsRelation = relations( 48 48 + monitorTagsToMonitors, 49 49 + ({ one }) => ({ 50 50 + monitor: one(monitor, { 51 51 + fields: [monitorTagsToMonitors.monitorId], 52 52 + references: [monitor.id], 53 53 + }), 54 54 + monitorTag: one(monitorTag, { 55 55 + fields: [monitorTagsToMonitors.monitorTagId], 56 56 + references: [monitorTag.id], 57 57 + }), 58 58 + }), 59 59 + ); 60 60 + 61 61 + export const monitorTagRelations = relations(monitorTag, ({ one, many }) => ({ 62 62 + monitor: many(monitorTagsToMonitors), 63 63 + workspace: one(workspace, { 64 64 + fields: [monitorTag.workspaceId], 65 65 + references: [workspace.id], 66 66 + }), 67 67 + }));

+11

packages/db/src/schema/monitor_tags/validation.ts

··· 1 1 + import { createInsertSchema, createSelectSchema } from "drizzle-zod"; 2 2 + import type { z } from "zod"; 3 3 + 4 4 + import { monitorTag } from "./monitor_tag"; 5 5 + 6 6 + export const selectMonitorTagSchema = createSelectSchema(monitorTag); 7 7 + 8 8 + export const insertMonitorTagSchema = createInsertSchema(monitorTag); 9 9 + 10 10 + export type InsertMonitorTag = z.infer<typeof insertMonitorTagSchema>; 11 11 + export type MonitorTag = z.infer<typeof selectMonitorTagSchema>;

+2

packages/db/src/schema/monitors/monitor.ts

··· 6 6 text, 7 7 } from "drizzle-orm/sqlite-core"; 8 8 9 9 + import { monitorTagsToMonitors } from "../monitor_tags"; 9 10 import { notificationsToMonitors } from "../notifications"; 10 11 import { page } from "../pages"; 11 12 import { monitorsToStatusReport } from "../status_reports"; ··· 51 52 export const monitorRelation = relations(monitor, ({ one, many }) => ({ 52 53 monitorsToPages: many(monitorsToPages), 53 54 monitorsToStatusReports: many(monitorsToStatusReport), 55 55 + monitorTagsToMonitors: many(monitorTagsToMonitors), 54 56 workspace: one(workspace, { 55 57 fields: [monitor.workspaceId], 56 58 references: [workspace.id],

+1

packages/db/src/schema/monitors/validation.ts

··· 72 72 notifications: z.array(z.number()).optional().default([]), 73 73 pages: z.array(z.number()).optional().default([]), 74 74 body: z.string().default("").optional(), 75 75 + tags: z.array(z.number()).optional().default([]), 75 76 }); 76 77 77 78 export type InsertMonitor = z.infer<typeof insertMonitorSchema>;

+7 -3

packages/tinybird/src/os-client.ts

··· 3 3 4 4 import { flyRegions } from "@openstatus/utils"; 5 5 6 6 - const MIN_CACHE = 60; // 60s 7 7 - const DEFAULT_CACHE = 120; // 2min 8 8 - const MAX_CACHE = 86400; // 1d 6 6 + const isProd = process.env.NODE_ENV === "production"; 7 7 + 8 8 + const DEV_CACHE = 3_600; // 1h 9 9 + 10 10 + const MIN_CACHE = isProd ? 60 : DEV_CACHE; // 60s 11 11 + const DEFAULT_CACHE = isProd ? 120 : DEV_CACHE; // 2min 12 12 + const MAX_CACHE = 86_400; // 1d 9 13 10 14 export const latencySchema = z.object({ 11 15 p50Latency: z.number().int().nullable(),

+2 -2

packages/ui/package.json

··· 23 23 "@radix-ui/react-alert-dialog": "1.0.5", 24 24 "@radix-ui/react-avatar": "1.0.4", 25 25 "@radix-ui/react-checkbox": "1.0.4", 26 26 - "@radix-ui/react-collapsible": "^1.0.3", 26 26 + "@radix-ui/react-collapsible": "1.0.3", 27 27 "@radix-ui/react-context-menu": "2.1.5", 28 28 "@radix-ui/react-dialog": "1.0.4", 29 29 "@radix-ui/react-dropdown-menu": "2.0.6", ··· 37 37 "@radix-ui/react-slot": "1.0.2", 38 38 "@radix-ui/react-switch": "1.0.3", 39 39 "@radix-ui/react-tabs": "1.0.4", 40 40 - "@radix-ui/react-toggle": "^1.0.3", 40 40 + "@radix-ui/react-toggle": "1.0.3", 41 41 "@radix-ui/react-tooltip": "1.0.7", 42 42 "class-variance-authority": "0.7.0", 43 43 "clsx": "2.0.0",

+2 -2

pnpm-lock.yaml

··· 805 805 specifier: 1.0.4 806 806 version: 1.0.4(@types/react-dom@18.2.21)(@types/react@18.2.64)(react-dom@18.2.0)(react@18.2.0) 807 807 '@radix-ui/react-collapsible': 808 808 - specifier: ^1.0.3 808 808 + specifier: 1.0.3 809 809 version: 1.0.3(@types/react-dom@18.2.21)(@types/react@18.2.64)(react-dom@18.2.0)(react@18.2.0) 810 810 '@radix-ui/react-context-menu': 811 811 specifier: 2.1.5 ··· 847 847 specifier: 1.0.4 848 848 version: 1.0.4(@types/react-dom@18.2.21)(@types/react@18.2.64)(react-dom@18.2.0)(react@18.2.0) 849 849 '@radix-ui/react-toggle': 850 850 - specifier: ^1.0.3 850 850 + specifier: 1.0.3 851 851 version: 1.0.3(@types/react-dom@18.2.21)(@types/react@18.2.64)(react-dom@18.2.0)(react@18.2.0) 852 852 '@radix-ui/react-tooltip': 853 853 specifier: 1.0.7