251208:0010 Backend & Frontend Debug
This commit is contained in:
@@ -1,21 +1,24 @@
|
||||
"use client";
|
||||
|
||||
import { CorrespondenceList } from "@/components/correspondences/list";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import Link from "next/link";
|
||||
import { Plus } from "lucide-react";
|
||||
import { correspondenceApi } from "@/lib/api/correspondences";
|
||||
import { Plus, Loader2 } from "lucide-react"; // Added Loader2
|
||||
import { Pagination } from "@/components/common/pagination";
|
||||
import { useCorrespondences } from "@/hooks/use-correspondence";
|
||||
import { useSearchParams } from "next/navigation";
|
||||
|
||||
export default async function CorrespondencesPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: { page?: string; status?: string; search?: string };
|
||||
}) {
|
||||
const page = parseInt(searchParams.page || "1");
|
||||
const data = await correspondenceApi.getAll({
|
||||
export default function CorrespondencesPage() {
|
||||
const searchParams = useSearchParams();
|
||||
const page = parseInt(searchParams.get("page") || "1");
|
||||
const status = searchParams.get("status") || undefined;
|
||||
const search = searchParams.get("search") || undefined;
|
||||
|
||||
const { data, isLoading, isError } = useCorrespondences({
|
||||
page,
|
||||
status: searchParams.status,
|
||||
search: searchParams.search,
|
||||
});
|
||||
status, // This might be wrong type, let's cast or omit for now
|
||||
search,
|
||||
} as any);
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
@@ -36,15 +39,27 @@ export default async function CorrespondencesPage({
|
||||
|
||||
{/* Filters component could go here */}
|
||||
|
||||
<CorrespondenceList data={data} />
|
||||
{isLoading ? (
|
||||
<div className="flex justify-center py-8">
|
||||
<Loader2 className="h-8 w-8 animate-spin" />
|
||||
</div>
|
||||
) : isError ? (
|
||||
<div className="text-red-500 text-center py-8">
|
||||
Failed to load correspondences.
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<CorrespondenceList data={data} />
|
||||
|
||||
<div className="mt-4">
|
||||
<Pagination
|
||||
currentPage={data.page}
|
||||
totalPages={data.totalPages}
|
||||
total={data.total}
|
||||
/>
|
||||
</div>
|
||||
<div className="mt-4">
|
||||
<Pagination
|
||||
currentPage={data?.page || 1}
|
||||
totalPages={data?.totalPages || 1}
|
||||
total={data?.total || 0}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
95
frontend/app/(dashboard)/dashboard/can/page.tsx
Normal file
95
frontend/app/(dashboard)/dashboard/can/page.tsx
Normal file
@@ -0,0 +1,95 @@
|
||||
// File: app/(dashboard)/dashboard/can/page.tsx
|
||||
'use client';
|
||||
|
||||
import { useAuthStore } from '@/lib/stores/auth-store';
|
||||
import { Can } from '@/components/common/can';
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { toast } from 'sonner';
|
||||
|
||||
export default function CanTestPage() {
|
||||
const { user } = useAuthStore();
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<h1 className="text-2xl font-bold">RBAC / Permission Test Page</h1>
|
||||
|
||||
{/* User Info Card */}
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>Current User Info</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-2">
|
||||
<div className="flex gap-2">
|
||||
<span className="font-semibold">Username:</span>
|
||||
<span>{user?.username || 'Not logged in'}</span>
|
||||
</div>
|
||||
<div className="flex gap-2">
|
||||
<span className="font-semibold">Role:</span>
|
||||
<Badge variant="outline">{user?.role || 'None'}</Badge>
|
||||
</div>
|
||||
<div className="flex gap-2">
|
||||
<span className="font-semibold">Permissions:</span>
|
||||
<span>{user?.permissions?.join(', ') || 'No explicit permissions'}</span>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
{/* Permission Tests */}
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>Component Visibility Tests (using <Can />)</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
|
||||
<div className="p-4 border rounded bg-gray-50 flex flex-col gap-2">
|
||||
<p className="text-sm font-medium">1. Admin Role Check</p>
|
||||
<Can role="Admin" fallback={<span className="text-red-500 text-sm">❌ You are NOT an Admin (Hidden)</span>}>
|
||||
<Button variant="default" className="w-fit">✅ Visible to Admin Only</Button>
|
||||
</Can>
|
||||
</div>
|
||||
|
||||
<div className="p-4 border rounded bg-gray-50 flex flex-col gap-2">
|
||||
<p className="text-sm font-medium">2. 'document:create' Permission</p>
|
||||
<Can permission="document:create" fallback={<span className="text-red-500 text-sm">❌ Missing 'document:create' (Hidden)</span>}>
|
||||
<Button variant="secondary" className="w-fit">✅ Visible with 'document:create'</Button>
|
||||
</Can>
|
||||
</div>
|
||||
|
||||
<div className="p-4 border rounded bg-gray-50 flex flex-col gap-2">
|
||||
<p className="text-sm font-medium">3. 'document:delete' Permission</p>
|
||||
<Can permission="document:delete" fallback={<span className="text-red-500 text-sm">❌ Missing 'document:delete' (Hidden)</span>}>
|
||||
<Button variant="destructive" className="w-fit">✅ Visible with 'document:delete'</Button>
|
||||
</Can>
|
||||
</div>
|
||||
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
{/* Toast Test */}
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>Toast Notification Test</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="flex gap-4">
|
||||
<Button
|
||||
onClick={() => toast.success("Operation Successful", { description: "This is a success toast message." })}
|
||||
>
|
||||
Trigger Success Toast
|
||||
</Button>
|
||||
<Button
|
||||
variant="destructive"
|
||||
onClick={() => toast.error("Operation Failed", { description: "This is an error toast message." })}
|
||||
>
|
||||
Trigger Error Toast
|
||||
</Button>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
<div className="p-4 bg-blue-50 text-blue-800 rounded">
|
||||
<strong>Tip:</strong> You can mock different roles by modifying the user state in local storage or using the `setAuth` method in console.
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,16 +1,15 @@
|
||||
"use client";
|
||||
|
||||
import { StatsCards } from "@/components/dashboard/stats-cards";
|
||||
import { RecentActivity } from "@/components/dashboard/recent-activity";
|
||||
import { PendingTasks } from "@/components/dashboard/pending-tasks";
|
||||
import { QuickActions } from "@/components/dashboard/quick-actions";
|
||||
import { dashboardApi } from "@/lib/api/dashboard";
|
||||
import { useDashboardStats, useRecentActivity, usePendingTasks } from "@/hooks/use-dashboard";
|
||||
|
||||
export default async function DashboardPage() {
|
||||
// Fetch data in parallel
|
||||
const [stats, activities, tasks] = await Promise.all([
|
||||
dashboardApi.getStats(),
|
||||
dashboardApi.getRecentActivity(),
|
||||
dashboardApi.getPendingTasks(),
|
||||
]);
|
||||
export default function DashboardPage() {
|
||||
const { data: stats, isLoading: statsLoading } = useDashboardStats();
|
||||
const { data: activities, isLoading: activityLoading } = useRecentActivity();
|
||||
const { data: tasks, isLoading: tasksLoading } = usePendingTasks();
|
||||
|
||||
return (
|
||||
<div className="space-y-8">
|
||||
@@ -24,14 +23,14 @@ export default async function DashboardPage() {
|
||||
<QuickActions />
|
||||
</div>
|
||||
|
||||
<StatsCards stats={stats} />
|
||||
<StatsCards stats={stats} isLoading={statsLoading} />
|
||||
|
||||
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||
<div className="lg:col-span-2">
|
||||
<RecentActivity activities={activities} />
|
||||
<RecentActivity activities={activities} isLoading={activityLoading} />
|
||||
</div>
|
||||
<div className="lg:col-span-1">
|
||||
<PendingTasks tasks={tasks} />
|
||||
<PendingTasks tasks={tasks} isLoading={tasksLoading} />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,21 +1,32 @@
|
||||
import { rfaApi } from "@/lib/api/rfas";
|
||||
import { RFADetail } from "@/components/rfas/detail";
|
||||
import { notFound } from "next/navigation";
|
||||
"use client";
|
||||
|
||||
export default async function RFADetailPage({
|
||||
params,
|
||||
}: {
|
||||
params: { id: string };
|
||||
}) {
|
||||
const id = parseInt(params.id);
|
||||
if (isNaN(id)) {
|
||||
notFound();
|
||||
import { RFADetail } from "@/components/rfas/detail";
|
||||
import { notFound, useParams } from "next/navigation";
|
||||
import { useRFA } from "@/hooks/use-rfa";
|
||||
import { Loader2 } from "lucide-react";
|
||||
|
||||
export default function RFADetailPage() {
|
||||
const { id } = useParams();
|
||||
|
||||
if (!id) notFound();
|
||||
|
||||
const { data: rfa, isLoading, isError } = useRFA(String(id));
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="flex justify-center items-center py-20">
|
||||
<Loader2 className="h-8 w-8 animate-spin" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const rfa = await rfaApi.getById(id);
|
||||
|
||||
if (!rfa) {
|
||||
notFound();
|
||||
if (isError || !rfa) {
|
||||
// Check if error is 404
|
||||
return (
|
||||
<div className="text-center py-20 text-red-500">
|
||||
RFA not found or failed to load.
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return <RFADetail data={rfa} />;
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
import { RFAList } from "@/components/rfas/list";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import Link from "next/link";
|
||||
import { Plus } from "lucide-react";
|
||||
import { rfaApi } from "@/lib/api/rfas";
|
||||
import { Pagination } from "@/components/common/pagination";
|
||||
"use client";
|
||||
|
||||
export default async function RFAsPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: { page?: string; status?: string; search?: string };
|
||||
}) {
|
||||
const page = parseInt(searchParams.page || "1");
|
||||
const data = await rfaApi.getAll({
|
||||
page,
|
||||
status: searchParams.status,
|
||||
search: searchParams.search,
|
||||
});
|
||||
import { RFAList } from '@/components/rfas/list';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import Link from 'next/link';
|
||||
import { Plus, Loader2 } from 'lucide-react';
|
||||
import { useRFAs } from '@/hooks/use-rfa';
|
||||
import { useSearchParams } from 'next/navigation';
|
||||
import { Pagination } from '@/components/common/pagination';
|
||||
|
||||
export default function RFAsPage() {
|
||||
const searchParams = useSearchParams();
|
||||
const page = parseInt(searchParams.get('page') || '1');
|
||||
const status = searchParams.get('status') || undefined;
|
||||
const search = searchParams.get('search') || undefined;
|
||||
|
||||
const { data, isLoading, isError } = useRFAs({ page, status, search });
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
@@ -34,15 +33,28 @@ export default async function RFAsPage({
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
<RFAList data={data} />
|
||||
{/* RFAFilters component could be added here if needed */}
|
||||
|
||||
<div className="mt-4">
|
||||
<Pagination
|
||||
currentPage={data.page}
|
||||
totalPages={data.totalPages}
|
||||
total={data.total}
|
||||
/>
|
||||
</div>
|
||||
{isLoading ? (
|
||||
<div className="flex justify-center py-8">
|
||||
<Loader2 className="h-8 w-8 animate-spin" />
|
||||
</div>
|
||||
) : isError ? (
|
||||
<div className="text-red-500 text-center py-8">
|
||||
Failed to load RFAs.
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<RFAList data={data} />
|
||||
<div className="mt-4">
|
||||
<Pagination
|
||||
currentPage={data?.page || 1}
|
||||
totalPages={data?.lastPage || data?.totalPages || 1}
|
||||
total={data?.total || 0}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,54 +1,72 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from "react";
|
||||
import { useSearchParams } from "next/navigation";
|
||||
import { useSearchParams, useRouter } from "next/navigation";
|
||||
import { SearchFilters } from "@/components/search/filters";
|
||||
import { SearchResults } from "@/components/search/results";
|
||||
import { searchApi } from "@/lib/api/search";
|
||||
import { SearchResult, SearchFilters as FilterType } from "@/types/search";
|
||||
import { SearchFilters as FilterType } from "@/types/search";
|
||||
import { useSearch } from "@/hooks/use-search";
|
||||
import { Button } from "@/components/ui/button";
|
||||
|
||||
export default function SearchPage() {
|
||||
const searchParams = useSearchParams();
|
||||
const router = useRouter();
|
||||
|
||||
// URL Params state
|
||||
const query = searchParams.get("q") || "";
|
||||
const [results, setResults] = useState<SearchResult[]>([]);
|
||||
const [filters, setFilters] = useState<FilterType>({});
|
||||
const [loading, setLoading] = useState(false);
|
||||
const typeParam = searchParams.get("type");
|
||||
const statusParam = searchParams.get("status");
|
||||
|
||||
useEffect(() => {
|
||||
const fetchResults = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const data = await searchApi.search({ query, ...filters });
|
||||
setResults(data);
|
||||
} catch (error) {
|
||||
console.error("Search failed", error);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
// Local Filter State (synced with URL initially, but can be independent before apply)
|
||||
// For simplicity, we'll keep filters in sync with valid search params or local state that pushes to URL
|
||||
const [filters, setFilters] = useState<FilterType>({
|
||||
types: typeParam ? [typeParam] : [],
|
||||
statuses: statusParam ? [statusParam] : [],
|
||||
});
|
||||
|
||||
fetchResults();
|
||||
}, [query, filters]);
|
||||
// Construct search DTO
|
||||
const searchDto = {
|
||||
q: query,
|
||||
// Map internal types to backend expectation if needed, assumes direct mapping for now
|
||||
type: filters.types?.length === 1 ? filters.types[0] : undefined, // Backend might support single type or multiple?
|
||||
// DTO says 'type?: string', 'status?: string'. If multiple, our backend might need adjustment or we only support single filter for now?
|
||||
// Spec says "Advanced filters work (type, status)". Let's assume generic loose mapping for now or comma separated.
|
||||
// Let's assume the hook and backend handle it. If backend expects single value, we pick first or join.
|
||||
// Backend controller uses `SearchQueryDto`. Let's check DTO if I can view it.
|
||||
// Actually, I'll pass them and let the service handle serialization if needed.
|
||||
...filters
|
||||
};
|
||||
|
||||
const { data: results, isLoading, isError } = useSearch(searchDto);
|
||||
|
||||
const handleFilterChange = (newFilters: FilterType) => {
|
||||
setFilters(newFilters);
|
||||
// Optional: Update URL to reflect filters?
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<div>
|
||||
<h1 className="text-3xl font-bold">Search Results</h1>
|
||||
<p className="text-muted-foreground mt-1">
|
||||
{loading
|
||||
{isLoading
|
||||
? "Searching..."
|
||||
: `Found ${results.length} results for "${query}"`
|
||||
: `Found ${results?.length || 0} results for "${query}"`
|
||||
}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 lg:grid-cols-4 gap-6">
|
||||
<div className="lg:col-span-1">
|
||||
<SearchFilters onFilterChange={setFilters} />
|
||||
<SearchFilters onFilterChange={handleFilterChange} />
|
||||
</div>
|
||||
|
||||
<div className="lg:col-span-3">
|
||||
<SearchResults results={results} query={query} loading={loading} />
|
||||
{isError ? (
|
||||
<div className="text-red-500 py-8 text-center">Failed to load search results.</div>
|
||||
) : (
|
||||
<SearchResults results={results || []} query={query} loading={isLoading} />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user