Merge pull request #118 from dipamsen/replace-papers

Replace Papers from Admin Dashboard

Author: harshkhandeparkar

backend/src/db/mod.rs

@@ -95,6 +95,7 @@ impl Database {
     /// - Sets the `filelink` to:
     ///     - For library papers, remains unchanged
     ///     - For uploaded papers, approved papers are moved to the approved directory and renamed `id_coursecode_coursename_year_semester_exam.pdf` and unapproved papers are moved to the unapproved directory and named `id.pdf`
+    /// - Deletes `replace` papers from the database.
     ///
     /// Returns the database transaction, the old filelink and the new paper details ([`crate::qp::AdminDashboardQP`])
     pub async fn edit_paper<'c>(
@@ -113,6 +114,7 @@ impl Database {
             exam,
             approve_status,
             note,
+            replace,
         } = edit_req;
 
         let current_details = self.get_paper_by_id(id).await?;
@@ -177,6 +179,23 @@ impl Database {
         let new_qp: DBAdminDashboardQP = query.fetch_one(&mut *tx).await?;
         let new_qp = AdminDashboardQP::from(new_qp);
 
+        // Delete the replaced papers
+        for replace_id in replace {
+            let rows_affected = sqlx::query(queries::SOFT_DELETE_ANY_BY_ID)
+                .bind(replace_id)
+                .execute(&mut *tx)
+                .await?
+                .rows_affected();
+
+            if rows_affected > 1 {
+                tx.rollback().await?;
+                return Err(eyre!(
+                    "Error: {} (> 1) papers were deleted. Rolling back.",
+                    rows_affected
+                ));
+            }
+        }
+
         Ok((tx, old_filelink, new_qp))
     }
 

backend/src/db/queries.rs

@@ -65,6 +65,10 @@ pub fn get_similar_papers_query(year: bool, semester: bool, exam: bool) -> Strin
 pub const SOFT_DELETE_BY_ID: &str =
     "UPDATE iqps SET approve_status=false, is_deleted = true WHERE id=$1 AND from_library = false";
 
+/// Soft deletes a paper (sets `approve_status` to false and `is_deleted` to true) of any paper.
+pub const SOFT_DELETE_ANY_BY_ID: &str =
+    "UPDATE iqps SET approve_status=false, is_deleted = true WHERE id=$1";
+
 /// Get a paper ([`crate::db::models::DBAdminDashboardQP`]) with the given id (first parameter `$1`)
 pub fn get_get_paper_by_id_query() -> String {
     format!(

backend/src/routing/handlers.rs

@@ -162,6 +162,7 @@ pub struct EditReq {
     pub exam: Option<String>,
     pub note: Option<String>,
     pub approve_status: Option<bool>,
+    pub replace: Vec<i32>,
 }
 
 /// Paper edit endpoint (for admin dashboard)

frontend/.env.development

@@ -1,3 +1,3 @@
 VITE_BACKEND_URL=http://localhost:8080
 VITE_MAX_UPLOAD_LIMIT=10
-VITE_GH_OAUTH_CLIENT_ID=
+VITE_GH_OAUTH_CLIENT_ID=

frontend/src/components/AdminDashboard/QPCard.tsx

@@ -1,22 +1,25 @@
 import { FaRegTrashAlt } from "react-icons/fa";
 import { IAdminDashboardQP } from "../../types/question_paper";
 import { isQPValid, validate } from "../../utils/validateInput";
-import { FaFilePdf, FaRegPenToSquare } from "react-icons/fa6";
-
+import { FaFilePdf, FaRegPenToSquare, FaRegSquareCheck, FaRegSquare } from "react-icons/fa6";
 import "./styles/qp_card.scss";
 import { formatBackendTimestamp } from "../../utils/backend";
+import { useState } from "react";
 
 interface IQPCardProps {
     qPaper: IAdminDashboardQP;
     onEdit?: React.MouseEventHandler<HTMLButtonElement>;
     onDelete?: React.MouseEventHandler<HTMLButtonElement>;
+    onToggle?: (prev: boolean, event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     hasOcr?: boolean;
 }
 
-export function QPCard({ qPaper, onEdit, onDelete, hasOcr }: IQPCardProps) {
+export function QPCard({ qPaper, onEdit, onDelete, hasOcr, onToggle }: IQPCardProps) {
     const errorMsg = validate(qPaper);
     const isValid = isQPValid(qPaper);
 
+    const [selected, setSelected] = useState<boolean>(false);
+
     return (
         <div className={`qp-card ${qPaper.approve_status ? 'approved' : ''}`}>
             <div className="qp-data">
@@ -63,6 +66,21 @@ export function QPCard({ qPaper, onEdit, onDelete, hasOcr }: IQPCardProps) {
                     }
                 </>
                 }
+
+                {
+                    onToggle !== undefined &&
+                    <div
+                        className={`select-btn btn ${selected ? 'selected' : ''}`}
+                        onClick={(e) => {
+                            e.stopPropagation();
+                            setSelected(!selected);
+                            onToggle(selected, e);
+                        }}
+                        title={"Replace Paper"}
+                    >
+                        {selected ? <FaRegSquareCheck size="1.5rem" /> : <FaRegSquare size="1.5rem" />}
+                    </div>
+                }
             </div>
         </div>
     );

frontend/src/components/Common/PaperEditModal.tsx

@@ -19,7 +19,7 @@ import { IoClose } from "react-icons/io5";
 import { FaCalendarAlt, FaRegTrashAlt, FaSync } from "react-icons/fa";
 import { AiOutlineFullscreen, AiOutlineFullscreenExit } from "react-icons/ai";
 
-type UpdateQPHandler<T> = (qp: T) => void;
+type UpdateQPHandler<T> = (qp: T, replace: number[]) => void;
 interface IPaperEditModalProps<T> {
 	onClose: () => void;
 	selectPrev?: (() => void) | null;
@@ -39,6 +39,7 @@ function PaperEditModal<T extends IQuestionPaperFile | IAdminDashboardQP>(props:
 
 	const [similarPapers, setSimilarPapers] = useState<IAdminDashboardQP[]>([]);
 	const [awaitingSimilarPapers, setAwaitingSimilarPapers] = useState<boolean>(false);
+	const [replacingPapers, setReplacingPapers] = useState<IAdminDashboardQP[]>([]);
 
 	const [courseCodeSuggestions, setCourseCodeSuggestions] = useState<ISuggestion<null>[]>([]);
 	const [courseNameSuggestions, setCourseNameSuggestions] = useState<ISuggestion<[course_code: string, course_name: string]>[]>([]);
@@ -119,7 +120,7 @@ function PaperEditModal<T extends IQuestionPaperFile | IAdminDashboardQP>(props:
 				getSimilarPapers(similarityDetails, 'id' in data ? data.id : -1);
 			}
 
-		}, [data.course_code, data.year, data.exam, data.semester])
+		}, [data.course_code, data.year, data.exam, data.semester, 'id' in data ? data.id : -1])
 	}
 
 	const courseCodeNameMap = Object.entries(COURSE_CODE_MAP);
@@ -453,7 +454,7 @@ function PaperEditModal<T extends IQuestionPaperFile | IAdminDashboardQP>(props:
 							if (!('approve_status' in data)) {
 								toast.success("File details updated successfully");
 							}
-							props.updateQPaper(data);
+							props.updateQPaper(data, replacingPapers.map(x => x.id));
 						}}
 						disabled={!isDataValid}
 						className="save-btn"
@@ -494,13 +495,22 @@ function PaperEditModal<T extends IQuestionPaperFile | IAdminDashboardQP>(props:
 					{
 						awaitingSimilarPapers ? <div style={{ justifyContent: 'center', display: 'flex' }}><Spinner /></div> :
 							<div>
+							  {similarPapers.length > 0 && <p style={{margin: "0 0 4px 0"}}>Select papers to replace.</p>}
 								{
 									similarPapers.length === 0 ? <p>No similar papers found.</p> :
 										similarPapers.map((paper, i) => <QPCard
 											qPaper={paper}
 											key={i}
-										/>
-										)
+											onToggle={(selected) => {
+											  if (!selected) { // select
+  												if (!replacingPapers.some((p) => p.id === paper.id)) {
+  													setReplacingPapers((prev) => [...prev, paper]);
+  												}
+												} else { // unselect
+  												setReplacingPapers((prev) => prev.filter((p) => p.id !== paper.id));
+  											}
+											}}
+										/>)
 								}
 							</div>
 					}

frontend/src/pages/AdminDashboard.tsx

@@ -35,12 +35,13 @@ function AdminDashboard() {
 		number | null
 	>(null);
 
-	const handlePaperEdit = async (qp: IAdminDashboardQP) => {
+	const handlePaperEdit = async (qp: IAdminDashboardQP, replace: number[]) => {
 		const response = await makeRequest(
 			"edit",
 			"post",
 			{
 				...qp,
+				replace,
 			},
 			auth.jwt,
 		);
@@ -281,7 +282,7 @@ function AdminDashboard() {
 							: null
 					}
 					qPaper={unapprovedPapers[selectedQPaperIndex]}
-					updateQPaper={(qp) => handlePaperEdit(qp)}
+					updateQPaper={(qp, replace) => handlePaperEdit(qp, replace)}
 					ocrDetails={ocrDetails.get(
 						unapprovedPapers[selectedQPaperIndex].id,
 					)}

frontend/src/types/backend.ts

@@ -56,6 +56,7 @@ export interface IEndpointTypes {
 			exam?: string,
 			note?: string,
 			approve_status?: boolean,
+			replace: number[]
 		},
 		response: {
 			id: number;