Skip to content

Ramsundar - Prevent duplicate PR entries in PR Grading Dashboard (frontend) #4921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ram-blip wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Ramsundar - Prevent duplicate PR entries in PR Grading Dashboard (frontend) #4921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/components/PRGradingDashboard/AddPRModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,23 @@ import styles from './AddPRModal.module.css';
const PR_NUMBER_REGEX = /^\d+(?:\s*\+\s*\d+)*$/;
const GRADE_OPTIONS = ['Unsatisfactory', 'Okay', 'Exceptional', 'No Correct Image'];

function AddPRModal({ reviewer, onAdd, onCancel }) {
const normalizePrNumbers = prNumbers => (prNumbers || '').replace(/\s+/g, '');

function AddPRModal({ reviewer, existingPRs, onAdd, onCancel }) {
const [prNumber, setPrNumber] = useState('');
const [prNumberError, setPrNumberError] = useState('');
const [selectedGrade, setSelectedGrade] = useState('');
const [step, setStep] = useState(1); // 1: PR Number input, 2: Grade selection

const safeExistingPRs = Array.isArray(existingPRs) ? existingPRs : [];

const isDuplicatePR = value => {
const normalizedNew = normalizePrNumbers(value);
return safeExistingPRs.some(
pr => pr?.prNumbers && normalizePrNumbers(pr.prNumbers) === normalizedNew,
);
};

const validatePRNumber = value => {
const trimmedValue = value.trim();
if (!trimmedValue) {
Expand All @@ -24,6 +35,11 @@ function AddPRModal({ reviewer, onAdd, onCancel }) {
setPrNumberError('Invalid format. Use format like "1234" or "1234 + 5678"');
return false;
}
// Check for duplicate PR number for this reviewer
if (isDuplicatePR(trimmedValue)) {
setPrNumberError(`PR number "${trimmedValue}" already exists for this reviewer`);
return false;
}
setPrNumberError('');
return true;
};
Expand Down
27 changes: 15 additions & 12 deletions src/components/PRGradingDashboard/AddPRModal.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
border: 1px solid #e5e7eb;
border-radius: 0.5rem;
padding: 1rem;
box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
box-shadow: 0 10px 15px -3px rgb(0 0 0 / 10%), 0 4px 6px -2px rgb(0 0 0 / 5%);
}

.modalHeader {
Expand Down Expand Up @@ -36,7 +36,7 @@

.closeButton:focus {
outline: none;
box-shadow: 0 0 0 2px rgba(107, 114, 128, 0.5);
box-shadow: 0 0 0 2px rgb(107 114 128 / 50%);
}

.closeIcon {
Expand Down Expand Up @@ -68,7 +68,7 @@
.input:focus {
outline: none;
border-color: #2563eb;
box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.5);
box-shadow: 0 0 0 2px rgb(37 99 235 / 50%);
}

.inputError {
Expand All @@ -77,7 +77,7 @@

.inputError:focus {
border-color: #ef4444;
box-shadow: 0 0 0 2px rgba(239, 68, 68, 0.5);
box-shadow: 0 0 0 2px rgb(239 68 68 / 50%);
}

.errorMessage {
Expand Down Expand Up @@ -114,7 +114,7 @@
border: 1px solid #d1d5db;
cursor: pointer;
transition: all 0.2s;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px 0 rgb(0 0 0 / 5%);
}

.buttonCancel {
Expand All @@ -134,12 +134,12 @@

.buttonPrimary:hover {
background-color: #1d4ed8;
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
box-shadow: 0 4px 6px -1px rgb(0 0 0 / 10%);
}

.buttonPrimary:focus {
outline: none;
box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.5), 0 0 0 4px rgba(37, 99, 235, 0.1);
box-shadow: 0 0 0 2px rgb(37 99 235 / 50%), 0 0 0 4px rgb(37 99 235 / 10%);
}

.buttonPrimary:disabled {
Expand Down Expand Up @@ -194,7 +194,7 @@
background-color: #dbeafe;
border-color: #2563eb;
color: #1e40af;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px 0 rgb(0 0 0 / 5%);
}

.backButton {
Expand All @@ -207,7 +207,7 @@
border-radius: 0.375rem;
cursor: pointer;
transition: all 0.2s;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px 0 rgb(0 0 0 / 5%);
}

.backButton:hover {
Expand Down Expand Up @@ -290,12 +290,16 @@

:global(.dark-mode) .input:focus {
border-color: #3b82f6;
box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.5);
box-shadow: 0 0 0 2px rgb(59 130 246 / 50%);
}

:global(.dark-mode) .inputError {
border-color: #ef4444;
}

:global(.dark-mode) .inputError:focus {
border-color: #ef4444;
box-shadow: 0 0 0 2px rgba(239, 68, 68, 0.5);
box-shadow: 0 0 0 2px rgb(239 68 68 / 50%);
}

:global(.dark-mode) .errorMessage {
Expand All @@ -310,4 +314,3 @@
background-color: #60a5fa;
opacity: 0.7;
}

1 change: 1 addition & 0 deletions src/components/PRGradingDashboard/GradingTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function GradingTable({
<td colSpan="4" className={styles.modalCell}>
<AddPRModal
reviewer={grading.reviewer}
existingPRs={grading.gradedPrs}
onAdd={onAddGradedPR}
onCancel={() => onAddPRClick(null)}
/>
Expand Down
Loading