Skip to content

refactor: update Select components in evidence sections for improved … #259

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

Merged
carhartlewis merged 1 commit into from
Apr 3, 2025
Merged

refactor: update Select components in evidence sections for improved … #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
267 changes: 132 additions & 135 deletions apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/components/SelectAssignee.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,155 +1,152 @@
import { Avatar, AvatarImage, AvatarFallback } from "@comp/ui/avatar";
import {
Select,
SelectTrigger,
SelectContent,
SelectItem,
Select,
SelectTrigger,
SelectContent,
SelectItem,
} from "@comp/ui/select";
import { UserIcon } from "lucide-react";
import { Member, User } from "@comp/db/types";
import { useState, useEffect } from "react";

interface SelectAssigneeProps {
assigneeId: string | null;
disabled?: boolean;
assignees: (Member & { user: User })[];
onAssigneeChange: (value: string | null) => void;
withTitle?: boolean;
assigneeId: string | null;
disabled?: boolean;
assignees: (Member & { user: User })[];
onAssigneeChange: (value: string | null) => void;
withTitle?: boolean;
}

export const SelectAssignee = ({
assigneeId,
disabled,
assignees,
onAssigneeChange,
withTitle = true,
assigneeId,
disabled,
assignees,
onAssigneeChange,
withTitle = true,
}: SelectAssigneeProps) => {
const [selectedAssignee, setSelectedAssignee] = useState<
(Member & { user: User }) | null
>(null);
const [selectedAssignee, setSelectedAssignee] = useState<
(Member & { user: User }) | null
>(null);

// Initialize selectedAssignee based on assigneeId prop
useEffect(() => {
if (assigneeId && assignees) {
const assignee = assignees.find((a) => a.id === assigneeId);
if (assignee) {
setSelectedAssignee(assignee);
}
} else {
setSelectedAssignee(null);
}
}, [assigneeId, assignees]);
// Initialize selectedAssignee based on assigneeId prop
useEffect(() => {
if (assigneeId && assignees) {
const assignee = assignees.find((a) => a.id === assigneeId);
if (assignee) {
setSelectedAssignee(assignee);
}
} else {
setSelectedAssignee(null);
}
}, [assigneeId, assignees]);

const handleAssigneeChange = (value: string) => {
const newAssigneeId = value === "none" ? null : value;
onAssigneeChange(newAssigneeId);
const handleAssigneeChange = (value: string) => {
const newAssigneeId = value === "none" ? null : value;
onAssigneeChange(newAssigneeId);

if (newAssigneeId && assignees) {
const assignee = assignees.find((a) => a.id === newAssigneeId);
if (assignee) {
setSelectedAssignee(assignee);
} else {
setSelectedAssignee(null);
}
} else {
setSelectedAssignee(null);
}
};
if (newAssigneeId && assignees) {
const assignee = assignees.find((a) => a.id === newAssigneeId);
if (assignee) {
setSelectedAssignee(assignee);
} else {
setSelectedAssignee(null);
}
} else {
setSelectedAssignee(null);
}
};

// Function to safely prepare image URLs
const getImageUrl = (image: string | null) => {
if (!image) return "";
// Function to safely prepare image URLs
const getImageUrl = (image: string | null) => {
if (!image) return "";

// If image is a relative URL, ensure it's properly formed
if (image.startsWith("/")) {
return image;
}
// If image is a relative URL, ensure it's properly formed
if (image.startsWith("/")) {
return image;
}

return image;
};
return image;
};

return (
<div className="flex flex-col gap-2">
{withTitle && (
<div className="flex items-center gap-2 mb-1.5">
<UserIcon className="h-3.5 w-3.5 text-muted-foreground" />
<h3 className="text-xs font-medium text-muted-foreground">
ASSIGNEE
</h3>
</div>
)}
<Select
value={assigneeId || "none"}
onValueChange={handleAssigneeChange}
disabled={disabled}
>
<SelectTrigger className="w-full">
{selectedAssignee ? (
<div className="flex items-center gap-2">
<Avatar className="h-5 w-5 shrink-0">
<AvatarImage
src={getImageUrl(selectedAssignee.user.image)}
alt={selectedAssignee.user.name || "User"}
/>
<AvatarFallback>
{selectedAssignee.user.name?.charAt(0) || "?"}
</AvatarFallback>
</Avatar>
<span className="truncate">
{selectedAssignee.user.name || "Unknown User"}
</span>
</div>
) : (
<div className="flex items-center gap-2">
<Avatar className="h-5 w-5 shrink-0">
<AvatarFallback>
<UserIcon className="h-3 w-3" />
</AvatarFallback>
</Avatar>
<span>None</span>
</div>
)}
</SelectTrigger>
<SelectContent
className="min-w-[var(--radix-select-trigger-width)] w-auto max-w-[250px] z-50"
position="popper"
sideOffset={5}
align="start"
>
<SelectItem value="none" className="w-full p-0 overflow-hidden">
<div className="flex items-center gap-2 py-1.5 px-3 w-full">
<Avatar className="h-5 w-5 shrink-0">
<AvatarFallback>
<UserIcon className="h-3 w-3" />
</AvatarFallback>
</Avatar>
<span>None</span>
</div>
</SelectItem>
{assignees.map((assignee) => (
<SelectItem
key={assignee.id}
value={assignee.id}
className="w-full p-0 overflow-hidden"
>
<div className="flex items-center gap-2 py-1.5 px-3 w-full">
<Avatar className="h-5 w-5 shrink-0">
<AvatarImage
src={getImageUrl(assignee.user.image)}
alt={assignee.user.name || "User"}
/>
<AvatarFallback>
{assignee.user.name?.charAt(0) || "?"}
</AvatarFallback>
</Avatar>
<span className="truncate">
{assignee.user.name || "Unknown User"}
</span>
</div>
</SelectItem>
))}
</SelectContent>
</Select>
</div>
);
return (
<div className="flex flex-col gap-2">
{withTitle && (
<div className="flex items-center gap-2 mb-1.5">
<span className="font-medium">Assignee</span>
</div>
)}
<Select
value={assigneeId || "none"}
onValueChange={handleAssigneeChange}
disabled={disabled}
>
<SelectTrigger className="w-full">
{selectedAssignee ? (
<div className="flex items-center gap-2">
<Avatar className="h-5 w-5 shrink-0">
<AvatarImage
src={getImageUrl(selectedAssignee.user.image)}
alt={selectedAssignee.user.name || "User"}
/>
<AvatarFallback>
{selectedAssignee.user.name?.charAt(0) || "?"}
</AvatarFallback>
</Avatar>
<span className="truncate">
{selectedAssignee.user.name || "Unknown User"}
</span>
</div>
) : (
<div className="flex items-center gap-2">
<Avatar className="h-5 w-5 shrink-0">
<AvatarFallback>
<UserIcon className="h-3 w-3" />
</AvatarFallback>
</Avatar>
<span>None</span>
</div>
)}
</SelectTrigger>
<SelectContent
className="min-w-[var(--radix-select-trigger-width)] w-auto max-w-[250px] z-50"
position="popper"
sideOffset={5}
align="start"
>
<SelectItem value="none" className="w-full p-0 overflow-hidden">
<div className="flex items-center gap-2 py-1.5 px-3 w-full">
<Avatar className="h-5 w-5 shrink-0">
<AvatarFallback>
<UserIcon className="h-3 w-3" />
</AvatarFallback>
</Avatar>
<span>None</span>
</div>
</SelectItem>
{assignees.map((assignee) => (
<SelectItem
key={assignee.id}
value={assignee.id}
className="w-full p-0 overflow-hidden"
>
<div className="flex items-center gap-2 py-1.5 px-3 w-full">
<Avatar className="h-5 w-5 shrink-0">
<AvatarImage
src={getImageUrl(assignee.user.image)}
alt={assignee.user.name || "User"}
/>
<AvatarFallback>
{assignee.user.name?.charAt(0) || "?"}
</AvatarFallback>
</Avatar>
<span className="truncate">
{assignee.user.name || "Unknown User"}
</span>
</div>
</SelectItem>
))}
</SelectContent>
</Select>
</div>
);
};
87 changes: 42 additions & 45 deletions .../(app)/(dashboard)/[orgId]/evidence/[evidenceId]/components/EvidenceDepartmentSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,57 @@
"use client";

