[INTW26] Conflict Dialog by OpsEclipse · Pull Request #247 · uwblueprint/website-bp

OpsEclipse · 2026-02-08T20:11:23Z

Notion ticket link

Implement Report Conflict Feature

Implementation description

Added a reusable Dialogue template built on MUI Dialog (components/common/Dialogue.tsx)
Implemented the 2-dialog report conflict flow (confirm + success) in the review info stage (components/review/stages/reviewInfoStage.tsx)
Added reportReviewConflict GraphQL mutation in graphql/queries.ts
Added ReviewPageAPIClient to call the mutation (APIClients/ReviewPageAPIClient.ts)
Wired “Yes, report” to execute the mutation and show success/error UI

Steps to test

Setup:

Go to pgAdmin and users table to find your account's userId
Go to the applicantRecords table to and make one of the reviewerId your userId, note down the applicantRecordId

Navigate to /review?applicantRecordId=<applicantRecordId>
Click Conflict and verify the confirm dialog opens
Click Cancel and verify it closes
Click Yes, report and verify the mutation is called and the success dialog opens (this will only work once backend pr is merged)

What should reviewers focus on?

Dialogue template styling vs Figma
Modal state transitions (disabled while reporting, success dialog, error copy)
GraphQL variable types / reviewerId extraction

SaqAsh

Lookin good

move the conflict pop-up into its own shared component and simplify the related review page code clean up the review table links and the shared GraphQL helper while keeping the current lockfile updates

Use applicant record IDs across review links, parsing, and submission requests so the review page matches the backend data model. This also keeps the current dialog typing change, login position field, and lockfile updates in the same commit

Revert the auth, GraphQL helper, and review list edits that were not part of the conflict dialog work. This keeps the branch focused on the dialog and applicant record ID wiring it depends on.

mxc-maggiechen

Great work! I think this is good to go now 😄

mxc-maggiechen

Steps to test

SaqAsh

Just a few questions, did review quickly on the train so feel free to point out anything I missed

SaqAsh · 2026-04-15T00:58:09Z

  );
 };

+type Props = ReviewStageProps & { header: ReactNode };


SaqAsh

some mo cleanup

simplify the review dialog and helper code after PR feedback. remove placeholder interview footer actions and tighten the reviewer and applicant ID checks

…to two

mxc-maggiechen · 2026-05-06T05:19:39Z

