Subscription
{watchedSubscr || "—"}
diff --git a/src/modules/admin/pages/courses/EditCourse.jsx b/src/modules/admin/pages/courses/EditCourse.jsx
index a5a6e31..15f2c7d 100644
--- a/src/modules/admin/pages/courses/EditCourse.jsx
+++ b/src/modules/admin/pages/courses/EditCourse.jsx
@@ -46,7 +46,6 @@ const schema = z.object({
title: z.string().min(1, "Title is required."),
description: z.string().optional(),
course_code: z.string().optional(),
- order_index: z.coerce.number().min(0).default(0),
level: z.enum(["beginner", "intermediate", "advanced"]).optional(),
subscription: z.string().min(1, "Subscription is required.").default("free"),
status: z.enum(["draft", "published", "unpublished"]).default("draft"),
@@ -236,7 +235,7 @@ export default function EditCourse() {
resolver: zodResolver(schema),
defaultValues: {
title: "", description: "", course_code: "",
- order_index: 0, level: undefined, subscription: "free", status: "draft", objectives: [], roles: [],
+ level: undefined, subscription: "free", status: "draft", objectives: [], roles: [],
},
});
@@ -276,7 +275,6 @@ export default function EditCourse() {
title: c.title ?? "",
description: c.description ?? "",
course_code: c.course_code ?? "",
- order_index: c.order_index ?? 0,
level: c.level ?? undefined,
subscription: c.subscription ?? "free",
status: c.status ?? "draft",
@@ -595,26 +593,14 @@ export default function EditCourse() {
/>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/modules/admin/pages/task_list/task/TaskCompletion.jsx b/src/modules/admin/pages/task_list/task/TaskCompletion.jsx
deleted file mode 100644
index 9d27207..0000000
--- a/src/modules/admin/pages/task_list/task/TaskCompletion.jsx
+++ /dev/null
@@ -1,349 +0,0 @@
-/***********************************************************************************************************************************************************************
- * File Name : TaskCompletions.jsx
- * Type : Page
- * Description : Admin page — lists all completions for a specific task.
- * Route: /admin/taskList/:taskListId/tasks/:taskId/completions
- ***********************************************************************************************************************************************************************/
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import { useAdminTask } from '@/contexts/AdminTaskContext';
-
-import DataTable from '@/components/generic/Table/DataTable';
-import { FilterSheet } from '@/components/generic/Sheet/FilterSheet';
-import { ArchiveDialog } from '@/components/generic/Dialogs/ArchiveDialog';
-import { RestoreDialog } from '@/components/generic/Dialogs/RestoreDialog';
-import { Skeleton } from '@/components/ui/skeleton';
-import { Button } from '@/components/ui/button';
-import { Textarea } from '@/components/ui/textarea';
-import { Switch } from '@/components/ui/switch';
-import { Label } from '@/components/ui/label';
-import {
- AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent,
- AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import { House, NotebookPen, Users, Paperclip, Check, X } from 'lucide-react';
-import AppBreadcrumb from '@/components/generic/Breadcrumb/AppBreadcrumb';
-import { formatDate, formatDateTime } from '@/utils/table.util';
-import { getTimestamp } from '@/utils/timestamp.util';
-
-import { buildDataColumns, columnPinning } from '@/modules/admin/config/task_list/task_completion/columns.config';
-import { buildToolbarActions } from '@/modules/admin/config/task_list/task_completion/toolbar.config';
-import { buildSelectionActions } from '@/modules/admin/config/task_list/task_completion/selection.config';
-import { buildRowActions } from '@/modules/admin/config/task_list/task_completion/rowActions.config';
-
-// ─── Stat card ────────────────────────────────────────────────────────────────
-const StatCard = ({ label, value, icon: Icon, loading }) => (
-
-
- {label}
-
-
- {Icon && }
- {loading ? : value}
-
-
-);
-
-// ─── Main page ────────────────────────────────────────────────────────────────
-export default function TaskCompletions() {
- const navigate = useNavigate();
- const { taskListId, taskId } = useParams();
-
- const {
- task, taskList,
- completions, completionPagination, setCompletionPagination, completionLoading,
- completionAttributes,
- fetchTask, fetchTaskList, updateTask,
- fetchCompletions, reviewSubmission,
- archiveCompletion, restoreCompletion,
- bulkArchiveCompletions, bulkRestoreCompletions,
- } = useAdminTask();
-
- const [showArchived, setShowArchived] = useState(false);
- const [togglingSubmissions, setTogglingSubmissions] = useState(false);
- const [archiveTarget, setArchiveTarget] = useState(null);
- const [restoreTarget, setRestoreTarget] = useState(null);
- const [bulkArchiveIds, setBulkArchiveIds] = useState(null);
- const [bulkRestoreIds, setBulkRestoreIds] = useState(null);
- const [reviewTarget, setReviewTarget] = useState(null);
- const [reviewNote, setReviewNote] = useState('');
-
- const tableRefsRef = useRef({
- getFilters: () => [], getSort: () => [], resetSelection: () => {}, tableInstance: null,
- });
-
- // ── Initial fetch ─────────────────────────────────────────────────────────
- useEffect(() => {
- fetchTaskList(taskListId);
- fetchTask(taskListId, taskId);
- fetchCompletions(taskListId, taskId, { page: 1, limit: 10 });
- }, [taskListId, taskId]);
-
- const handleRefsReady = (refs) => { tableRefsRef.current = refs; };
-
- // ── Toggle accepting submissions ─────────────────────────────────────────
- async function handleToggleAcceptingSubmissions(v) {
- setTogglingSubmissions(true);
- try {
- await updateTask(taskListId, taskId, { accepts_submissions: v });
- await fetchTask(taskListId, taskId);
- } finally {
- setTogglingSubmissions(false);
- }
- }
-
- // ── Fetch handler ─────────────────────────────────────────────────────────
- const handleFetch = useCallback((params) => {
- return fetchCompletions(taskListId, taskId, params);
- }, [fetchCompletions, taskListId, taskId]);
-
- // ── Toggle archived ───────────────────────────────────────────────────────
- const handleToggleArchived = () => {
- const next = !showArchived;
- setShowArchived(next);
- fetchCompletions(taskListId, taskId, {
- page: 1,
- limit: completionPagination?.limit ?? 10,
- filters: tableRefsRef.current.getFilters(),
- sort: tableRefsRef.current.getSort(),
- });
- };
-
- // ── After mutation ────────────────────────────────────────────────────────
- const afterMutation = () => {
- tableRefsRef.current.resetSelection?.();
- fetchCompletions(taskListId, taskId, {
- page: 1,
- limit: completionPagination?.limit ?? 10,
- filters: tableRefsRef.current.getFilters(),
- sort: tableRefsRef.current.getSort(),
- });
- };
-
- // ── Derived stats ─────────────────────────────────────────────────────────
- const totalRecords = completionPagination?.totalRecords ?? 0;
- const totalFiles = completions.reduce((acc, c) => acc + (c.files?.length ?? 0), 0);
- const uniqueUsers = new Set(completions.map((c) => c.user_id)).size;
- const latestDate = completions[0]?.submitted_at
- ? formatDate(completions[0].submitted_at)
- : '—';
-
- // ── Config ────────────────────────────────────────────────────────────────
- const exportConfig = useMemo(() => ({
- allData: completions,
- attributes: completionAttributes,
- filename: `${getTimestamp()}_Completions`,
- sheetName: 'Completions',
- }), [completions, completionAttributes]);
-
- const rowActions = buildRowActions({
- navigate,
- onArchive: (row) => setArchiveTarget(row),
- onRestore: (row) => setRestoreTarget(row),
- onReview: (row) => { setReviewTarget(row); setReviewNote(''); },
- showArchived,
- });
-
- const handleReview = async (status) => {
- if (!reviewTarget) return;
- const result = await reviewSubmission(taskListId, taskId, reviewTarget.completion_id, {
- status, review_note: reviewNote || null,
- });
- if (result) {
- setReviewTarget(null);
- afterMutation();
- }
- };
-
- const toolbarActions = buildToolbarActions({
- fetchCompletions,
- taskListId,
- taskId,
- pagination: completionPagination,
- exportConfig,
- showArchived,
- onToggleArchived: handleToggleArchived,
- getFilters: () => tableRefsRef.current.getFilters(),
- getSort: () => tableRefsRef.current.getSort(),
- getTableInstance: () => tableRefsRef.current.tableInstance,
- });
-
- const selectionActions = buildSelectionActions({
- exportConfig,
- showArchived,
- onBulkArchive: (ids) => setBulkArchiveIds(ids),
- onBulkRestore: (ids) => setBulkRestoreIds(ids),
- getTableInstance: () => tableRefsRef.current.tableInstance,
- });
-
- const columns = useMemo(
- () => buildDataColumns(completionAttributes, rowActions),
- [completionAttributes, rowActions]
- );
-
- // ── Breadcrumbs ───────────────────────────────────────────────────────────
- const breadcrumbs = [
- { label: 'Home', icon:
, to: '/admin' },
- { label: 'Task Lists', to: '/admin/taskList' },
- { label: taskList?.name ?? '…', to: `/admin/taskList/${taskListId}/tasks` },
- { label: task?.name ?? '…', to: `/admin/taskList/${taskListId}/tasks/${taskId}/view` },
- { label: 'Completions' },
- ];
-
- return (
-
-
- {/* ── Breadcrumb ────────────────────────────────────────────────── */}
-
-
- {/* ── Detail card ───────────────────────────────────────────────── */}
-
-
-
- {task
- ?
{task.name}
- :
- }
- {task
- ?
- {taskList?.name ?? '—'}
- {task.deadline ? ` · Due ${formatDateTime(task.deadline)}` : ''}
-
- :
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {/* ── DataTable ─────────────────────────────────────────────────── */}
-
Promise.resolve([])}
- toolbarActions={toolbarActions}
- selectionActions={selectionActions}
- columnPinning={columnPinning}
- onRefsReady={handleRefsReady}
- recordLabel="completion"
- emptyMessage="No completions yet."
- renderFilterSheet={({ open, onOpenChange, column, attr, data, loading }) => (
-
- )}
- />
-
- {/* ── Single archive ────────────────────────────────────────────── */}
- !v && setArchiveTarget(null)}
- entity={archiveTarget}
- entityLabel="Completion"
- getName={(r) => r?.user?.name ?? 'this completion'}
- onArchive={(entity) => archiveCompletion(taskListId, taskId, entity?.completion_id)}
- loading={completionLoading}
- onSuccess={afterMutation}
- />
-
- {/* ── Single restore ────────────────────────────────────────────── */}
- !v && setRestoreTarget(null)}
- entity={restoreTarget}
- entityLabel="Completion"
- getName={(r) => r?.user?.name ?? 'this completion'}
- onRestore={(entity) => restoreCompletion(taskListId, taskId, entity?.completion_id)}
- loading={completionLoading}
- onSuccess={afterMutation}
- />
-
- {/* ── Bulk archive ──────────────────────────────────────────────── */}
- !v && setBulkArchiveIds(null)}
- ids={bulkArchiveIds ?? []}
- entityLabel="Completion"
- onArchive={({ ids }) => bulkArchiveCompletions(taskListId, taskId, ids)}
- loading={completionLoading}
- onSuccess={afterMutation}
- />
-
- {/* ── Bulk restore ──────────────────────────────────────────────── */}
- !v && setBulkRestoreIds(null)}
- ids={bulkRestoreIds ?? []}
- entityLabel="Completion"
- onRestore={({ ids }) => bulkRestoreCompletions(taskListId, taskId, ids)}
- loading={completionLoading}
- onSuccess={afterMutation}
- />
-
- {/* ── Review submission ────────────────────────────────────────────── */}
- !v && setReviewTarget(null)}>
-
-
- Review Submission
-
- {reviewTarget?.user?.name ?? 'This learner'}'s submission requires review before it counts as complete.
-
-
- {reviewTarget?.note && (
- {reviewTarget.note}
- )}
- {reviewTarget?.response_text && (
- {reviewTarget.response_text}
- )}
-