Skip to content

Commit

Permalink
Fix all type errors and formatted files
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreasgdp committed Oct 20, 2023
1 parent 6730fcc commit 609a9b1
Show file tree
Hide file tree
Showing 9 changed files with 221 additions and 227 deletions.
2 changes: 0 additions & 2 deletions prisma/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ async function main() {
},
},
quantity: 10,
assignedBy: '1',
},
{
ingredient: {
Expand All @@ -34,7 +33,6 @@ async function main() {
},
},
quantity: 5,

Check notice on line 35 in prisma/seed.ts

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (master)

✅ Getting better: Large Method

main decreases from 78 to 76 lines of code, threshold = 70. Large functions with many lines of code are generally harder to understand and lower the code health. Avoid adding more lines to this function.
assignedBy: '1',
},
],
},
Expand Down
39 changes: 19 additions & 20 deletions src/components/data-table/data-table-column-header.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import {
ArrowDownIcon,
ArrowUpIcon,
CaretSortIcon,
EyeNoneIcon,
} from "@radix-ui/react-icons"
import { type Column } from "@tanstack/react-table"

import { cn } from "@/lib/utils"
import { Button } from "@/components/ui/button"
import { Button } from '@/components/ui/button';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
} from '@/components/ui/dropdown-menu';
import { cn } from '@/lib/utils';
import {
ArrowDownIcon,
ArrowUpIcon,
CaretSortIcon,
EyeNoneIcon,
} from '@radix-ui/react-icons';
import { type Column } from '@tanstack/react-table';

interface DataTableColumnHeaderProps<TData, TValue>
extends React.HTMLAttributes<HTMLDivElement> {
column: Column<TData, TValue>
title: string
column: Column<TData, TValue>;
title: string;
}

