Skip to content

Commit d87ffac

Browse files
Bump the npm_and_yarn group across 1 directory with 2 updates (#1205)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: AndrewThien <anretrithien@gmail.com>
1 parent 85954b2 commit d87ffac

5 files changed

Lines changed: 131 additions & 123 deletions

File tree

app/next-client-app/app/(protected)/scanreports/[id]/layout.tsx

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
getScanReport,
3-
getScanReportPermissions,
4-
} from "@/api/scanreports";
1+
import { getScanReport, getScanReportPermissions } from "@/api/scanreports";
52
import { Forbidden } from "@/components/core/Forbidden";
63
import { NavGroup } from "@/components/core/nav-group";
74
import DeleteDialog from "@/components/scanreports/DeleteDialog";
@@ -14,7 +11,7 @@ import {
1411
DropdownMenuContent,
1512
DropdownMenuTrigger,
1613
DropdownMenuSeparator,
17-
DropdownMenuLabel
14+
DropdownMenuLabel,
1815
} from "@/components/ui/dropdown-menu";
1916
import { Suspense } from "react";
2017
import { Skeleton } from "@/components/ui/skeleton";
@@ -28,7 +25,11 @@ import { UploadStatusOptions } from "@/constants/scanReportStatus";
2825
import ExportScanReport from "@/components/scanreports/ExportScanReport";
2926
import { ActionsDownloadMenu } from "./actions-download-menu";
3027

31-
export async function generateMetadata({ params }: { params: Promise<{ id: string }> }) {
28+
export async function generateMetadata({
29+
params,
30+
}: {
31+
params: Promise<{ id: string }>;
32+
}) {
3233
const resolvedParams = await params;
3334
const scanreport = await getScanReport(resolvedParams.id);
3435
return {
@@ -39,7 +40,7 @@ export async function generateMetadata({ params }: { params: Promise<{ id: strin
3940

4041
export default async function ScanReportLayout(
4142
props: Readonly<{
42-
params: { id: string };
43+
params: Promise<{ id: string }>;
4344
children: React.ReactNode;
4445
}>
4546
) {
@@ -57,11 +58,11 @@ export default async function ScanReportLayout(
5758
{
5859
name: "Tables",
5960
iconName: "TableProperties",
60-
matchPrefixes: ["tables"]
61+
matchPrefixes: ["tables"],
6162
},
6263
{ name: "Rules", slug: "mapping_rules", iconName: "Waypoints" },
6364
{ name: "Review Rules", slug: "review_rules", iconName: "SearchCheck" },
64-
{ name: "Downloads", slug: "downloads", iconName: "Download" }
65+
{ name: "Downloads", slug: "downloads", iconName: "Download" },
6566
];
6667

6768
{
@@ -71,7 +72,7 @@ export default async function ScanReportLayout(
7172
items.push({
7273
name: "Edit Details",
7374
slug: "details",
74-
iconName: "Edit"
75+
iconName: "Edit",
7576
});
7677
}
7778

@@ -144,25 +145,28 @@ export default async function ScanReportLayout(
144145
}
145146
/>
146147
</div>
147-
148148
</div>
149149
<div className="hidden md:flex flex-col md:flex-row md:items-center h-7 text-sm space-y-2 md:space-y-0 divide-y md:divide-y-0 md:divide-x">
150150
<div className="flex items-center gap-2 text-muted-foreground">
151-
Members:{" "}
152-
<AvatarList
153-
members={[scanreport.author, ...scanreport.viewers, ...scanreport.editors].filter(
154-
(member, index, self) =>
155-
index === self.findIndex((m) => m.id === member.id)
156-
)}
157-
/>
151+
Members:{" "}
152+
<AvatarList
153+
members={[
154+
scanreport.author,
155+
...scanreport.viewers,
156+
...scanreport.editors,
157+
].filter(
158+
(member, index, self) =>
159+
index === self.findIndex((m) => m.id === member.id)
160+
)}
161+
/>
158162
</div>
159163
</div>
160164
{/* "Navs" group */}
161165
<div className="flex flex-col md:flex-row justify-between mt-6 md:mt-0">
162166
<div>
163167
<NavGroup
164-
path={`/scanreports/${params.id}`}
165-
items={items.map(x => ({ ...x, text: x.name }))}
168+
path={`/scanreports/${params.id}`}
169+
items={items.map((x) => ({ ...x, text: x.name }))}
166170
/>
167171
</div>
168172

app/next-client-app/components/ui/button.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import * as React from "react"
2-
import { Slot } from "@radix-ui/react-slot"
3-
import { cva, type VariantProps } from "class-variance-authority"
1+
import * as React from "react";
2+
import { Slot } from "@radix-ui/react-slot";
3+
import { cva, type VariantProps } from "class-variance-authority";
44

5-
import { cn } from "@/lib/utils"
5+
import { cn } from "@/lib/utils";
66

77
const buttonVariants = cva(
8-
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-hidden 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",
8+
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:cursor-not-allowed disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-hidden 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 hover:cursor-pointer",
99
{
1010
variants: {
1111
variant: {
@@ -33,7 +33,7 @@ const buttonVariants = cva(
3333
size: "default",
3434
},
3535
}
36-
)
36+
);
3737

3838
function Button({
3939
className,
@@ -43,17 +43,17 @@ function Button({
4343
...props
4444
}: React.ComponentProps<"button"> &
4545
VariantProps<typeof buttonVariants> & {
46-
asChild?: boolean
46+
asChild?: boolean;
4747
}) {
48-
const Comp = asChild ? Slot : "button"
48+
const Comp = asChild ? Slot : "button";
4949

5050
return (
5151
<Comp
5252
data-slot="button"
5353
className={cn(buttonVariants({ variant, size, className }))}
5454
{...props}
5555
/>
56-
)
56+
);
5757
}
5858

59-
export { Button, buttonVariants }
59+
export { Button, buttonVariants };

app/next-client-app/next-env.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference path="./.next/types/routes.d.ts" />
34

45
// NOTE: This file should not be edited
56
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

0 commit comments

Comments
 (0)