-
+ {!evidence.published && (
+
+ )}
);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/Components/UrlSection.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/UrlSection.tsx
similarity index 98%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/Components/UrlSection.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/UrlSection.tsx
index 2ccf6ecad5..047c58a815 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/Components/UrlSection.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/components/UrlSection.tsx
@@ -1,17 +1,16 @@
"use client";
+import { Badge } from "@bubba/ui/badge";
import { Button } from "@bubba/ui/button";
import { Input } from "@bubba/ui/input";
-import { Card, CardContent } from "@bubba/ui/card";
-import { Plus, Trash, Save, Link, ExternalLink, Copy } from "lucide-react";
-import { useUrlManagement } from "../hooks/useUrlManagement";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@bubba/ui/tooltip";
-import { Badge } from "@bubba/ui/badge";
+import { Copy, ExternalLink, Link, Plus, Save, Trash } from "lucide-react";
+import { useUrlManagement } from "../hooks/useUrlManagement";
interface UrlSectionProps {
evidenceId: string;
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/components/EditEvidenceForm.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/components/EditEvidenceForm.tsx
new file mode 100644
index 0000000000..224acffc7d
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/components/EditEvidenceForm.tsx
@@ -0,0 +1,62 @@
+"use client";
+
+import { Card, CardContent, CardHeader, CardTitle } from "@bubba/ui/card";
+import { Skeleton } from "@bubba/ui/skeleton";
+import { useI18n } from "@/locales/client";
+import { useParams } from "next/navigation";
+import { useOrganizationEvidence } from "../../hooks/useOrganizationEvidence";
+import { FileSection } from "../../components/FileSection";
+import { UrlSection } from "../../components/UrlSection";
+
+export function EditEvidenceForm() {
+ const { id } = useParams<{ id: string }>();
+ const { data, isLoading, error, mutate } = useOrganizationEvidence({ id });
+ const t = useI18n();
+
+ if (isLoading) {
+ return (
+
+
+
+
+
+ );
+ }
+
+ if (error) {
+ return
Error
;
+ }
+
+ const handleMutate = async () => {
+ await mutate();
+ };
+
+ if (!data?.data) return null;
+
+ const evidence = data.data;
+
+ return (
+
+
+
+
+ {t("evidence.details.content")}
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/page.tsx
new file mode 100644
index 0000000000..bc9adfb586
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/edit/page.tsx
@@ -0,0 +1,5 @@
+import { EditEvidenceForm } from "./components/EditEvidenceForm";
+
+export default async function EditEvidencePage() {
+ return
;
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileDelete.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileDelete.ts
index 0765c11eab..70b645cfd3 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileDelete.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileDelete.ts
@@ -2,7 +2,7 @@
import { useCallback } from "react";
import { useToast } from "@bubba/ui/use-toast";
-import { deleteEvidenceFile } from "../Actions/deleteEvidenceFile";
+import { deleteEvidenceFile } from "../actions/deleteEvidenceFile";
interface UseFileDeleteProps {
evidenceId: string;
@@ -43,7 +43,7 @@ export function useFileDelete({ evidenceId, onSuccess }: UseFileDeleteProps) {
});
}
},
- [evidenceId, onSuccess, toast],
+ [evidenceId, onSuccess, toast]
);
return {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFilePreview.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFilePreview.ts
index a82523711d..6ba6a9102e 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFilePreview.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFilePreview.ts
@@ -2,7 +2,7 @@
import { useCallback, useState } from "react";
import { useToast } from "@bubba/ui/use-toast";
-import { getEvidenceFileUrl } from "../Actions/getEvidenceFileUrl";
+import { getEvidenceFileUrl } from "../actions/getEvidenceFileUrl";
interface UseFilePreviewProps {
evidenceId: string;
@@ -60,7 +60,7 @@ export function useFilePreview({
setIsLoading(false);
}
},
- [evidenceId, toast],
+ [evidenceId, toast]
);
return {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileUpload.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileUpload.ts
index c57995e42e..4bc7722e10 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileUpload.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useFileUpload.ts
@@ -2,7 +2,7 @@
import { useCallback, useState } from "react";
import { useToast } from "@bubba/ui/use-toast";
-import { getUploadUrl } from "../Actions/uploadEvidenceFile";
+import { getUploadUrl } from "../actions/uploadEvidenceFile";
import axios, { type AxiosProgressEvent } from "axios";
interface UploadUrlResponse {
@@ -71,7 +71,7 @@ export function useFileUpload({
onUploadProgress: (progressEvent: AxiosProgressEvent): void => {
if (progressEvent.total) {
const percentCompleted = Math.round(
- (progressEvent.loaded * 100) / progressEvent.total,
+ (progressEvent.loaded * 100) / progressEvent.total
);
console.debug(`Upload progress: ${percentCompleted}%`);
}
@@ -104,7 +104,7 @@ export function useFileUpload({
setIsUploading(false);
}
},
- [evidenceId, onSuccess, toast],
+ [evidenceId, onSuccess, toast]
);
return {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins.ts
index fc366cd679..66d94fbc7a 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationAdmins.ts
@@ -1,7 +1,7 @@
"use client";
import useSWR from "swr";
-import { getOrganizationAdmins } from "../../Actions/getOrganizationAdmins";
+import { getOrganizationAdmins } from "../../actions/getOrganizationAdmins";
export interface Admin {
id: string;
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationEvidence.ts
index 17a1c175d5..4754cb514b 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationEvidence.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useOrganizationEvidence.ts
@@ -1,7 +1,7 @@
"use client";
import useSWR from "swr";
-import { getOrganizationEvidenceById } from "../../Actions/getOrganizationEvidence";
+import { getOrganizationEvidenceById } from "../../actions/getOrganizationEvidence";
interface UseOrganizationEvidenceProps {
id: string;
@@ -14,7 +14,7 @@ async function fetchOrganizationEvidence({ id }: UseOrganizationEvidenceProps) {
throw new Error(
typeof result?.error === "string"
? result.error
- : "Failed to fetch organization evidence",
+ : "Failed to fetch organization evidence"
);
}
@@ -28,6 +28,6 @@ export function useOrganizationEvidence({ id }: UseOrganizationEvidenceProps) {
{
revalidateOnFocus: false,
revalidateOnReconnect: false,
- },
+ }
);
}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useUrlManagement.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useUrlManagement.ts
index e53a635654..e051e2191e 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useUrlManagement.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/hooks/useUrlManagement.ts
@@ -2,7 +2,7 @@
import { useState, useCallback } from "react";
import { useToast } from "@bubba/ui/use-toast";
-import { updateEvidenceUrls } from "../Actions/updateEvidenceUrls";
+import { updateEvidenceUrls } from "../actions/updateEvidenceUrls";
import type { ActionResponse } from "@/actions/types";
interface DraftUrl {
@@ -62,7 +62,7 @@ export function useUrlManagement({
const handleUpdateDraft = useCallback((id: string, url: string) => {
setDraftUrls((prev) =>
- prev.map((draft) => (draft.id === id ? { ...draft, url } : draft)),
+ prev.map((draft) => (draft.id === id ? { ...draft, url } : draft))
);
}, []);
@@ -151,7 +151,7 @@ export function useUrlManagement({
});
}
},
- [currentUrls, evidenceId, onSuccess, toast],
+ [currentUrls, evidenceId, onSuccess, toast]
);
return {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/layout.tsx
new file mode 100644
index 0000000000..1e0bf26c89
--- /dev/null
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/layout.tsx
@@ -0,0 +1,39 @@
+import { getI18n } from "@/locales/server";
+import { SecondaryMenu } from "@bubba/ui/secondary-menu";
+import { headers } from "next/headers";
+
+export default async function Layout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ const t = await getI18n();
+ const headersList = await headers();
+ const pathname = headersList.get("x-pathname") || "";
+ const isEvidenceDetails = /\/evidence\/[a-z0-9]+/.test(pathname);
+ const pathParts = pathname.split("/");
+ const evidenceIndex = pathParts.findIndex((part) => part === "evidence");
+ const id =
+ evidenceIndex >= 0 && pathParts.length > evidenceIndex + 1
+ ? pathParts[evidenceIndex + 1]
+ : "";
+
+ return (
+
+
+
+ {children}
+
+ );
+}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/page.tsx
index 8402abb4f4..1e1b3aac38 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/[id]/page.tsx
@@ -1,4 +1,4 @@
-import { EvidenceDetails } from "./Components/EvidenceDetails";
+import { EvidenceDetails } from "./components/EvidenceDetails";
interface EvidencePageProps {
params: Promise<{
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getAllOrganizationControlRequirements.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getAllOrganizationControlRequirements.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getAllOrganizationControlRequirements.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getAllOrganizationControlRequirements.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidence.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getEvidence.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidence.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getEvidenceTasksStats.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidenceTasksStats.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getEvidenceTasksStats.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getEvidenceTasksStats.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationAdmins.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationAdmins.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationAdmins.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationAdmins.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationEmployees.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEmployees.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationEmployees.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEmployees.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationEvidence.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidence.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationEvidence.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidence.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationEvidenceTasks.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidenceTasks.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Actions/getOrganizationEvidenceTasks.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/actions/getOrganizationEvidenceTasks.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/ActiveFilterBadges.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/ActiveFilterBadges.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/ActiveFilterBadges.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/ActiveFilterBadges.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/FilterDropdown.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/FilterDropdown.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/FilterDropdown.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/FilterDropdown.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/PaginationControls.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/PaginationControls.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/PaginationControls.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/PaginationControls.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/SearchInput.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/SearchInput.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/SearchInput.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/SearchInput.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceFilters/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceFilters/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceList.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceList.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceList.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceList.tsx
index 47e1182eea..bf7707ab42 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceList.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceList.tsx
@@ -1,15 +1,15 @@
"use client";
-import { DataTable } from "./data-table/EvidenceListTable";
import { useI18n } from "@/locales/client";
-import { SkeletonTable } from "./SkeletonTable";
+import { useEvidenceTable } from "../hooks/useEvidenceTableContext";
+import { DataTable } from "./data-table/EvidenceListTable";
import {
- FilterDropdown,
ActiveFilterBadges,
+ FilterDropdown,
PaginationControls,
SearchInput,
} from "./EvidenceFilters";
-import { useEvidenceTable } from "../hooks/useEvidenceTableContext";
+import { SkeletonTable } from "./SkeletonTable";
import { EvidenceSummaryCards } from "./EvidenceSummaryCards";
export function EvidenceList() {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceSummaryCards.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceSummaryCards.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/EvidenceSummaryCards.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/EvidenceSummaryCards.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/SkeletonTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/SkeletonTable.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/SkeletonTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/SkeletonTable.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/EvidenceListTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/EvidenceListTable.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/EvidenceListTable.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/EvidenceListTable.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/columns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/columns.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/columns.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/columns.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/data-table-header.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/data-table-header.tsx
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/data-table-header.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/data-table-header.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/types.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/types.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/data-table/types.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/data-table/types.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/index.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/index.ts
similarity index 100%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/Components/index.ts
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/components/index.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTableContext.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTableContext.tsx
index fad65db559..1243b9e8a4 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTableContext.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTableContext.tsx
@@ -3,212 +3,212 @@
import { createContext, useContext, useMemo, type ReactNode } from "react";
import { useQueryState } from "nuqs";
import { useOrganizationEvidenceTasks } from "./useEvidenceTasks";
-import type { EvidenceTaskRow } from "../Components/data-table/types";
+import type { EvidenceTaskRow } from "../components/data-table/types";
import { ALL_DEPARTMENTS, ALL_FREQUENCIES } from "../constants";
import type { Frequency, Departments } from "@bubba/db";
interface Assignee {
- id: string;
- name: string | null;
- image: string | null;
+ id: string;
+ name: string | null;
+ image: string | null;
}
interface EvidenceTableContextType {
- // State
- search: string | null;
- status: string | null;
- frequency: string | null;
- department: string | null;
- assigneeId: string | null;
- relevance: string | null;
- page: string;
- pageSize: string;
-
- // Setters
- setSearch: (value: string | null) => void;
- setStatus: (value: string | null) => void;
- setFrequency: (value: string | null) => void;
- setDepartment: (value: string | null) => void;
- setAssigneeId: (value: string | null) => void;
- setRelevance: (value: string | null) => void;
- setPage: (value: string) => void;
- setPageSize: (value: string) => void;
- mutate: () => void;
-
- // Data
- evidenceTasks: EvidenceTaskRow[] | undefined;
- pagination:
- | {
- totalCount: number;
- totalPages: number;
- hasNextPage: boolean;
- hasPreviousPage: boolean;
- }
- | undefined;
- isLoading: boolean;
- error: Error | undefined;
-
- // Derived data
- frequencies: Frequency[];
- departments: Departments[];
- assignees: Assignee[];
- hasActiveFilters: boolean;
-
- // Actions
- clearFilters: () => void;
+ // State
+ search: string | null;
+ status: string | null;
+ frequency: string | null;
+ department: string | null;
+ assigneeId: string | null;
+ relevance: string | null;
+ page: string;
+ pageSize: string;
+
+ // Setters
+ setSearch: (value: string | null) => void;
+ setStatus: (value: string | null) => void;
+ setFrequency: (value: string | null) => void;
+ setDepartment: (value: string | null) => void;
+ setAssigneeId: (value: string | null) => void;
+ setRelevance: (value: string | null) => void;
+ setPage: (value: string) => void;
+ setPageSize: (value: string) => void;
+ mutate: () => void;
+
+ // Data
+ evidenceTasks: EvidenceTaskRow[] | undefined;
+ pagination:
+ | {
+ totalCount: number;
+ totalPages: number;
+ hasNextPage: boolean;
+ hasPreviousPage: boolean;
+ }
+ | undefined;
+ isLoading: boolean;
+ error: Error | undefined;
+
+ // Derived data
+ frequencies: Frequency[];
+ departments: Departments[];
+ assignees: Assignee[];
+ hasActiveFilters: boolean;
+
+ // Actions
+ clearFilters: () => void;
}
const EvidenceTableContext = createContext<
- EvidenceTableContextType | undefined
+ EvidenceTableContextType | undefined
>(undefined);
export function EvidenceTableProvider({ children }: { children: ReactNode }) {
- // Query state
- const [search, setSearch] = useQueryState("search");
- const [status, setStatus] = useQueryState("status");
- const [frequency, setFrequency] = useQueryState("frequency");
- const [department, setDepartment] = useQueryState("department");
- const [assigneeId, setAssigneeId] = useQueryState("assigneeId");
- const [relevance, setRelevance] = useQueryState("relevance");
- const [page, setPage] = useQueryState("page", { defaultValue: "1" });
- const [pageSize, setPageSize] = useQueryState("pageSize", {
- defaultValue: "10",
- });
-
- const currentPage = Number.parseInt(page, 10);
- const currentPageSize = Number.parseInt(pageSize, 10);
-
- // Fetch data
- const {
- data: rawEvidenceTasks,
- pagination,
- isLoading,
- error,
- mutate,
- } = useOrganizationEvidenceTasks({
- search,
- status: status as "published" | "draft" | null,
- frequency: frequency as any,
- department: department as any,
- assigneeId,
- relevance: relevance as "relevant" | "not-relevant" | null,
- page: currentPage,
- pageSize: currentPageSize,
- });
-
- // Format data for the table
- const evidenceTasks = useMemo(() => {
- return rawEvidenceTasks?.map((task) => ({
- ...task,
- evidence: {
- name: task.name,
- },
- })) as EvidenceTaskRow[] | undefined;
- }, [rawEvidenceTasks]);
-
- // Predefined frequencies and departments
- const frequencies = useMemo(() => ALL_FREQUENCIES, []);
- const departments = useMemo(() => ALL_DEPARTMENTS, []);
-
- // Get unique assignees for the dropdown
- const assignees = useMemo(() => {
- if (!evidenceTasks) return [];
-
- const uniqueAssignees = new Map<
- string,
- { id: string; name: string | null; image: string | null }
- >();
-
- for (const task of evidenceTasks) {
- if (task.assignee) {
- uniqueAssignees.set(task.assignee.id, {
- id: task.assignee.id,
- name: task.assignee.name,
- image: task.assignee.image,
- });
- }
- }
-
- return Array.from(uniqueAssignees.values()).sort((a, b) => {
- return (a.name || "").localeCompare(b.name || "");
- });
- }, [evidenceTasks]);
-
- // Check if any filters are active
- const hasActiveFilters = useMemo(() => {
- return (
- status !== null ||
- frequency !== null ||
- department !== null ||
- assigneeId !== null ||
- relevance !== null
- );
- }, [status, frequency, department, assigneeId, relevance]);
-
- // Clear all filters
- const clearFilters = () => {
- setStatus(null);
- setFrequency(null);
- setDepartment(null);
- setAssigneeId(null);
- setRelevance(null);
- setPage("1"); // Reset to first page when clearing filters
- };
-
- // Create context value
- const contextValue = {
- // State
- search,
- status,
- frequency,
- department,
- assigneeId,
- relevance,
- page,
- pageSize,
-
- // Setters
- setSearch,
- setStatus,
- setFrequency,
- setDepartment,
- setAssigneeId,
- setRelevance,
- setPage,
- setPageSize,
- mutate,
-
- // Data
- evidenceTasks,
- pagination,
- isLoading,
- error,
-
- // Derived data
- frequencies,
- departments,
- assignees,
- hasActiveFilters,
-
- // Actions
- clearFilters,
- };
-
- return (
-
- {children}
-
- );
+ // Query state
+ const [search, setSearch] = useQueryState("search");
+ const [status, setStatus] = useQueryState("status");
+ const [frequency, setFrequency] = useQueryState("frequency");
+ const [department, setDepartment] = useQueryState("department");
+ const [assigneeId, setAssigneeId] = useQueryState("assigneeId");
+ const [relevance, setRelevance] = useQueryState("relevance");
+ const [page, setPage] = useQueryState("page", { defaultValue: "1" });
+ const [pageSize, setPageSize] = useQueryState("pageSize", {
+ defaultValue: "10",
+ });
+
+ const currentPage = Number.parseInt(page, 10);
+ const currentPageSize = Number.parseInt(pageSize, 10);
+
+ // Fetch data
+ const {
+ data: rawEvidenceTasks,
+ pagination,
+ isLoading,
+ error,
+ mutate,
+ } = useOrganizationEvidenceTasks({
+ search,
+ status: status as "published" | "draft" | null,
+ frequency: frequency as any,
+ department: department as any,
+ assigneeId,
+ relevance: relevance as "relevant" | "not-relevant" | null,
+ page: currentPage,
+ pageSize: currentPageSize,
+ });
+
+ // Format data for the table
+ const evidenceTasks = useMemo(() => {
+ return rawEvidenceTasks?.map((task) => ({
+ ...task,
+ evidence: {
+ name: task.name,
+ },
+ })) as EvidenceTaskRow[] | undefined;
+ }, [rawEvidenceTasks]);
+
+ // Predefined frequencies and departments
+ const frequencies = useMemo(() => ALL_FREQUENCIES, []);
+ const departments = useMemo(() => ALL_DEPARTMENTS, []);
+
+ // Get unique assignees for the dropdown
+ const assignees = useMemo(() => {
+ if (!evidenceTasks) return [];
+
+ const uniqueAssignees = new Map<
+ string,
+ { id: string; name: string | null; image: string | null }
+ >();
+
+ for (const task of evidenceTasks) {
+ if (task.assignee) {
+ uniqueAssignees.set(task.assignee.id, {
+ id: task.assignee.id,
+ name: task.assignee.name,
+ image: task.assignee.image,
+ });
+ }
+ }
+
+ return Array.from(uniqueAssignees.values()).sort((a, b) => {
+ return (a.name || "").localeCompare(b.name || "");
+ });
+ }, [evidenceTasks]);
+
+ // Check if any filters are active
+ const hasActiveFilters = useMemo(() => {
+ return (
+ status !== null ||
+ frequency !== null ||
+ department !== null ||
+ assigneeId !== null ||
+ relevance !== null
+ );
+ }, [status, frequency, department, assigneeId, relevance]);
+
+ // Clear all filters
+ const clearFilters = () => {
+ setStatus(null);
+ setFrequency(null);
+ setDepartment(null);
+ setAssigneeId(null);
+ setRelevance(null);
+ setPage("1"); // Reset to first page when clearing filters
+ };
+
+ // Create context value
+ const contextValue = {
+ // State
+ search,
+ status,
+ frequency,
+ department,
+ assigneeId,
+ relevance,
+ page,
+ pageSize,
+
+ // Setters
+ setSearch,
+ setStatus,
+ setFrequency,
+ setDepartment,
+ setAssigneeId,
+ setRelevance,
+ setPage,
+ setPageSize,
+ mutate,
+
+ // Data
+ evidenceTasks,
+ pagination,
+ isLoading,
+ error,
+
+ // Derived data
+ frequencies,
+ departments,
+ assignees,
+ hasActiveFilters,
+
+ // Actions
+ clearFilters,
+ };
+
+ return (
+
+ {children}
+
+ );
}
export function useEvidenceTable() {
- const context = useContext(EvidenceTableContext);
+ const context = useContext(EvidenceTableContext);
- if (context === undefined) {
- throw new Error(
- "useEvidenceTable must be used within an EvidenceTableProvider",
- );
- }
+ if (context === undefined) {
+ throw new Error(
+ "useEvidenceTable must be used within an EvidenceTableProvider",
+ );
+ }
- return context;
+ return context;
}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasks.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasks.ts
index e6d30ef9f0..835e225b64 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasks.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasks.ts
@@ -1,8 +1,8 @@
"use client";
import useSWR from "swr";
-import { getOrganizationEvidenceTasks } from "../Actions/getOrganizationEvidenceTasks";
-import type { PaginationMetadata } from "../Actions/getOrganizationEvidenceTasks";
+import { getOrganizationEvidenceTasks } from "../actions/getOrganizationEvidenceTasks";
+import type { PaginationMetadata } from "../actions/getOrganizationEvidenceTasks";
import type { Frequency, OrganizationEvidence, Departments } from "@bubba/db";
// Define the props interface with clear types
@@ -42,7 +42,7 @@ async function fetchEvidenceTasks(props: UseOrganizationEvidenceTasksProps) {
if (result.validationErrors) {
throw new Error(
- result.validationErrors._errors?.join(", ") ?? "Unknown error",
+ result.validationErrors._errors?.join(", ") ?? "Unknown error"
);
}
@@ -58,7 +58,7 @@ async function fetchEvidenceTasks(props: UseOrganizationEvidenceTasksProps) {
}
export function useOrganizationEvidenceTasks(
- props: UseOrganizationEvidenceTasksProps = {},
+ props: UseOrganizationEvidenceTasksProps = {}
): UseOrganizationEvidenceTasksResult {
const {
search,
@@ -93,7 +93,7 @@ export function useOrganizationEvidenceTasks(
relevance,
page,
pageSize,
- }),
+ })
);
console.log("useOrganizationEvidenceTasks data:", data);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasksStats.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasksStats.ts
index 847c7f4e1e..abae25586b 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasksStats.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/hooks/useEvidenceTasksStats.ts
@@ -1,8 +1,7 @@
"use client";
import useSWR from "swr";
-import { getEvidenceTasksStats } from "../Actions/getEvidenceTasksStats";
-import type { EvidenceTasksStats } from "../Actions/getEvidenceTasksStats";
+import { getEvidenceTasksStats } from "../actions/getEvidenceTasksStats";
// Define a simpler fetcher function
async function fetchEvidenceTasksStats() {
@@ -19,7 +18,7 @@ async function fetchEvidenceTasksStats() {
if (result.validationErrors) {
throw new Error(
- result.validationErrors._errors?.join(", ") ?? "Unknown error",
+ result.validationErrors._errors?.join(", ") ?? "Unknown error"
);
}
@@ -37,7 +36,7 @@ export function useEvidenceTasksStats() {
{
revalidateOnFocus: false,
revalidateOnReconnect: false,
- },
+ }
);
return {
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/layout.tsx
similarity index 85%
rename from apps/app/src/app/[locale]/(app)/(dashboard)/evidence/layout.tsx
rename to apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/layout.tsx
index 6a6f897fa5..063655d889 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/layout.tsx
@@ -6,7 +6,6 @@ export default async function Layout({
}: {
children: React.ReactNode;
}) {
- // TODO: Implement i18n, build was failing.
const t = await getI18n();
return (
@@ -15,7 +14,7 @@ export default async function Layout({
items={[
{
path: "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/evidence/overview",
- label: t("evidence.dashboard"),
+ label: t("evidence.dashboard.layout"),
},
{ path: "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/evidence/list", label: t("evidence.list") },
]}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/page.tsx
index bc459bbf25..3c25a83bd7 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/list/page.tsx
@@ -1,10 +1,10 @@
-import { EvidenceList } from "../Components/EvidenceList";
+import { EvidenceList } from "../components/EvidenceList";
import { EvidenceTableProvider } from "../hooks/useEvidenceTableContext";
export default function EvidencePage() {
- return (
-
-
-
- );
+ return (
+
+
+
+ );
}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeBarChart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeBarChart.tsx
index e40c598348..ba710270cc 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeBarChart.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/evidence/overview/components/AssigneeBarChart.tsx
@@ -4,18 +4,19 @@ import React, { useEffect, useRef, useState } from "react";
import { HorizontalBarChart, type ChartDataItem } from "./HorizontalBarChart";
import type { EvidenceWithStatus } from "../actions/getEvidenceDashboard";
import { ChevronDown, ChevronUp } from "lucide-react";
+import { useI18n } from "@/locales/client";
interface AssigneeBarChartProps {
byAssignee?: Record
;
unassigned?: EvidenceWithStatus[];
}
-// Status colors matching the EvidenceSummaryCards
+// Status colors using CSS variables to match policies-by-assignee.tsx
const STATUS_COLORS = {
- empty: "#6b7280", // Gray for empty
- draft: "#f59e0b", // Amber for draft
- needsReview: "#ef4444", // Red for needs review
- upToDate: "#10b981", // Green for up to date
+ upToDate: "bg-primary",
+ draft: "bg-[var(--chart-open)]",
+ needsReview: "bg-[hsl(var(--destructive))]",
+ empty: "bg-[var(--chart-pending)]",
};
// Status priority order for display (determines the order in the bar)
@@ -26,6 +27,7 @@ export function AssigneeBarChart({
byAssignee,
unassigned = [],
}: AssigneeBarChartProps) {
+ const t = useI18n();
const containerRef = useRef(null);
const [canScrollDown, setCanScrollDown] = useState(false);
const [canScrollUp, setCanScrollUp] = useState(false);
@@ -74,7 +76,7 @@ export function AssigneeBarChart({
if (firstAssignee && firstAssignee.length > 0) {
console.log(
"First assignee's first item status:",
- firstAssignee[0].status,
+ firstAssignee[0].status
);
}
}
@@ -110,7 +112,7 @@ export function AssigneeBarChart({
items,
statusCounts,
};
- },
+ }
);
// Add unassigned items if any
@@ -156,14 +158,9 @@ export function AssigneeBarChart({
if (assignee.statusCounts[status] > 0) {
chartData.push({
key: status,
- label:
- status === "upToDate"
- ? "Up to Date"
- : status === "needsReview"
- ? "Needs Review"
- : status.charAt(0).toUpperCase() + status.slice(1),
+ label: getStatusLabel(status, t),
value: assignee.statusCounts[status],
- color: STATUS_COLORS[status],
+ color: getStatusColor(status),
});
}
}
@@ -173,7 +170,7 @@ export function AssigneeBarChart({
{assignee.name}
- {assignee.totalItems} items
+ {assignee.totalItems} {t("evidence.items")}
@@ -184,6 +181,24 @@ export function AssigneeBarChart({
valueFormatter={(value) => `${value}`}
height={12}
/>
+
+ {/* Legend - similar to policies-by-assignee.tsx */}
+
+ {STATUS_PRIORITY.map((status) => {
+ if (assignee.statusCounts[status] > 0) {
+ return (
+
+
+
+ {getStatusLabel(status, t)} (
+ {assignee.statusCounts[status]})
+
+
+ );
+ }
+ return null;
+ })}
+
);
})}
@@ -206,3 +221,35 @@ export function AssigneeBarChart({