import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@comp/ui/select";
import { Departments } from "@comp/db/types";
import { Building } from "lucide-react";

interface DepartmentSectionProps {
onDepartmentChange: (value: Departments) => void;
department: Departments;
disabled?: boolean;
onDepartmentChange: (value: Departments) => void;
department: Departments;
disabled?: boolean;
}

export function EvidenceDepartmentSection({
onDepartmentChange,
department,
disabled = false,
onDepartmentChange,
department,
disabled = false,
}: DepartmentSectionProps) {
const handleDepartmentChange = (value: Departments) => {
onDepartmentChange(value);
};
const handleDepartmentChange = (value: Departments) => {
onDepartmentChange(value);
};

// Filter out 'none' from the displayed options as we handle it separately
const departmentOptions = Object.values(Departments).filter(
(dept) => dept !== "none",
);
// Filter out 'none' from the displayed options as we handle it separately
const departmentOptions = Object.values(Departments).filter(
(dept) => dept !== "none",
);

return (
<div className="flex flex-col gap-2">
<div className="flex items-center gap-2 mb-1.5">
<Building className="h-3.5 w-3.5 text-muted-foreground" />
<h3 className="text-xs font-medium text-muted-foreground">
DEPARTMENT
</h3>
</div>
<Select
value={department || "none"}
onValueChange={handleDepartmentChange}
disabled={disabled}
>
<SelectTrigger className="w-full h-9 text-sm">
<SelectValue placeholder="Select department" />
</SelectTrigger>
<SelectContent>
<SelectItem value="none">None</SelectItem>
{departmentOptions.map((dept) => (
<SelectItem key={dept} value={dept}>
{dept.replace(/_/g, " ").toUpperCase()}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
);
return (
<div className="flex flex-col gap-2">
<div className="flex items-center gap-2 mb-1.5">
<span className="font-medium">Department</span>
</div>
<Select
value={department || "none"}
onValueChange={handleDepartmentChange}
disabled={disabled}
>
<SelectTrigger className="w-full h-9 text-sm">
<SelectValue placeholder="Select department" />
</SelectTrigger>
<SelectContent>
<SelectItem value="none">None</SelectItem>
{departmentOptions.map((dept) => (
<SelectItem key={dept} value={dept}>
{dept.replace(/_/g, " ").toUpperCase()}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
);
}
Loading