implemented organisations on frontend

This commit is contained in:
Oliver Bryan
2025-12-23 17:24:07 +00:00
parent ea84e754e5
commit a191b9e844

View File

@@ -1,4 +1,4 @@
import type { IssueResponse, ProjectResponse, UserRecord } from "@issue/shared"; import type { IssueResponse, OrganisationResponse, ProjectResponse, UserRecord } from "@issue/shared";
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { IssueDetailPane } from "@/components/issue-detail-pane"; import { IssueDetailPane } from "@/components/issue-detail-pane";
import { IssuesTable } from "@/components/issues-table"; import { IssuesTable } from "@/components/issues-table";
@@ -12,29 +12,59 @@ function Index() {
const user = JSON.parse(localStorage.getItem("user") || "{}") as UserRecord; const user = JSON.parse(localStorage.getItem("user") || "{}") as UserRecord;
const [projectSelectOpen, setProjectSelectOpen] = useState(false); const organisationsRef = useRef(false);
const [organisations, setOrganisations] = useState<OrganisationResponse[]>([]);
const [organisationSelectOpen, setOrganisationSelectOpen] = useState(false);
const [selectedOrganisation, setSelectedOrganisation] = useState<OrganisationResponse | null>(null);
const [selectedProject, setSelectedProject] = useState<ProjectResponse | null>(null);
const [projects, setProjects] = useState<ProjectResponse[]>([]); const [projects, setProjects] = useState<ProjectResponse[]>([]);
const projectsRef = useRef(false); const [projectSelectOpen, setProjectSelectOpen] = useState(false);
const [selectedProject, setSelectedProject] = useState<ProjectResponse | null>(null);
const [issues, setIssues] = useState<IssueResponse[]>([]);
const [selectedIssue, setSelectedIssue] = useState<IssueResponse | null>(null);
useEffect(() => { useEffect(() => {
if (projectsRef.current) return; if (organisationsRef.current) return;
projectsRef.current = true; organisationsRef.current = true;
fetch(`${serverURL}/projects/by-creator?creatorId=${user.id}`, { headers: getAuthHeaders() }) fetch(`${serverURL}/organisation/by-user?userId=${user.id}`, { headers: getAuthHeaders() })
.then((res) => res.json())
.then((data: Array<OrganisationResponse>) => {
setOrganisations(data);
})
.catch((err) => {
console.error("error fetching organisations:", err);
});
}, [user.id]);
// fetch projects when organisation is selected
useEffect(() => {
setProjects([]);
setSelectedProject(null);
setSelectedIssue(null);
setIssues([]);
if (!selectedOrganisation) {
return;
}
fetch(
`${serverURL}/projects/by-organisation?organisationId=${selectedOrganisation.Organisation.id}`,
{
headers: getAuthHeaders(),
},
)
.then((res) => res.json()) .then((res) => res.json())
.then((data: ProjectResponse[]) => { .then((data: ProjectResponse[]) => {
setProjects(data); setProjects(data);
}) })
.catch((err) => { .catch((err) => {
console.error("error fetching projects:", err); console.error("error fetching projects:", err);
setProjects([]);
}); });
}, [user.id]); }, [selectedOrganisation]);
const [selectedIssue, setSelectedIssue] = useState<IssueResponse | null>(null);
const [issuesData, setIssues] = useState<IssueResponse[]>([]);
// fetch issues when project is selected
useEffect(() => { useEffect(() => {
if (!selectedProject) return; if (!selectedProject) return;
@@ -53,43 +83,86 @@ function Index() {
{/* header area */} {/* header area */}
<div className="flex gap-12 items-center justify-between"> <div className="flex gap-12 items-center justify-between">
<div className="flex gap-2 items-center"> <div className="flex gap-2 items-center">
{/* organisation selection */}
<Select <Select
value={`${selectedOrganisation?.Organisation.id}`}
onValueChange={(value) => { onValueChange={(value) => {
if (value === "NONE") { if (value === "NONE") {
setSelectedProject(null); setSelectedOrganisation(null);
setSelectedIssue(null);
setIssues([]);
}
const project = projects.find((p) => p.Project.id === Number(value));
if (!project) {
console.error(`NO PROJECT FOUND FOR ID: ${value}`);
return; return;
} }
setSelectedProject(project); const organisation = organisations.find(
setSelectedIssue(null); (o) => o.Organisation.id === Number(value),
);
if (!organisation) {
console.error(`NO ORGANISATION FOUND FOR ID: ${value}`);
return;
}
setSelectedOrganisation(organisation);
}} }}
onOpenChange={setProjectSelectOpen} onOpenChange={setOrganisationSelectOpen}
> >
<SelectTrigger className="h-8 lg:flex" isOpen={projectSelectOpen}> <SelectTrigger className="h-8 lg:flex" isOpen={organisationSelectOpen}>
<SelectValue <SelectValue
placeholder={ placeholder={
selectedProject ? `P: ${selectedProject.Project.name}` : "Select Project" selectedOrganisation
? `O: ${selectedOrganisation.Organisation.name}`
: "Select Organisation"
} }
/> />
</SelectTrigger> </SelectTrigger>
<SelectContent side="bottom" position="popper"> <SelectContent side="bottom" position="popper">
{projects.map((project) => ( {organisations.map((organisation) => (
<SelectItem key={project.Project.id} value={`${project.Project.id}`}> <SelectItem
{project.Project.name} key={organisation.Organisation.id}
value={`${organisation.Organisation.id}`}
>
{organisation.Organisation.name}
</SelectItem> </SelectItem>
))} ))}
{projects.length === 0 && <>No projects</>} {organisations.length === 0 && <>No organisations</>}
</SelectContent> </SelectContent>
</Select> </Select>
{selectedProject && (
<div className="flex items-center gap-2"> {/* project selection - only shown when organisation is selected */}
Creator: <SmallUserDisplay user={selectedProject?.User} /> {selectedOrganisation && (
</div> <Select
value={`${selectedProject?.Project.id}`}
onValueChange={(value) => {
if (value === "NONE") {
setSelectedProject(null);
setSelectedIssue(null);
setIssues([]);
return;
}
const project = projects.find((p) => p.Project.id === Number(value));
if (!project) {
console.error(`NO PROJECT FOUND FOR ID: ${value}`);
return;
}
setSelectedProject(project);
setSelectedIssue(null);
}}
onOpenChange={setProjectSelectOpen}
>
<SelectTrigger className="h-8 lg:flex" isOpen={projectSelectOpen}>
<SelectValue
placeholder={
selectedProject
? `P: ${selectedProject.Project.name}`
: "Select Project"
}
/>
</SelectTrigger>
<SelectContent side="bottom" position="popper">
{projects.map((project) => (
<SelectItem key={project.Project.id} value={`${project.Project.id}`}>
{project.Project.name}
</SelectItem>
))}
{projects.length === 0 && <>No projects in this organisation</>}
</SelectContent>
</Select>
)} )}
</div> </div>
@@ -102,12 +175,12 @@ function Index() {
</div> </div>
{/* main body */} {/* main body */}
<div className="w-full h-full flex items-start justify-between pt-1 gap-2"> <div className="w-full h-full flex items-start justify-between pt-1 gap-2">
{selectedProject && issuesData.length > 0 && ( {selectedProject && issues.length > 0 && (
<> <>
{/* issues list (table) */} {/* issues list (table) */}
<IssuesTable <IssuesTable
project={selectedProject} project={selectedProject}
issuesData={issuesData} issuesData={issues}
columns={{ description: false }} columns={{ description: false }}
issueSelectAction={setSelectedIssue} issueSelectAction={setSelectedIssue}
className="border w-full flex-shrink" className="border w-full flex-shrink"