Merge pull request #731 from trycompai/main

Marfuen · web-flow · commit 79bd3d067714 · 2025-05-30T12:55:24.000-04:00
[comp] Production Deploy
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/AddFrameworkModal.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/AddFrameworkModal.tsx
@@ -33,11 +33,18 @@ import { addFrameworksSchema } from "@/actions/schema"; // Will create/update th
 
 type Props = {
 	onOpenChange: (isOpen: boolean) => void;
-	availableFrameworks: Pick<FrameworkEditorFramework, "id" | "name" | "description" | "version" | "visible">[];
+	availableFrameworks: Pick<
+		FrameworkEditorFramework,
+		"id" | "name" | "description" | "version" | "visible"
+	>[];
 	organizationId: string;
 };
 
-export function AddFrameworkModal({ onOpenChange, availableFrameworks, organizationId }: Props) {
+export function AddFrameworkModal({
+	onOpenChange,
+	availableFrameworks,
+	organizationId,
+}: Props) {
 	const t = useI18n();
 	const router = useRouter();
 	const [isExecuting, setIsExecuting] = useState(false);
@@ -79,7 +86,9 @@ export function AddFrameworkModal({ onOpenChange, availableFrameworks, organizat
 			<DialogHeader className="my-4">
 				<DialogTitle>{t("frameworks.add_modal.title")}</DialogTitle>
 				<DialogDescription>
-					{availableFrameworks.length > 0 ? t("frameworks.add_modal.description") : t("frameworks.add_modal.all_enabled_description")}
+					{availableFrameworks.length > 0
+						? t("frameworks.add_modal.description")
+						: t("frameworks.add_modal.all_enabled_description")}
 				</DialogDescription>
 			</DialogHeader>
 
@@ -100,30 +109,40 @@ export function AddFrameworkModal({ onOpenChange, availableFrameworks, organizat
 									</FormLabel>
 									<FormControl>
 										<fieldset className="flex flex-col gap-2 select-none">
-											<legend className="sr-only">
-												{t("frameworks.overview.grid.title")}
-											</legend>
 											<div className="flex flex-col gap-2 overflow-y-auto max-h-[300px]">
-												{availableFrameworks.filter(framework => framework.visible).map(
-													(framework) => {
-														const frameworkId = framework.id;
+												{availableFrameworks
+													.filter(
+														(framework) =>
+															framework.visible,
+													)
+													.map((framework) => {
+														const frameworkId =
+															framework.id;
 														return (
 															<label
-																key={frameworkId}
+																key={
+																	frameworkId
+																}
 																htmlFor={`add-framework-${frameworkId}`}
 																className={cn(
 																	"relative flex flex-col p-4 border rounded-sm cursor-pointer transition-colors focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2 w-full text-left",
-																	field.value.includes(frameworkId) &&
-																	"border-primary bg-primary/5",
+																	field.value.includes(
+																		frameworkId,
+																	) &&
+																		"border-primary bg-primary/5",
 																)}
 															>
 																<div className="flex items-start justify-between">
 																	<div>
 																		<h3 className="font-semibold">
-																			{framework.name}
+																			{
+																				framework.name
+																			}
 																		</h3>
 																		<p className="text-sm text-muted-foreground mt-1">
-																			{framework.description}
+																			{
+																				framework.description
+																			}
 																		</p>
 																		<p className="text-xs text-muted-foreground/75 mt-2">
 																			{`${t("frameworks.overview.grid.version")}: ${framework.version}`}
@@ -132,21 +151,36 @@ export function AddFrameworkModal({ onOpenChange, availableFrameworks, organizat
 																	<div>
 																		<Checkbox
 																			id={`add-framework-${frameworkId}`}
-																			checked={field.value.includes(frameworkId)}
+																			checked={field.value.includes(
+																				frameworkId,
+																			)}
 																			className="mt-1"
-																			onCheckedChange={(checked) => {
-																				const newValue = checked
-																					? [...field.value, frameworkId]
-																					: field.value.filter((id) => id !== frameworkId);
-																				field.onChange(newValue);
+																			onCheckedChange={(
+																				checked,
+																			) => {
+																				const newValue =
+																					checked
+																						? [
+																								...field.value,
+																								frameworkId,
+																							]
+																						: field.value.filter(
+																								(
+																									id,
+																								) =>
+																									id !==
+																									frameworkId,
+																							);
+																				field.onChange(
+																					newValue,
+																				);
 																			}}
 																		/>
 																	</div>
 																</div>
 															</label>
 														);
-													},
-												)}
+													})}
 											</div>
 										</fieldset>
 									</FormControl>
@@ -166,7 +200,12 @@ export function AddFrameworkModal({ onOpenChange, availableFrameworks, organizat
 								</Button>
 								<Button
 									type="submit"
-									disabled={isExecuting || form.getValues("frameworkIds").length === 0 || availableFrameworks.length === 0}
+									disabled={
+										isExecuting ||
+										form.getValues("frameworkIds")
+											.length === 0 ||
+										availableFrameworks.length === 0
+									}
 									suppressHydrationWarning
 								>
 									{isExecuting && (
@@ -182,7 +221,9 @@ export function AddFrameworkModal({ onOpenChange, availableFrameworks, organizat
 
 			{!isExecuting && availableFrameworks.length === 0 && (
 				<div className="py-8 text-center">
-					<p className="text-md text-foreground">{t("frameworks.add_modal.all_enabled_message")}</p>
+					<p className="text-md text-foreground">
+						{t("frameworks.add_modal.all_enabled_message")}
+					</p>
 					<DialogFooter className="mt-8">
 						<Button
 							type="button"
@@ -198,9 +239,11 @@ export function AddFrameworkModal({ onOpenChange, availableFrameworks, organizat
 			{isExecuting && (
 				<div className="flex items-center justify-center p-8">
 					<Loader2 className="h-12 w-12 animate-spin text-primary" />
-					<p className="ml-4 text-muted-foreground">{t("frameworks.add_modal.loading")}</p>
+					<p className="ml-4 text-muted-foreground">
+						{t("frameworks.add_modal.loading")}
+					</p>
 				</div>
 			)}
 		</DialogContent>
 	);
-} 
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/layout.tsx
@@ -82,15 +82,15 @@ export default async function Layout({
 				isCollapsed={isCollapsed}
 			>
 				<Header />
-				<main className="px-4 mx-auto pb-8 min-h-[calc(100vh-70px)]">
+				<main className="px-4 mx-auto pb-8 min-h-[calc(100vh-15vh)]">
 					{children}
 				</main>
 				<AssistantSheet />
 			</AnimatedLayout>
 			<div className="hidden md:flex">
 				{!("error" in onboardingStatus) &&
 					onboardingStatus.completedItems <
-					onboardingStatus.totalItems && (
+						onboardingStatus.totalItems && (
 						<FloatingOnboardingChecklist
 							orgId={currentOrganization.id}
 							completedItems={onboardingStatus.completedItems}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/InviteMembersModal.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/InviteMembersModal.tsx
@@ -605,7 +605,7 @@ export function InviteMembersModal({
 														"No file chosen"}
 												</span>
 											</div>
-											<FormControl>
+											<FormControl className="relative">
 												<Input
 													id="csvFileInput"
 													type="file"
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/MemberRow.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/MemberRow.tsx
@@ -180,7 +180,6 @@ export function MemberRow({ member, onRemove, onUpdateRole }: MemberRowProps) {
 								disabled={!canEditRoles}
 							>
 								<MoreHorizontal className="h-4 w-4" />
-								<span className="sr-only">Open menu</span>
 							</Button>
 						</DropdownMenuTrigger>
 						<DropdownMenuContent align="end">
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/PendingInvitationRow.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/PendingInvitationRow.tsx
@@ -109,7 +109,6 @@ export function PendingInvitationRow({
 								className="h-8 w-8 p-0"
 							>
 								<MoreHorizontal className="h-4 w-4" />
-								<span className="sr-only">Open menu</span>
 							</Button>
 						</DropdownMenuTrigger>
 						<DropdownMenuContent align="end">
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/TeamMembersClient.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/TeamMembersClient.tsx
@@ -242,9 +242,6 @@ export function TeamMembersClient({
 							onClick={() => setSearchQuery(null)}
 						>
 							<X className="h-4 w-4" />
-							<span className="sr-only">
-								{t("common.actions.clear")}
-							</span>
 						</Button>
 					)}
 				</div>
diff --git a/apps/app/src/components/data-table/data-table-filter-list.tsx b/apps/app/src/components/data-table/data-table-filter-list.tsx
@@ -253,7 +253,7 @@ export function DataTableFilterList<TData>({
 					className="flex w-full max-w-[var(--radix-popover-content-available-width)] origin-[var(--radix-popover-content-transform-origin)] flex-col gap-3.5 p-4 sm:min-w-[380px]"
 					{...props}
 				>
-					<div className="flex flex-col gap-1">
+					<div className="flex flex-col gap-1 relative">
 						<h4 id={labelId} className="font-medium leading-none">
 							{filters.length > 0
 								? "Filters"
diff --git a/apps/app/src/components/data-table/data-table-range-filter.tsx b/apps/app/src/components/data-table/data-table-range-filter.tsx
@@ -105,7 +105,6 @@ export function DataTableRangeFilter<TData>({
 					onRangeValueChange(event.target.value, true)
 				}
 			/>
-			<span className="sr-only shrink-0 text-muted-foreground">to</span>
 			<Input
 				id={`${inputId}-max`}
 				type="number"
diff --git a/apps/app/src/components/data-table/data-table-slider-filter.tsx b/apps/app/src/components/data-table/data-table-slider-filter.tsx
@@ -170,9 +170,6 @@ export function DataTableSliderFilter<TData>({
 						{title}
 					</p>
 					<div className="flex items-center gap-4">
-						<Label htmlFor={`${id}-from`} className="sr-only">
-							From
-						</Label>
 						<div className="relative">
 							<Input
 								id={`${id}-from`}
@@ -194,9 +191,6 @@ export function DataTableSliderFilter<TData>({
 								</span>
 							)}
 						</div>
-						<Label htmlFor={`${id}-to`} className="sr-only">
-							to
-						</Label>
 						<div className="relative">
 							<Input
 								id={`${id}-to`}
@@ -219,9 +213,6 @@ export function DataTableSliderFilter<TData>({
 							)}
 						</div>
 					</div>
-					<Label htmlFor={`${id}-slider`} className="sr-only">
-						{title} slider
-					</Label>
 					<Slider
 						id={`${id}-slider`}
 						min={min}
diff --git a/apps/app/src/components/data-table/data-table-sort-list.tsx b/apps/app/src/components/data-table/data-table-sort-list.tsx
@@ -298,7 +298,7 @@ export function DataTableSortList<TData>({
 					className="flex w-full max-w-[var(--radix-popover-content-available-width)] origin-[var(--radix-popover-content-transform-origin)] flex-col gap-3.5 p-4 sm:min-w-[380px]"
 					{...props}
 				>
-					<div className="flex flex-col gap-1">
+					<div className="flex flex-col gap-1 relative">
 						<h4 id={labelId} className="font-medium leading-none">
 							{sorting.length > 0
 								? "Sort by"
diff --git a/apps/app/src/components/file-uploader.tsx b/apps/app/src/components/file-uploader.tsx
@@ -328,9 +328,6 @@ function FileCard({ file, progress, onRemove }: FileCardProps) {
 					onClick={onRemove}
 				>
 					<X className="size-4" aria-hidden="true" />
-					<span className="sr-only">
-						{t("common.attachments.toasts.remove_file")}
-					</span>
 				</Button>
 			</div>
 		</div>
diff --git a/apps/app/src/components/forms/create-organization-form.tsx b/apps/app/src/components/forms/create-organization-form.tsx
@@ -31,7 +31,10 @@ import type { z } from "zod";
 import { LogoSpinner } from "../logo-spinner";
 
 interface OnboardingClientProps {
-	frameworks: Pick<FrameworkEditorFramework, "id" | "name" | "description" | "version" | "visible">[];
+	frameworks: Pick<
+		FrameworkEditorFramework,
+		"id" | "name" | "description" | "version" | "visible"
+	>[];
 }
 
 export function OnboardingClient({ frameworks }: OnboardingClientProps) {
@@ -183,13 +186,12 @@ export function OnboardingClient({ frameworks }: OnboardingClientProps) {
 									</FormLabel>
 									<FormControl>
 										<fieldset className="flex flex-col gap-2 select-none">
-											<legend className="sr-only">
-												{t(
-													"frameworks.overview.grid.title",
-												)}
-											</legend>
-											{frameworks.filter(framework => framework.visible).map(
-												(framework) => {
+											{frameworks
+												.filter(
+													(framework) =>
+														framework.visible,
+												)
+												.map((framework) => {
 													return (
 														<label
 															key={framework.id}
@@ -199,7 +201,7 @@ export function OnboardingClient({ frameworks }: OnboardingClientProps) {
 																field.value.includes(
 																	framework.id,
 																) &&
-																"border-primary bg-primary/5",
+																	"border-primary bg-primary/5",
 															)}
 														>
 															<div className="flex items-start justify-between">
@@ -231,16 +233,16 @@ export function OnboardingClient({ frameworks }: OnboardingClientProps) {
 																			const newValue =
 																				checked
 																					? [
-																						...field.value,
-																						framework.id,
-																					]
-																					: field.value.filter(
-																						(
-																							currentFrameworkId,
-																						) =>
-																							currentFrameworkId !==
+																							...field.value,
 																							framework.id,
-																					);
+																						]
+																					: field.value.filter(
+																							(
+																								currentFrameworkId,
+																							) =>
+																								currentFrameworkId !==
+																								framework.id,
+																						);
 																			field.onChange(
 																				newValue,
 																			);
@@ -250,8 +252,7 @@ export function OnboardingClient({ frameworks }: OnboardingClientProps) {
 															</div>
 														</label>
 													);
-												},
-											)}
+												})}
 										</fieldset>
 									</FormControl>
 									<FormMessage className="text-xs" />
diff --git a/apps/app/src/components/modals/create-org-modal.tsx b/apps/app/src/components/modals/create-org-modal.tsx
diff --git a/apps/app/src/components/organization-switcher.tsx b/apps/app/src/components/organization-switcher.tsx
diff --git a/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/columns.tsx b/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/columns.tsx
diff --git a/apps/framework-editor/app/(pages)/tasks/components/columns.tsx b/apps/framework-editor/app/(pages)/tasks/components/columns.tsx
diff --git a/apps/framework-editor/app/components/TableToolbar.tsx b/apps/framework-editor/app/components/TableToolbar.tsx

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@ export function MemberRow({ member, onRemove, onUpdateRole }: MemberRowProps) {`
`180`	`180`	`disabled={!canEditRoles}`
`181`	`181`	`>`
`182`	`182`	`<MoreHorizontal className="h-4 w-4" />`
`183`		`- <span className="sr-only">Open menu</span>`
`184`	`183`	`</Button>`
`185`	`184`	`</DropdownMenuTrigger>`
`186`	`185`	`<DropdownMenuContent align="end">`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ export function PendingInvitationRow({`
`109`	`109`	`className="h-8 w-8 p-0"`
`110`	`110`	`>`
`111`	`111`	`<MoreHorizontal className="h-4 w-4" />`
`112`		`- <span className="sr-only">Open menu</span>`
`113`	`112`	`</Button>`
`114`	`113`	`</DropdownMenuTrigger>`
`115`	`114`	`<DropdownMenuContent align="end">`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ export function DataTableFilterList<TData>({`
`253`	`253`	`className="flex w-full max-w-[var(--radix-popover-content-available-width)] origin-[var(--radix-popover-content-transform-origin)] flex-col gap-3.5 p-4 sm:min-w-[380px]"`
`254`	`254`	`{...props}`
`255`	`255`	`>`
`256`		`- <div className="flex flex-col gap-1">`
	`256`	`+ <div className="flex flex-col gap-1 relative">`
`257`	`257`	`<h4 id={labelId} className="font-medium leading-none">`
`258`	`258`	`{filters.length > 0`
`259`	`259`	`? "Filters"`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ export function DataTableRangeFilter<TData>({`
`105`	`105`	`onRangeValueChange(event.target.value, true)`
`106`	`106`	`}`
`107`	`107`	`/>`
`108`		`- <span className="sr-only shrink-0 text-muted-foreground">to</span>`
`109`	`108`	`<Input`
`110`	`109`	id={`${inputId}-max`}
`111`	`110`	`type="number"`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ export function DataTableSortList<TData>({`
`298`	`298`	`className="flex w-full max-w-[var(--radix-popover-content-available-width)] origin-[var(--radix-popover-content-transform-origin)] flex-col gap-3.5 p-4 sm:min-w-[380px]"`
`299`	`299`	`{...props}`
`300`	`300`	`>`
`301`		`- <div className="flex flex-col gap-1">`
	`301`	`+ <div className="flex flex-col gap-1 relative">`
`302`	`302`	`<h4 id={labelId} className="font-medium leading-none">`
`303`	`303`	`{sorting.length > 0`
`304`	`304`	`? "Sort by"`