bug fixes (#434)

Princekumarofficial · web-flow · commit 089013d2f647 · 2026-04-08T15:20:52.000+05:30
diff --git a/.env.development b/.env.development
@@ -1,6 +1,6 @@
-NEXT_PUBLIC_BACKEND_URL=https://tpc.jxp.codes
-NEXT_PUBLIC_FRONTEND_URL=https://tpc.jxp.codes
-NEXTAUTH_URL=https://tpc.jxp.codes/portal/api/auth
-NEXT_PUBLIC_RECAPTCHA_SITE_KEY=6Ldd9KYrAAAAAO2UAAHuvK-lSFU3qj6HqXHzf5o1
+NEXT_PUBLIC_BACKEND_URL=https://placement.iiti.ac.in
+NEXT_PUBLIC_FRONTEND_URL=https://placement.iiti.ac.in
+NEXTAUTH_URL=https://placement.iiti.ac.in/portal/api/auth
+NEXT_PUBLIC_RECAPTCHA_SITE_KEY=6LedhmcrAAAAAGugyAoh4uyYPKGpOSFQf6trz-y4
 NEXT_PUBLIC_BASE_PATH="/portal"
 NEXT_PUBLIC_ASSET_PREFIX="/portal"
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "antd": "^5.19.1",
     "axios": "^1.6.3",
     "chartjs": "^0.3.24",
+    "class-validator": "^0.15.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^0.2.0",
diff --git a/src/app/(routes)/admin/jobs/[jobId]/page.tsx b/src/app/(routes)/admin/jobs/[jobId]/page.tsx
@@ -25,7 +25,12 @@ import Salaries from "@/components/Admin/Job/Salaries";
 import SelectionProcedure from "@/components/Admin/Job/SelectionProcedure";
 import Clashes from "@/components/Admin/Job/Clashes";
 import JobAnalytics from "@/components/Admin/Job/JobAnalytics";
-import { ClashesFC } from "@/dto/Clashes";
+import {
+  ClashesFC,
+  EMPTY_CLASHES,
+  isValidClashesResponse,
+  normalizeClashesResponse,
+} from "@/dto/Clashes";
 const currentStatusOptions = [
   "INITIALIZED",
   "SCHEDULED",
@@ -42,7 +47,7 @@ const currentStatusOptions = [
 
 const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
   const [job, setData] = useState<JobDetailFC>(null);
-  const [clashes, setClashes] = useState<ClashesFC>(null);
+  const [clashes, setClashes] = useState<ClashesFC>(EMPTY_CLASHES);
   const [loading, setLoading] = useState(true);
   const [editMode, setEditMode] = useState(false);
   const [formData, setFormData] = useState(null);
@@ -87,25 +92,32 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
   useEffect(() => {
     const fetchData = async () => {
       try {
-        const [
-          jobDetailData,
-          jafDetailsData,
-          recruiterData,
-          facultyData,
-          clashes,
-        ] = await Promise.all([
+        const [jobDetailData, jafDetailsData, recruiterData, facultyData] =
+          await Promise.all([
           fetchJobById(params.jobId),
           getJafDetails(),
           fetchRecruiterData(),
           fetchFaculties(),
-          fetchClashes(params.jobId),
         ]);
         setJafDetails(jafDetailsData);
         setData(jobDetailData);
         setFormData(jobDetailData);
         setFacultyData(facultyData);
-        setClashes(clashes);
+        try {
+          const clashesData = await fetchClashes(params.jobId);
+          const normalizedClashes = normalizeClashesResponse(clashesData);
+
+          if (!isValidClashesResponse(clashesData)) {
+            toast.error("Could not load clashes for this job");
+          }
+
+          setClashes(normalizedClashes);
+        } catch (_error) {
+          setClashes(EMPTY_CLASHES);
+          toast.error("Could not load clashes for this job");
+        }
       } catch (error) {
+        setClashes(EMPTY_CLASHES);
         toast.error("Error fetching data");
       } finally {
         setLoading(false);
@@ -702,7 +714,7 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
             loading={loading}
           />
           {job && <JobAnalytics jobId={job.id} />}
-          {clashes ? <Clashes clashes={clashes} /> : <Loader />}
+          <Clashes clashes={clashes} />
         </div>
       )}
     </div>
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -20,3 +20,9 @@ body {
   color: rgb(var(--foreground-rgb));
   background: rgb(232, 232, 232);
 }
+
+/* Removes square blue outline */
+.ant-select-single .ant-select-selection-search-input:focus {
+  outline: none !important;
+  box-shadow: none !important;
+}
diff --git a/src/components/Admin/Job/Clashes.tsx b/src/components/Admin/Job/Clashes.tsx
@@ -1,11 +1,21 @@
-import { ClashesFC } from "@/dto/Clashes";
+import { ClashesFC, Event, OffCampus, OnCampus } from "@/dto/Clashes";
 import React, { useState } from "react";
 import Modal from "@mui/material/Modal";
 import TableComponent from "@/components/NewTableComponent/Table";
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
 import { Button } from "@/components/ui/button";
 import { EventModal, OffCampusModal, OnCampusModal } from "./ClashModal";
 
+type ClashDateFields = {
+  startDateTime?: string;
+  cstartDateTime?: string;
+  endDateTime?: string;
+  cendDateTime?: string;
+};
+
+type ClashModalType = "event" | "onCampus" | "offCampus";
+type ClashModalData = Event | OnCampus | OffCampus;
+
 const eventColumns = [
   {
     viewMore: "View",
@@ -25,21 +35,37 @@ const eventColumns = [
 ];
 
 const Clashes = ({ clashes }: { clashes: ClashesFC }) => {
-  const [selectedClash, setSelectedClash] = useState<any>(null);
-  const [modalType, setModalType] = useState<string>("");
+  const [selectedClash, setSelectedClash] = useState<ClashModalData | null>(
+    null,
+  );
+  const [modalType, setModalType] = useState<ClashModalType | "">("");
+
+  const toDisplayDate = (value?: string) => {
+    if (!value) return "N/A";
 
-  const formatClashes = (clashesEvent: any, modalType: string) => {
-    return clashesEvent.map((clash) => ({
+    const parsedDate = new Date(value);
+    return Number.isNaN(parsedDate.getTime())
+      ? "N/A"
+      : parsedDate.toLocaleString();
+  };
+
+  const formatClashes = <T extends ClashModalData & ClashDateFields>(
+    clashesEvent: T[],
+    currentModalType: ClashModalType,
+  ) => {
+    const safeClashes = Array.isArray(clashesEvent) ? clashesEvent : [];
+
+    return safeClashes.map((clash) => ({
       ...clash,
-      startDateTime: new Date(clash.startDateTime).toLocaleString(),
-      cstartDateTime: new Date(clash.cstartDateTime).toLocaleString(),
-      endDateTime: new Date(clash.endDateTime).toLocaleString(),
-      cendDateTime: new Date(clash.cendDateTime).toLocaleString(),
+      startDateTime: toDisplayDate(clash.startDateTime),
+      cstartDateTime: toDisplayDate(clash.cstartDateTime),
+      endDateTime: toDisplayDate(clash.endDateTime),
+      cendDateTime: toDisplayDate(clash.cendDateTime),
       viewMore: (
         <Button
           onClick={() => {
             setSelectedClash(clash);
-            setModalType(modalType);
+            setModalType(currentModalType);
           }}
         >
           View More
@@ -48,10 +74,6 @@ const Clashes = ({ clashes }: { clashes: ClashesFC }) => {
     }));
   };
 
-  const onViewClash = async (event: any) => {
-    setSelectedClash(event);
-  };
-
   const onCloseModal = () => {
     setSelectedClash(null);
   };
@@ -65,18 +87,22 @@ const Clashes = ({ clashes }: { clashes: ClashesFC }) => {
   return (
     <div className="bg-white p-4 px-8 rounded-lg border-gray-300 hover:border-blue-200 border-2">
       <Modal
-        open={selectedClash}
+        open={Boolean(selectedClash)}
         onClose={onCloseModal}
         aria-labelledby="Event Details"
         aria-describedby="Event Details"
         className="flex justify-center items-center"
       >
         <>
-          {modalType === "event" && <EventModal event={selectedClash} />}
-          {modalType === "onCampus" && (
+          {modalType === "event" &&
+            selectedClash &&
+            "ceventId" in selectedClash && (
+              <EventModal event={selectedClash} />
+            )}
+          {modalType === "onCampus" && selectedClash && "baseSalary" in selectedClash && (
             <OnCampusModal onCampusEvent={selectedClash} />
           )}
-          {modalType === "offCampus" && (
+          {modalType === "offCampus" && selectedClash && "salary" in selectedClash && (
             <OffCampusModal offCampusEvent={selectedClash} />
           )}
         </>
diff --git a/src/components/JAF/JAF.tsx b/src/components/JAF/JAF.tsx
@@ -18,6 +18,7 @@ import {
   jobDetailsValidationSchema,
 } from "../../validation/jaf.validation";
 import ReCAPTCHA from "react-google-recaptcha";
+import { isEmail } from "class-validator";
 
 const baseUrl = process.env.NEXT_PUBLIC_BACKEND_URL;
 const { Step } = Steps;
@@ -103,11 +104,12 @@ function JAF() {
             }))
             .filter(
               (r) =>
-                r.name.trim() ||
-                r.designation.trim() ||
-                r.email.trim() ||
-                r.contact.trim() ||
-                r.landline.trim(),
+                (r.name.trim() ||
+                  r.designation.trim() ||
+                  r.email.trim() ||
+                  r.contact.trim() ||
+                  r.landline.trim()) &&
+                isEmail(r.email),
             );
 
           if (recruiters.length === 0) {
diff --git a/src/components/JAF/JobDetails.tsx b/src/components/JAF/JobDetails.tsx
@@ -820,7 +820,7 @@ const JobDetails = ({
                   }}
                   maxLength={FIELD_LIMITS.JOB_TITLE_MAX}
                   showCount
-                  className="rounded-md shadow-sm border-gray-300 text-xs md:text-sm"
+                  className="rounded-md shadow-sm border-gray-300 text-xs md:text-sm h-10"
                 />
               </Form.Item>
             </Col>
@@ -880,7 +880,7 @@ const JobDetails = ({
                   }}
                   maxLength={FIELD_LIMITS.LOCATION_MAX}
                   showCount
-                  className="rounded-md shadow-sm border-gray-300 text-xs md:text-sm"
+                  className="rounded-md shadow-sm border-gray-300 text-xs md:text-sm h-10"
                 />
               </Form.Item>
             </Col>
@@ -909,7 +909,7 @@ const JobDetails = ({
                   }}
                   min={0}
                   max={FIELD_LIMITS.HIRES_MAX}
-                  className="rounded-md shadow-sm border-gray-300 text-xs md:text-sm"
+                  className="rounded-md shadow-sm border-gray-300 text-xs md:text-sm h-10"
                 />
               </Form.Item>
             </Col>
@@ -1020,6 +1020,7 @@ const JobDetails = ({
                 help={getFieldError("skills")}
               >
                 <Select
+                  className="h-10"
                   mode="tags"
                   style={{
                     width: "100%",
@@ -1729,7 +1730,7 @@ const JobDetails = ({
                         </Form.Item>
                       </Col>
                     </Row> */}
-                    <Row gutter={[16, 12]} className="md:gutter-24">
+                    <Row gutter={[16, 12]} className="md:gutter-24 py-5">
                       <Col xs={24} md={12}>
                         <Form.Item
                           label={
@@ -1966,7 +1967,7 @@ const JobDetails = ({
                                 value,
                               );
                             }}
-                            className="rounded-md"
+                            className="rounded-md h-10"
                           />
                         </Form.Item>
                       </Col>
@@ -2829,7 +2830,7 @@ const JobDetails = ({
                             >
                               <Select
                                 placeholder="Select accommodation provision"
-                                className="rounded-md"
+                                className="rounded-md h-10"
                                 options={[
                                   {
                                     value: true,
@@ -2858,7 +2859,7 @@ const JobDetails = ({
                             >
                               <Select
                                 placeholder="Select PPO provision"
-                                className="rounded-md"
+                                className="rounded-md h-10"
                                 options={[
                                   {
                                     value: true,
@@ -3186,6 +3187,7 @@ const JobDetails = ({
                           help={getFieldError(`tests.${index}.type`)}
                         >
                           <Select
+                            className="h-10"
                             placeholder="Select type"
                             options={testType}
                             showSearch
@@ -3345,6 +3347,7 @@ const JobDetails = ({
                           help={getFieldError(`interviews.${index}.type`)}
                         >
                           <Select
+                            className="h-10"
                             placeholder="Select type"
                             options={interviewType}
                             showSearch
diff --git a/src/components/dashboard/data-ribbon.tsx b/src/components/dashboard/data-ribbon.tsx
@@ -69,6 +69,8 @@ interface DataRibbonProps {
 
 export function DataRibbon({ stats, seasonType }: DataRibbonProps) {
   const overallStats = stats.overallStats;
+  const unplacedCount =
+    overallStats.totalRegisteredStudentsCount - overallStats.placedStudentsCount;
   let packageLabel = "Stipend";
   if (seasonType === "PLACEMENT") {
     packageLabel = "Package";
@@ -114,9 +116,10 @@ export function DataRibbon({ stats, seasonType }: DataRibbonProps) {
           info="Number of students placed"
         />
         <StatCard
-          value={`${overallStats.unplacedPercentage.toFixed(2)}%`}
+          value={unplacedCount}
           label="Total Unplaced Students"
-          info="Percentage of eligible students yet to be placed"
+          subtext={`${overallStats.unplacedPercentage.toFixed(2)}% unplaced`}
+          info="Unplaced students among total registered"
         />
         <StatCard
           value={overallStats.lowestPackage.toFixed(2)}
diff --git a/src/dto/Clashes.ts b/src/dto/Clashes.ts
@@ -85,6 +85,40 @@ export interface ClashesFC {
   offCampus: OffCampus[];
 }
 
+type MaybeClashesPayload = Partial<
+  Record<keyof ClashesFC, unknown>
+>;
+
+const asArray = <T>(value: unknown): T[] => {
+  return Array.isArray(value) ? (value as T[]) : [];
+};
+
+export const EMPTY_CLASHES: ClashesFC = {
+  onCampus: [],
+  event: [],
+  offCampus: [],
+};
+
+export const normalizeClashesResponse = (
+  payload: MaybeClashesPayload | null | undefined,
+): ClashesFC => {
+  return {
+    onCampus: asArray<OnCampus>(payload?.onCampus),
+    event: asArray<Event>(payload?.event),
+    offCampus: asArray<OffCampus>(payload?.offCampus),
+  };
+};
+
+export const isValidClashesResponse = (
+  payload: MaybeClashesPayload | null | undefined,
+): boolean => {
+  return (
+    Array.isArray(payload?.onCampus) &&
+    Array.isArray(payload?.event) &&
+    Array.isArray(payload?.offCampus)
+  );
+};
+
 export const clashesDto = {
   onCampus: [
     {
diff --git a/yarn.lock b/yarn.lock