-export const getReviewId = (
-  query: Record<string, string | string[] | undefined>,
-): number => {
-  const reviewId =
-    typeof query["reviewId"] === "string"
-      ? parseInt(query["reviewId"])
-      : (() => {
-          throw new Error("reviewId must be a String");
-        })();
-  if (Number.isNaN(reviewId))
-    throw Error("reviewId must be parsable into an int");


This is still kinda janky tbh, idk if there is a good pattern to parse URLs

I think the cleanest way to do something like this is to use a query validator that is typed like zod

apart from that tho it's fine

oooh i kinda want to look in this and maybe some other native react options when we move to new repo. let's punt this for after migration?

mxc-maggiechen · 2026-05-06T05:20:51Z

  changeRating: `
-    mutation changeRating($id: Int!, $ratingToBeChanged: String!, $newValue: Int!) {
+    mutation changeRating($id: String!, $ratingToBeChanged: String!, $newValue: Int!) {
      changeRating(id: $id, ratingToBeChanged: $ratingToBeChanged, newValue: $newValue) {
        id
      }
    }
  `,
  modifyFinalComments: `
-    mutation modifyFinalComments($id: Int!, $newComments: String!, $newSkillCategory: String!, $newRecommendedSecondChoice: String!) {
+    mutation modifyFinalComments($id: String!, $newComments: String!, $newSkillCategory: String!, $newRecommendedSecondChoice: String!) {
      modifyFinalComments(id: $id, newComments: $newComments, newSkillCategory: $newSkillCategory, newRecommendedSecondChoice: $newRecommendedSecondChoice) {


these changes are not really relevant tbh, because these endpoints are deprecated, changes are just made to avoid typing errors

mxc-maggiechen · 2026-05-06T05:21:36Z

these changes are not really relevant tbh, because these endpoints are deprecated, changes are just made to avoid typing errors

Thank you thank you

SaqAsh · 2026-05-06T20:23:09Z

Thank you thank you

SaqAsh · 2026-05-06T20:29:29Z

-export const getReviewId = (
-  query: Record<string, string | string[] | undefined>,
-): number => {
-  const reviewId =
-    typeof query["reviewId"] === "string"
-      ? parseInt(query["reviewId"])
-      : (() => {
-          throw new Error("reviewId must be a String");
-        })();
-  if (Number.isNaN(reviewId))
-    throw Error("reviewId must be parsable into an int");


I think the cleanest way to do something like this is to use a query validator that is typed like zod

SaqAsh · 2026-05-06T20:29:40Z

-export const getReviewId = (
-  query: Record<string, string | string[] | undefined>,
-): number => {
-  const reviewId =
-    typeof query["reviewId"] === "string"
-      ? parseInt(query["reviewId"])
-      : (() => {
-          throw new Error("reviewId must be a String");
-        })();
-  if (Number.isNaN(reviewId))
-    throw Error("reviewId must be parsable into an int");


apart from that tho it's fine

OpsEclipse requested a review from mxc-maggiechen February 8, 2026 20:15

mxc-maggiechen changed the title ~~Sparsh/intf26 conflict dialog~~ [INTW26] Conflict Dialog Feb 10, 2026

mxc-maggiechen reviewed Feb 18, 2026

View reviewed changes

Comment thread package.json

Comment thread .nvmrc Outdated

Comment thread APIClients/ReviewPageAPIClient.ts Outdated

Comment thread components/admin/ReviewTable.tsx Outdated

Comment thread components/common/Dialogue.tsx Outdated

Comment thread components/common/Dialogue.tsx

mxc-maggiechen requested changes Feb 18, 2026

View reviewed changes

OpsEclipse force-pushed the sparsh/INTF26-conflict-dialog branch from 4327539 to a19d944 Compare February 18, 2026 02:28

OpsEclipse requested a review from mxc-maggiechen February 25, 2026 00:43

mxc-maggiechen requested changes Feb 28, 2026

View reviewed changes

Comment thread .gitignore

Comment thread utils/makegqlrequest.ts

Comment thread .codex/environments/environment.toml Outdated

Comment thread utils/reviewId.ts Outdated

Comment thread components/common/Dialogue.tsx

Comment thread components/common/Dialogue.tsx

OpsEclipse requested a review from mxc-maggiechen March 4, 2026 01:50

mxc-maggiechen mentioned this pull request Mar 15, 2026

[INTW26] Revamp Review Page #254

Merged

4 tasks

mxc-maggiechen force-pushed the sparsh/INTF26-conflict-dialog branch from 3877d7f to cebb283 Compare March 21, 2026 19:53

mxc-maggiechen reviewed Mar 21, 2026

View reviewed changes

Comment thread utils/makegqlrequest.ts

mxc-maggiechen requested a review from SaqAsh March 21, 2026 20:52

mxc-maggiechen changed the base branch from staging to INTW26-revampscoring March 21, 2026 20:55

mxc-maggiechen changed the base branch from INTW26-revampscoring to staging March 21, 2026 21:22

mxc-maggiechen self-requested a review March 21, 2026 21:22

SaqAsh reviewed Mar 21, 2026

View reviewed changes

mxc-maggiechen reviewed Mar 21, 2026

View reviewed changes

Comment thread components/review/stages/ReviewInfoStage.tsx Outdated

mxc-maggiechen reviewed Mar 21, 2026

View reviewed changes

Comment thread components/review/stages/ReviewInfoStage.tsx Outdated

OpsEclipse requested a review from SaqAsh April 2, 2026 15:37

Maggie Chen and others added 6 commits April 4, 2026 18:16

rebase sparshs pr

ac00b1b

clean up styling for report button

2ab9f4f

fix: address conflict dialog review feedback

e588a62

move the conflict pop-up into its own shared component and simplify the related review page code clean up the review table links and the shared GraphQL helper while keeping the current lockfile updates

fix: remove unrelated branch changes

f01aaa7

Revert the auth, GraphQL helper, and review list edits that were not part of the conflict dialog work. This keeps the branch focused on the dialog and applicant record ID wiring it depends on.

refactor: make conflictDialogue api and panellayout api more abstract

1109d38

mxc-maggiechen force-pushed the sparsh/INTF26-conflict-dialog branch from 8f50c6f to 1109d38 Compare April 4, 2026 23:21

Maggie Chen added 2 commits April 4, 2026 19:26

fix: remove stale back to home

a89d53b

revert changes on tables

c9b5840

mxc-maggiechen approved these changes Apr 4, 2026

View reviewed changes

mxc-maggiechen reviewed Apr 7, 2026

View reviewed changes

Comment thread components/common/SplitPageLayout.tsx

OpsEclipse force-pushed the sparsh/INTF26-conflict-dialog branch 2 times, most recently from ced2671 to c9b5840 Compare April 8, 2026 00:03

SaqAsh requested changes Apr 14, 2026

View reviewed changes

mxc-maggiechen reviewed Apr 14, 2026

View reviewed changes

Comment thread pages/review/protectedApplication.tsx

SaqAsh reviewed Apr 14, 2026

View reviewed changes

address import comments

14a8bea

SaqAsh reviewed Apr 15, 2026

View reviewed changes

Comment thread components/review/shared/ConflictDialogue.tsx Outdated

mxc-maggiechen force-pushed the sparsh/INTF26-conflict-dialog branch from a79f918 to 14a8bea Compare April 15, 2026 00:52

SaqAsh reviewed Apr 15, 2026

View reviewed changes

refactor: address review cleanup comments

5a1ec00

simplify the review dialog and helper code after PR feedback. remove placeholder interview footer actions and tighten the reviewer and applicant ID checks

SaqAsh assigned mxc-maggiechen May 5, 2026

mxc-maggiechen added 5 commits May 5, 2026 15:58

refactor: first pass at decoupling the conflict dialogue component in…

83a1309

…to two

refactor: clean up parsing url for applicantRecordId

2b1c934

refactor: reset to staging for interview files, not needed for this PR

8c77844

refactor: fix some typing

e8f59c1

fix styling on modals

188f7ee

mxc-maggiechen requested a review from SaqAsh May 6, 2026 05:17

mxc-maggiechen reviewed May 6, 2026

View reviewed changes

SaqAsh approved these changes May 7, 2026

View reviewed changes

mxc-maggiechen merged commit 15e5245 into staging May 7, 2026

mxc-maggiechen deleted the sparsh/INTF26-conflict-dialog branch May 7, 2026 03:24

Conversation

OpsEclipse commented Feb 8, 2026 • edited by mxc-maggiechen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Notion ticket link

Implementation description

Steps to test

What should reviewers focus on?

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SaqAsh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mxc-maggiechen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mxc-maggiechen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

SaqAsh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SaqAsh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

OpsEclipse commented Feb 8, 2026 •

edited by mxc-maggiechen

Loading