export function DataTableColumnHeader<TData, TValue>({
Expand All @@ -28,18 +27,18 @@ export function DataTableColumnHeader<TData, TValue>({
className,
}: DataTableColumnHeaderProps<TData, TValue>) {
if (!column.getCanSort()) {
return <div className={cn(className)}>{title}</div>
return <div className={cn(className)}>{title}</div>;
}

return (
<div className={cn("flex items-center space-x-2", className)}>
<div className={cn('flex items-center space-x-2', className)}>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
aria-label={
column.getIsSorted() === "desc"
column.getIsSorted() === 'desc'
? `Sorted descending. Click to sort ascending.`
: column.getIsSorted() === "asc"
: column.getIsSorted() === 'asc'
? `Sorted ascending. Click to sort descending.`
: `Not sorted. Click to sort ascending.`
}
Expand All @@ -48,9 +47,9 @@ export function DataTableColumnHeader<TData, TValue>({
className="-ml-3 h-8 data-[state=open]:bg-accent"
>
<span>{title}</span>
{column.getIsSorted() === "desc" ? (
{column.getIsSorted() === 'desc' ? (
<ArrowDownIcon className="ml-2 h-4 w-4" aria-hidden="true" />
) : column.getIsSorted() === "asc" ? (
) : column.getIsSorted() === 'asc' ? (
<ArrowUpIcon className="ml-2 h-4 w-4" aria-hidden="true" />
) : (
<CaretSortIcon className="ml-2 h-4 w-4" aria-hidden="true" />
Expand Down Expand Up @@ -92,5 +91,5 @@ export function DataTableColumnHeader<TData, TValue>({
</DropdownMenuContent>
</DropdownMenu>
</div>
)
);
}
51 changes: 25 additions & 26 deletions src/components/data-table/data-table-faceted-filter.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import * as React from "react"
import { type Option } from "@/types"
import { CheckIcon, PlusCircledIcon } from "@radix-ui/react-icons"
import { type Column } from "@tanstack/react-table"

import { cn } from "@/lib/utils"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import {
Command,
CommandEmpty,
Expand All @@ -14,26 +8,31 @@ import {
CommandItem,
CommandList,
CommandSeparator,
} from "@/components/ui/command"
} from '@/components/ui/command';
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover"
import { Separator } from "@/components/ui/separator"
} from '@/components/ui/popover';
import { Separator } from '@/components/ui/separator';
import { cn } from '@/lib/utils';
import { type Option } from '@/types';
import { CheckIcon, PlusCircledIcon } from '@radix-ui/react-icons';
import { type Column } from '@tanstack/react-table';
import * as React from 'react';

interface DataTableFacetedFilter<TData, TValue> {
column?: Column<TData, TValue>
title?: string
options: Option[]
column?: Column<TData, TValue>;
title?: string;
options: Option[];
}

export function DataTableFacetedFilter<TData, TValue>({
column,
title,
options,
}: DataTableFacetedFilter<TData, TValue>) {
const selectedValues = new Set(column?.getFilterValue() as string[])
const selectedValues = new Set(column?.getFilterValue() as string[]);

return (
<Popover>
Expand Down Expand Up @@ -88,31 +87,31 @@ export function DataTableFacetedFilter<TData, TValue>({
<CommandEmpty>No results found.</CommandEmpty>
<CommandGroup>
{options.map((option) => {
const isSelected = selectedValues.has(option.value)
const isSelected = selectedValues.has(option.value);
return (
<CommandItem
key={option.value}
onSelect={() => {
if (isSelected) {
selectedValues.delete(option.value)
selectedValues.delete(option.value);
} else {
selectedValues.add(option.value)
selectedValues.add(option.value);
}
const filterValues = Array.from(selectedValues)
const filterValues = Array.from(selectedValues);
column?.setFilterValue(
filterValues.length ? filterValues : undefined
)
);
}}
>
<div
className={cn(
"mr-2 flex h-4 w-4 items-center justify-center rounded-sm border border-primary",
'mr-2 flex h-4 w-4 items-center justify-center rounded-sm border border-primary',
isSelected
? "bg-primary text-primary-foreground"
: "opacity-50 [&_svg]:invisible"
? 'bg-primary text-primary-foreground'
: 'opacity-50 [&_svg]:invisible'
)}
>
<CheckIcon className={cn("h-4 w-4")} aria-hidden="true" />
<CheckIcon className={cn('h-4 w-4')} aria-hidden="true" />
</div>
{option.icon && (
<option.icon
Expand All @@ -122,7 +121,7 @@ export function DataTableFacetedFilter<TData, TValue>({
)}
<span>{option.label}</span>
</CommandItem>
)
);
})}
</CommandGroup>
{selectedValues.size > 0 && (
Expand All @@ -142,5 +141,5 @@ export function DataTableFacetedFilter<TData, TValue>({
</Command>
</PopoverContent>
</Popover>
)
);
}
18 changes: 9 additions & 9 deletions src/components/data-table/data-table-loading.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { Skeleton } from "@/components/ui/skeleton"
import { Skeleton } from '@/components/ui/skeleton';
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table"
} from '@/components/ui/table';

interface DataTableLoadingProps {
columnCount: number
rowCount?: number
isNewRowCreatable?: boolean
isRowsDeletable?: boolean
searchableFieldCount?: number
filterableFieldCount?: number
columnCount: number;
rowCount?: number;
isNewRowCreatable?: boolean;
isRowsDeletable?: boolean;
searchableFieldCount?: number;
filterableFieldCount?: number;
}

export function DataTableLoading({
Expand Down Expand Up @@ -96,5 +96,5 @@ export function DataTableLoading({
</div>
</div>
</div>
)
);
}
31 changes: 15 additions & 16 deletions src/components/data-table/data-table-pagination.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
import {
ChevronLeftIcon,
ChevronRightIcon,
DoubleArrowLeftIcon,
DoubleArrowRightIcon,
} from "@radix-ui/react-icons"
import { type Table } from "@tanstack/react-table"

import { Button } from "@/components/ui/button"
import { Button } from '@/components/ui/button';
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select"
} from '@/components/ui/select';
import {
ChevronLeftIcon,
ChevronRightIcon,
DoubleArrowLeftIcon,
DoubleArrowRightIcon,
} from '@radix-ui/react-icons';
import { type Table } from '@tanstack/react-table';

interface DataTablePaginationProps<TData> {
table: Table<TData>
pageSizeOptions?: number[]
table: Table<TData>;
pageSizeOptions?: number[];
}

export function DataTablePagination<TData>({
Expand All @@ -27,7 +26,7 @@ export function DataTablePagination<TData>({
return (
<div className="flex w-full flex-col items-center justify-between gap-4 overflow-auto px-2 py-1 sm:flex-row sm:gap-8">
<div className="flex-1 whitespace-nowrap text-sm text-muted-foreground">
{table.getFilteredSelectedRowModel().rows.length} of{" "}
{table.getFilteredSelectedRowModel().rows.length} of{' '}
{table.getFilteredRowModel().rows.length} row(s) selected.
</div>
<div className="flex flex-col items-center gap-4 sm:flex-row sm:gap-6 lg:gap-8">
Expand All @@ -36,7 +35,7 @@ export function DataTablePagination<TData>({
<Select
value={`${table.getState().pagination.pageSize}`}
onValueChange={(value) => {
table.setPageSize(Number(value))
table.setPageSize(Number(value));
}}
>
<SelectTrigger className="h-8 w-[70px]">
Expand All @@ -52,7 +51,7 @@ export function DataTablePagination<TData>({
</Select>
</div>
<div className="flex w-[100px] items-center justify-center text-sm font-medium">
Page {table.getState().pagination.pageIndex + 1} of{" "}
Page {table.getState().pagination.pageIndex + 1} of{' '}
{table.getPageCount()}
</div>
<div className="flex items-center space-x-2">
Expand Down Expand Up @@ -99,5 +98,5 @@ export function DataTablePagination<TData>({
</div>
</div>
</div>
)
);
}
Loading

0 comments on commit 609a9b1

Please sign in to comment.