@@ -69,15 +81,8 @@ const IssueDetail = ({ issue }: Props) => {
onOpenChange={setOpen}
open={open}
issue={issue}
- loading={isPending}
- onDelete={() => {
- deleteIssue(issue.id, {
- onSuccess: () => {
- setOpen(false);
- router.replace('/dashboard/issue/list');
- },
- });
- }}
+ loading={isLoading}
+ onDelete={handleDelete}
/>
diff --git a/app/dashboard/issue/[id]/page.tsx b/app/dashboard/issue/[id]/page.tsx
index 233e205..d85310d 100644
--- a/app/dashboard/issue/[id]/page.tsx
+++ b/app/dashboard/issue/[id]/page.tsx
@@ -1,6 +1,6 @@
import { notFound } from 'next/navigation';
-import { getIssueDetail } from '@/app/actions/issue';
+import { getIssueDetail } from '@/lib/actions/issue';
import IssueDetail from './IssueDetail';
diff --git a/app/dashboard/issue/board/Board.tsx b/app/dashboard/issue/board/Board.tsx
index 1a832d0..ddca77e 100644
--- a/app/dashboard/issue/board/Board.tsx
+++ b/app/dashboard/issue/board/Board.tsx
@@ -4,9 +4,8 @@ import type { DragEndEvent } from '@dnd-kit/core';
import type { Status } from '@prisma/client';
import React, { useState } from 'react';
-import useUpdateIssue from '@/hooks/issue/useUpdateIssue';
import { groupBy } from '@/lib/utils';
-import type { Issue } from '@/types';
+import type { IssueList } from '@/types';
import Column from './Column';
import { KanbanBoard, KanbanBoardContainer } from './Kanban';
@@ -14,27 +13,26 @@ import KanbanCard from './KanbanCard';
import KanbanItem from './KanbanItem';
type Props = {
- data: Issue[];
+ data: IssueList[];
};
const Board = ({ data }: React.PropsWithChildren
) => {
- const initialState: Record = {
+ const initialState: Record = {
TODO: [],
BACKLOG: [],
IN_PROGRESS: [],
DONE: [],
CANCELLED: [],
};
- const { mutate: updateIssueStatus } = useUpdateIssue();
const [taskStages, setTaskStages] = useState({
...initialState,
- ...groupBy(data, (item) => item.status),
+ ...groupBy(data, (item) => item.status),
});
const handleOnDragEnd = (event: DragEndEvent) => {
const status = event.over?.id as undefined | Status | null;
const taskId = event.active.id as string;
- const issue = event.active.data.current?.issue as Issue;
+ const issue = event.active.data.current?.issue as IssueList;
const prevStatus = event.active.data.current?.prevStatus as Status;
if (status) {
@@ -47,18 +45,6 @@ const Board = ({ data }: React.PropsWithChildren) => {
state[status].push({ ...issue, status });
setTaskStages(state);
- updateIssueStatus(
- { id: Number(taskId), data: { ...issue, status } },
-
- {
- onSuccess: () => {
- alert('Status Updated');
- },
- onError: () => {
- setTaskStages(taskStages);
- },
- },
- );
}
};
diff --git a/app/dashboard/issue/board/KanbanCard.tsx b/app/dashboard/issue/board/KanbanCard.tsx
index 4c03703..dfb69a0 100644
--- a/app/dashboard/issue/board/KanbanCard.tsx
+++ b/app/dashboard/issue/board/KanbanCard.tsx
@@ -1,6 +1,6 @@
-import type { Issue } from '@/types';
+import type { IssueList } from '@/types';
-const KanbanCard = ({ issue }: { issue: Issue }) => {
+const KanbanCard = ({ issue }: { issue: IssueList }) => {
return (
diff --git a/app/dashboard/issue/board/page.tsx b/app/dashboard/issue/board/page.tsx
index 2085317..425fa0b 100644
--- a/app/dashboard/issue/board/page.tsx
+++ b/app/dashboard/issue/board/page.tsx
@@ -1,11 +1,11 @@
-import { getAllIssues } from '@/app/actions/issue';
+import { getBoardIssues } from '@/lib/actions/issue';
import Board from './Board';
export const dynamic = 'force-dynamic';
export default async function Page() {
- const data = await getAllIssues();
+ const issues = await getBoardIssues();
- return
-
Edit Issue
- ({
params.delete('q');
}
router.replace(`${currentPath}?${params.toString()}`);
- }, 500);
+ }, 200);
return (
<>
diff --git a/app/dashboard/issue/list/data-table/DataTablePagination.tsx b/app/dashboard/issue/list/data-table/DataTablePagination.tsx
index 024059d..805fdb2 100644
--- a/app/dashboard/issue/list/data-table/DataTablePagination.tsx
+++ b/app/dashboard/issue/list/data-table/DataTablePagination.tsx
@@ -5,6 +5,7 @@ import {
ChevronsRightIcon,
} from 'lucide-react';
import { usePathname, useRouter, useSearchParams } from 'next/navigation';
+import React from 'react';
import { Button } from '@/components/ui/button';
import {
@@ -21,6 +22,29 @@ interface DataTablePaginationProps {
metadata: MetaData;
}
+const PaginationButton = ({
+ onClick,
+ disabled,
+ title,
+ children,
+}: {
+ onClick: () => void;
+ disabled: boolean;
+ title: string;
+} & React.PropsWithChildren) => {
+ return (
+
+ {title}
+ {children}
+
+ );
+};
+
export function DataTablePagination({ metadata }: DataTablePaginationProps) {
const router = useRouter();
const currentPath = usePathname();
@@ -70,7 +94,7 @@ export function DataTablePagination({ metadata }: DataTablePaginationProps) {
}}
>
-
{[10, 20, 30, 40, 50].map((pageSize) => (
@@ -85,48 +109,40 @@ export function DataTablePagination({ metadata }: DataTablePaginationProps) {
Page {currentPage} of {pageCount}
-
updatePagination({ page: 1, limit: currentLimit })}
+ updatePagination({ page: 1, limit: currentLimit })}
+ title="Go to first page"
>
- Go to first page
-
+
updatePagination({ page: currentPage - 1, limit: currentLimit })
}
disabled={currentPage === 1}
>
- Go to previous page
-
+
updatePagination({ page: currentPage + 1, limit: currentLimit })
}
disabled={currentPage === pageCount}
+ title="Go to next page"
>
- Go to next page
-
+
updatePagination({ page: pageCount, limit: currentLimit })
}
disabled={currentPage === pageCount}
>
- Go to last page
+
diff --git a/app/dashboard/issue/list/data-table/columns.tsx b/app/dashboard/issue/list/data-table/columns.tsx
index 8a61ede..0c10b20 100644
--- a/app/dashboard/issue/list/data-table/columns.tsx
+++ b/app/dashboard/issue/list/data-table/columns.tsx
@@ -1,34 +1,18 @@
'use client';
-/* eslint-disable react-hooks/rules-of-hooks */
-
import type { ColumnDef } from '@tanstack/react-table';
-import { MoreHorizontal } from 'lucide-react';
import Link from 'next/link';
-import { useRouter } from 'next/navigation';
-import { useState } from 'react';
-import DeleteDialog from '@/components/DeleteDialog';
-import { AlertDialogTrigger } from '@/components/ui/alert-dialog';
-import { Button } from '@/components/ui/button';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import useDeleteIssue from '@/hooks/issue/useDeleteIssue';
-import { formatDate } from '@/lib/utils';
-import type { Issue } from '@/types';
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
+import { formatDate, getInitials } from '@/lib/utils';
+import type { IssueList } from '@/types';
import { DataTableColumnHeader } from './ColumnHeader';
import Priority from './Priority';
import Status from './Status';
import Title from './Title';
-export const columns: ColumnDef