Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(users): renaming the account now triggers a re-render in the sidebar #7005

Merged
merged 3 commits into from
Feb 20, 2025
Merged

chore(users): renaming the account now triggers a re-render in the sidebar #7005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acebe2a
chore(finding): display resource tags in two columns
paabloLC Feb 20, 2025
ad16520
refactor(ui): simplify SkeletonProfile layout structure
paabloLC Feb 20, 2025
e54b0b2
refactor(ui): simplify SkeletonProfile layout structure
paabloLC Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ui/app/(prowler)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import "@/styles/globals.css";

import { Metadata, Viewport } from "next";
import React from "react";
import React, { use } from "react";

import { getProfileInfo } from "@/actions/users/users";
import { SidebarWrap, Toaster } from "@/components/ui";
import { fontSans } from "@/config/fonts";
import { siteConfig } from "@/config/site";
Expand Down Expand Up @@ -33,6 +34,8 @@ export default function RootLayout({
}: {
children: React.ReactNode;
}) {
const user = use(getProfileInfo());

return (
<html suppressHydrationWarning lang="en">
<head />
Expand All @@ -45,7 +48,7 @@ export default function RootLayout({
>
<Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
<div className="flex h-dvh items-center justify-center overflow-hidden">
<SidebarWrap />
<SidebarWrap user={user} />
<main className="no-scrollbar mb-auto h-full flex-1 flex-col overflow-y-auto px-6 py-4 xl:px-10">
{children}
<Toaster />
Expand Down
2 changes: 1 addition & 1 deletion ui/components/auth/oss/auth-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const AuthForm = ({
control={form.control}
name="company"
type="text"
label="Company Name"
label="Company name"
placeholder="Enter your company name"
isRequired={false}
isInvalid={!!form.formState.errors.company}
Expand Down
12 changes: 7 additions & 5 deletions ui/components/findings/table/finding-detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,13 @@ export const FindingDetail = ({
<h4 className="text-sm font-bold text-gray-500 dark:text-gray-400">
Tags
</h4>
{Object.entries(resource.tags).map(([key, value]) => (
<InfoField key={key} label={key}>
{renderValue(value)}
</InfoField>
))}
<div className="grid grid-cols-1 gap-4 md:grid-cols-2">
{Object.entries(resource.tags).map(([key, value]) => (
<InfoField key={key} label={key}>
{renderValue(value)}
</InfoField>
))}
</div>
</div>
)}

Expand Down
1 change: 1 addition & 0 deletions ui/components/ui/sidebar/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export * from "./sidebar";
export * from "./sidebar-items";
export * from "./sidebar-wrap";
export * from "./skeleton-profile";
export * from "./team-avatar";
export * from "./user-avatar";
19 changes: 10 additions & 9 deletions ui/components/ui/sidebar/sidebar-wrap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { Button, ScrollShadow, Spacer, Tooltip } from "@nextui-org/react";
import clsx from "clsx";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useSession } from "next-auth/react";
import React, { Suspense, useCallback } from "react";
import React, { useCallback } from "react";
import { useMediaQuery } from "usehooks-ts";

import { logOut } from "@/actions/auth";
import { AddIcon } from "@/components/icons";
import { useUIStore } from "@/store";
import { UserProfileProps } from "@/types";

import {
ProwlerExtended,
Expand All @@ -21,12 +21,11 @@ import { ThemeSwitch } from "../../ThemeSwitch";
import { CustomButton } from "../custom";
import Sidebar from "./sidebar";
import { sectionItemsWithTeams } from "./sidebar-items";
import { SkeletonProfile } from "./skeleton-profile";
import { UserAvatar } from "./user-avatar";

export const SidebarWrap = () => {
export const SidebarWrap = ({ user }: { user: UserProfileProps }) => {
const pathname = usePathname();
const { data: session } = useSession();

const isCollapsed = useUIStore((state) => state.isSideMenuOpen);
const openSideMenu = useUIStore((state) => state.openSideMenu);
const closeSideMenu = useUIStore((state) => state.closeSideMenu);
Expand Down Expand Up @@ -78,13 +77,15 @@ export const SidebarWrap = () => {
</div>
</Link>
<Link href={"/users"}>
<Suspense fallback={<p>Loading...</p>}>
{!user ? (
<SkeletonProfile />
) : (
<UserAvatar
userName={session?.user.name ?? "Guest"}
position={session?.user.companyName ?? "Company Name"}
userName={user?.data?.attributes?.name as string}
position={user?.data?.attributes?.company_name as string}
isCompact={isCompact}
/>
</Suspense>
)}
</Link>
<div
className={clsx({
Expand Down
19 changes: 19 additions & 0 deletions ui/components/ui/sidebar/skeleton-profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Skeleton } from "@nextui-org/react";

export const SkeletonProfile = () => {
return (
<div className="flex items-center space-x-2">
<Skeleton className="h-10 w-10 rounded-full">
<div className="h-10 w-10 rounded-full bg-default-200"></div>
</Skeleton>
<div className="flex flex-col space-y-1">
<Skeleton className="h-4 w-24 rounded-lg">
<div className="h-4 bg-default-200"></div>
</Skeleton>
<Skeleton className="h-3 w-24 rounded-lg">
<div className="h-3 bg-default-200"></div>
</Skeleton>
</div>
</div>
);
};
2 changes: 1 addition & 1 deletion ui/components/users/table/column-users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const ColumnsUser: ColumnDef<UserProps>[] = [
header: ({ column }) => (
<DataTableColumnHeader
column={column}
title={"Company Name"}
title={"Company name"}
param="company_name"
/>
),
Expand Down
Loading