diff --git a/apps/portal/prisma/migrations/20221027052436_resumes_add_is_resolved_status/migration.sql b/apps/portal/prisma/migrations/20221027052436_resumes_add_is_resolved_status/migration.sql deleted file mode 100644 index 5716b7a2..00000000 --- a/apps/portal/prisma/migrations/20221027052436_resumes_add_is_resolved_status/migration.sql +++ /dev/null @@ -1,2 +0,0 @@ --- AlterTable -ALTER TABLE "ResumesResume" ADD COLUMN "isResolved" BOOLEAN NOT NULL DEFAULT false; diff --git a/apps/portal/prisma/schema.prisma b/apps/portal/prisma/schema.prisma index ec549a84..bf57a55d 100644 --- a/apps/portal/prisma/schema.prisma +++ b/apps/portal/prisma/schema.prisma @@ -120,7 +120,6 @@ model ResumesResume { location String @db.Text url String additionalInfo String? @db.Text - isResolved Boolean @default(false) createdAt DateTime @default(now()) updatedAt DateTime @updatedAt user User @relation(fields: [userId], references: [id], onDelete: Cascade) diff --git a/apps/portal/src/pages/resumes/[resumeId].tsx b/apps/portal/src/pages/resumes/[resumeId].tsx index bd1d4066..15d50e83 100644 --- a/apps/portal/src/pages/resumes/[resumeId].tsx +++ b/apps/portal/src/pages/resumes/[resumeId].tsx @@ -9,7 +9,6 @@ import { AcademicCapIcon, BriefcaseIcon, CalendarIcon, - CheckCircleIcon, InformationCircleIcon, MapPinIcon, PencilSquareIcon, @@ -58,33 +57,24 @@ export default function ResumeReviewPage() { ); const starMutation = trpc.useMutation('resumes.resume.star', { onSuccess() { - invalidateResumeQueries(); + utils.invalidateQueries(['resumes.resume.findOne']); + utils.invalidateQueries(['resumes.resume.findAll']); + utils.invalidateQueries(['resumes.resume.user.findUserStarred']); + utils.invalidateQueries(['resumes.resume.user.findUserCreated']); }, }); const unstarMutation = trpc.useMutation('resumes.resume.unstar', { onSuccess() { - invalidateResumeQueries(); + utils.invalidateQueries(['resumes.resume.findOne']); + utils.invalidateQueries(['resumes.resume.findAll']); + utils.invalidateQueries(['resumes.resume.user.findUserStarred']); + utils.invalidateQueries(['resumes.resume.user.findUserCreated']); }, }); - const resolveMutation = trpc.useMutation('resumes.resume.user.resolve', { - onSuccess() { - invalidateResumeQueries(); - }, - }); - - const invalidateResumeQueries = () => { - utils.invalidateQueries(['resumes.resume.findOne']); - utils.invalidateQueries(['resumes.resume.findAll']); - utils.invalidateQueries(['resumes.resume.user.findUserStarred']); - utils.invalidateQueries(['resumes.resume.user.findUserCreated']); - }; - const userIsOwner = session?.user?.id !== undefined && session.user.id === detailsQuery.data?.userId; - const isResumeResolved = detailsQuery.data?.isResolved; - const [isEditMode, setIsEditMode] = useState(false); const [showCommentsForm, setShowCommentsForm] = useState(false); @@ -149,13 +139,6 @@ export default function ResumeReviewPage() { setIsEditMode(true); }; - const onResolveButtonClick = () => { - resolveMutation.mutate({ - id: resumeId as string, - val: !isResumeResolved, - }); - }; - const renderReviewButton = () => { if (session === null) { return ( @@ -192,7 +175,10 @@ export default function ResumeReviewPage() { url: detailsQuery.data.url, }} onClose={() => { - invalidateResumeQueries(); + utils.invalidateQueries(['resumes.resume.findOne']); + utils.invalidateQueries(['resumes.resume.findAll']); + utils.invalidateQueries(['resumes.resume.user.findUserStarred']); + utils.invalidateQueries(['resumes.resume.user.findUserCreated']); setIsEditMode(false); }} /> @@ -220,36 +206,17 @@ export default function ResumeReviewPage() {
{userIsOwner && ( - <> - - +