Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
Refactor: replace legacy InputWithAddons with InputGroup (#2349)
Niranjan Kumarba11394e48a5
diff --git a/apps/dashboard/src/components/common/input-with-addons.tsx b/apps/dashboard/src/components/common/input-with-addons.tsxdeleted file mode 100644index 5719a5806..000000000--- a/apps/dashboard/src/components/common/input-with-addons.tsx+++ /dev/null@@ -1,46 +0,0 @@-import { Input } from "@openstatus/ui/components/ui/input";-import { cn } from "@openstatus/ui/lib/utils";-import * as React from "react";--export interface InputWithAddonsProps extends React.InputHTMLAttributes<HTMLInputElement> {- leading?: React.ReactNode;- trailing?: React.ReactNode;-}--// "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",-// "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",-// "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",--const InputWithAddons = React.forwardRef<- HTMLInputElement,- InputWithAddonsProps->(({ leading, trailing, className, ...props }, ref) => {- return (- <div className={cn("flex rounded-md shadow-xs", className)}>- {leading ? (- <span className="border-input bg-muted text-muted-foreground inline-flex items-center rounded-s-md border px-3 text-sm">- {leading}- </span>- ) : null}- <Input- ref={ref}- className={cn("z-1 shadow-none", {- "-ms-px rounded-s-none": leading,- "-me-px rounded-e-none": trailing,- })}- placeholder="google.com"- type="text"- {...props}- />- {trailing ? (- <span className="border-input bg-muted text-muted-foreground inline-flex items-center rounded-e-md border px-3 text-sm">- {trailing}- </span>- ) : null}- </div>- );-});--InputWithAddons.displayName = "InputWithAddons";--export { InputWithAddons };diff --git a/apps/dashboard/src/components/forms/onboarding/create-page.tsx b/apps/dashboard/src/components/forms/onboarding/create-page.tsxindex 2ff4c0af4..6263e84cd 100644--- a/apps/dashboard/src/components/forms/onboarding/create-page.tsx+++ b/apps/dashboard/src/components/forms/onboarding/create-page.tsx@@ -13,6 +13,11 @@ import {FormMessage,} from "@openstatus/ui/components/ui/form";import { Input } from "@openstatus/ui/components/ui/input";+import {+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+} from "@openstatus/ui/components/ui/input-group";import {Select,SelectContent,@@ -30,8 +35,6 @@ import { useFieldArray, useForm } from "react-hook-form";import { toast } from "sonner";import { z } from "zod";-// FIXME: use input-group instead-import { InputWithAddons } from "@/components/common/input-with-addons";import { ThemePickerPopover } from "@/components/forms/status-page/theme-picker";import { useTRPC } from "@/lib/trpc/client";@@ -171,13 +174,14 @@ export function CreatePageForm({render={({ field }) => (<FormItem><FormLabel>Slug</FormLabel>- <FormControl>- <InputWithAddons- placeholder="status"- trailing=".openstatus.dev"- {...field}- />- </FormControl>+ <InputGroup>+ <FormControl>+ <InputGroupInput placeholder="status" {...field} />+ </FormControl>+ <InputGroupAddon align="inline-end">+ .openstatus.dev+ </InputGroupAddon>+ </InputGroup><FormMessage /><FormDescription>Choose a unique subdomain for your status page (minimum 3diff --git a/apps/dashboard/src/components/forms/status-page/form-custom-domain.tsx b/apps/dashboard/src/components/forms/status-page/form-custom-domain.tsxindex 08184dc82..df6864c1a 100644--- a/apps/dashboard/src/components/forms/status-page/form-custom-domain.tsx+++ b/apps/dashboard/src/components/forms/status-page/form-custom-domain.tsx@@ -8,6 +8,11 @@ import {FormItem,FormMessage,} from "@openstatus/ui/components/ui/form";+import {+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+} from "@openstatus/ui/components/ui/input-group";import { Label } from "@openstatus/ui/components/ui/label";import { isTRPCClientError } from "@trpc/client";import { Lock } from "lucide-react";@@ -17,8 +22,6 @@ import { useForm } from "react-hook-form";import { toast } from "sonner";import { z } from "zod";-// FIXME: use input-group instead-import { InputWithAddons } from "@/components/common/input-with-addons";import { Link } from "@/components/common/link";import DomainConfiguration from "@/components/domains/domain-configuration";import { useDomainStatus } from "@/components/domains/use-domain-status";@@ -106,12 +109,16 @@ export function FormCustomDomain({render={({ field }) => (<FormItem><Label>Domain</Label>- <InputWithAddons- placeholder="status.openstatus.dev"- leading="https://"- disabled={locked}- {...field}- />+ <InputGroup>+ <InputGroupAddon align="inline-start">+ https://+ </InputGroupAddon>+ <InputGroupInput+ placeholder="status.openstatus.dev"+ disabled={locked}+ {...field}+ />+ </InputGroup><FormMessage /></FormItem>)}diff --git a/apps/dashboard/src/components/forms/status-page/form-general.tsx b/apps/dashboard/src/components/forms/status-page/form-general.tsxindex dd50c7f24..11c18fc2c 100644--- a/apps/dashboard/src/components/forms/status-page/form-general.tsx+++ b/apps/dashboard/src/components/forms/status-page/form-general.tsx@@ -12,6 +12,11 @@ import {} from "@openstatus/ui/components/ui/form";import { Form } from "@openstatus/ui/components/ui/form";import { Input } from "@openstatus/ui/components/ui/input";+import {+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+} from "@openstatus/ui/components/ui/input-group";import { Textarea } from "@openstatus/ui/components/ui/textarea";import { useDebounce } from "@openstatus/ui/hooks/use-debounce";import { useMutation, useQuery } from "@tanstack/react-query";@@ -22,8 +27,6 @@ import { useForm } from "react-hook-form";import { toast } from "sonner";import { z } from "zod";-// FIXME: use input-group instead-import { InputWithAddons } from "@/components/common/input-with-addons";import {FormCard,FormCardContent,@@ -192,13 +195,14 @@ export function FormGeneral({render={({ field }) => (<FormItem><FormLabel>Slug</FormLabel>- <FormControl>- <InputWithAddons- placeholder="status"- trailing=".openstatus.dev"- {...field}- />- </FormControl>+ <InputGroup>+ <FormControl>+ <InputGroupInput placeholder="status" {...field} />+ </FormControl>+ <InputGroupAddon align="inline-end">+ .openstatus.dev+ </InputGroupAddon>+ </InputGroup><FormMessage /><FormDescription>Choose a unique subdomain for your status page (minimum 3diff --git a/packages/ui/src/components/ui/input-group.tsx b/packages/ui/src/components/ui/input-group.tsxindex 3aea7e28c..2615d836e 100644--- a/packages/ui/src/components/ui/input-group.tsx+++ b/packages/ui/src/components/ui/input-group.tsx@@ -15,6 +15,7 @@ function InputGroup({ className, ...props }: React.ComponentProps<"div">) {className={cn("group/input-group border-input dark:bg-input/30 relative flex w-full items-center rounded-md border shadow-xs transition-[color,box-shadow] outline-none","h-9 min-w-0 has-[>textarea]:h-auto",+ "has-[:disabled]:pointer-events-none has-[:disabled]:opacity-50",// Variants based on alignment."has-[>[data-align=inline-start]]:[&>input]:pl-2",@@ -26,7 +27,7 @@ function InputGroup({ className, ...props }: React.ComponentProps<"div">) {"has-[[data-slot=input-group-control]:focus-visible]:border-ring has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 has-[[data-slot=input-group-control]:focus-visible]:ring-[3px]",// Error state.- "has-[[data-slot][aria-invalid=true]]:border-destructive has-[[data-slot][aria-invalid=true]]:ring-destructive/20 dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40",+ "aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 has-[[data-slot][aria-invalid=true]]:border-destructive has-[[data-slot][aria-invalid=true]]:ring-destructive/20 dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40 has-[[data-slot=input-group-control]:focus-visible]:aria-invalid:border-destructive has-[[data-slot=input-group-control]:focus-visible]:aria-invalid:ring-destructive/20 dark:has-[[data-slot=input-group-control]:focus-visible]:aria-invalid:ring-destructive/40 has-[[data-slot=input-group-control]:focus-visible]:has-[[data-slot][aria-invalid=true]]:border-destructive has-[[data-slot=input-group-control]:focus-visible]:has-[[data-slot][aria-invalid=true]]:ring-destructive/20 dark:has-[[data-slot=input-group-control]:focus-visible]:has-[[data-slot][aria-invalid=true]]:ring-destructive/40",className,)}