Merge pull request #1358 from topcoder-platform/dev

kkartunov · web-flow · commit 12c1e9cf01f1 · 2025-12-04T09:32:15.000+02:00
[PROD] - Payment Status UI fixes &amp; logs
diff --git a/src/apps/review/src/lib/components/AiReviewsTable/AiReviewsTable.module.scss b/src/apps/review/src/lib/components/AiReviewsTable/AiReviewsTable.module.scss
@@ -10,6 +10,13 @@
     width: 100%;
     border-collapse: collapse;
 
+    &.reviewsTable {
+        tr:last-child {
+            td {
+                border-bottom: none;
+            }
+        }
+    }
 
     &.reviewsTable thead tr th {
         border-top: 1px solid #A8A8A8;
@@ -25,7 +32,7 @@
     }
 
     .scoreCol {
-        text-align: right;
+        text-align: left;
     }
 }
 
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.module.scss b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.module.scss
@@ -128,6 +128,7 @@
 }
 
 .aiReviewerRow {
+    padding-bottom: 0;
     @include ltelg {
         tr:has(&) {
             td:first-child {
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx
@@ -40,11 +40,10 @@ const AiFeedback: FC<AiFeedbackProps> = props => {
         await createFeedbackComment(workflowId as string, workflowRun?.id as string, feedback?.id, {
             content,
         })
-        await mutate(`
-            ${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items?[${workflowRun?.status}]
-        `)
+        // eslint-disable-next-line max-len
+        await mutate(`${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items?[${workflowRun?.status}]`)
         setShowReply(false)
-    }, [workflowId, workflowRun?.id, feedback?.id])
+    }, [workflowId, workflowRun?.id, workflowRun?.status, feedback?.id])
 
     if (!aiFeedbackItems?.length || !feedback) {
         return <></>
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackComments/AiFeedbackComment.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackComments/AiFeedbackComment.tsx
@@ -36,19 +36,17 @@ export const AiFeedbackComment: FC<AiFeedbackCommentProps> = props => {
             content,
             parentId: comment.id,
         })
-        await mutate(`
-            ${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items?[${workflowRun?.status}]
-        `)
+        // eslint-disable-next-line max-len
+        await mutate(`${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items?[${workflowRun?.status}]`)
         setShowReply(false)
     }, [workflowId, workflowRun?.id, props.feedback?.id])
 
     const onEditReply = useCallback(async (content: string, comment: AiFeedbackCommentType) => {
         await updateRunItemComment(workflowId as string, workflowRun?.id as string, props.feedback?.id, comment.id, {
             content,
         })
-        await mutate(`
-            ${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items?[${workflowRun?.status}]
-        `)
+        // eslint-disable-next-line max-len
+        await mutate(`${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items?[${workflowRun?.status}]`)
         setEditMode(false)
     }, [workflowId, workflowRun?.id, props.feedback?.id])
 
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/hooks/useReviewForm.ts b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/hooks/useReviewForm.ts
@@ -41,32 +41,30 @@ export const useReviewForm = ({
     }, [isDirty, onFormChange])
 
     useEffect(() => {
-        if (reviewItems?.length) {
-            const newFormData = {
-                reviews: reviewItems.map(
-                    (reviewItem, reviewItemIndex) => ({
-                        comments: 'reviewItemComments' in reviewItem ? reviewItem.reviewItemComments?.map(
-                            (commentItem, commentIndex) => ({
-                                content: commentItem.content ?? '',
-                                id: commentItem.id,
-                                index: commentIndex,
-                                type: commentItem.type ?? '',
-                            }),
-                        ) : [],
-                        id: reviewItem.id,
-                        index: reviewItemIndex,
-                        initialAnswer: (
-                            ('finalAnswer' in reviewItem && reviewItem.finalAnswer)
-                            || ('initialAnswer' in reviewItem && reviewItem.initialAnswer)
-                            || ('questionScore' in reviewItem && reviewItem.questionScore)
-                            || undefined
-                        ) as string,
-                        scorecardQuestionId: reviewItem.scorecardQuestionId,
-                    }),
-                ),
-            }
-            reset(newFormData)
+        const newFormData = {
+            reviews: (reviewItems ?? []).map(
+                (reviewItem, reviewItemIndex) => ({
+                    comments: 'reviewItemComments' in reviewItem ? reviewItem.reviewItemComments?.map(
+                        (commentItem, commentIndex) => ({
+                            content: commentItem.content ?? '',
+                            id: commentItem.id,
+                            index: commentIndex,
+                            type: commentItem.type ?? '',
+                        }),
+                    ) : [],
+                    id: reviewItem.id,
+                    index: reviewItemIndex,
+                    initialAnswer: (
+                        ('finalAnswer' in reviewItem && reviewItem.finalAnswer)
+                        || ('initialAnswer' in reviewItem && reviewItem.initialAnswer)
+                        || ('questionScore' in reviewItem && reviewItem.questionScore)
+                        || undefined
+                    ) as string,
+                    scorecardQuestionId: reviewItem.scorecardQuestionId,
+                }),
+            ),
         }
+        reset(newFormData)
     }, [reviewItems, reset])
 
     const touchedAllFields = useCallback(() => {
diff --git a/src/apps/review/src/lib/components/TableAppeals/TableAppeals.module.scss b/src/apps/review/src/lib/components/TableAppeals/TableAppeals.module.scss
@@ -71,7 +71,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/lib/components/TableAppealsForSubmitter/TableAppealsForSubmitter.module.scss b/src/apps/review/src/lib/components/TableAppealsForSubmitter/TableAppealsForSubmitter.module.scss
@@ -28,7 +28,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/lib/components/TableAppealsResponse/TableAppealsResponse.module.scss b/src/apps/review/src/lib/components/TableAppealsResponse/TableAppealsResponse.module.scss
@@ -100,7 +100,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/lib/components/TableCheckpointSubmissions/TableCheckpointSubmissions.module.scss b/src/apps/review/src/lib/components/TableCheckpointSubmissions/TableCheckpointSubmissions.module.scss
@@ -195,7 +195,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/lib/components/TableIterativeReview/TableIterativeReview.module.scss b/src/apps/review/src/lib/components/TableIterativeReview/TableIterativeReview.module.scss
@@ -251,7 +251,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/lib/components/TableReview/TableReview.module.scss b/src/apps/review/src/lib/components/TableReview/TableReview.module.scss
@@ -220,7 +220,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/lib/components/TableReviewForSubmitter/TableReviewForSubmitter.module.scss b/src/apps/review/src/lib/components/TableReviewForSubmitter/TableReviewForSubmitter.module.scss
@@ -96,7 +96,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.module.scss b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.module.scss
@@ -205,7 +205,7 @@
 
     :global(.reviews-table) {
         margin-left: auto;
-        width: 75%;
+        width: 60%;
         margin-bottom: -9px;
 
         @include ltelg {
diff --git a/src/apps/review/src/pages/reviews/components/AiReviewViewer/AiReviewViewer.tsx b/src/apps/review/src/pages/reviews/components/AiReviewViewer/AiReviewViewer.tsx
@@ -36,6 +36,9 @@ const AiReviewViewer: FC = () => {
         challengeInfo,
     }: ChallengeDetailContextModel = useChallengeDetailsContext()
     const navigate = useAppNavigate()
+    const workflowRunIsFailed = [
+        AiWorkflowRunStatusEnum.FAILURE,
+    ].includes(workflowRun?.status as AiWorkflowRunStatusEnum)
 
     const tabItems: SelectOption[] = [
         {
@@ -56,7 +59,7 @@ const AiReviewViewer: FC = () => {
             label: 'Scorecard',
             value: 'scorecard',
         },
-        { label: `Attachments (${totalCount ?? 0})`, value: 'attachments' },
+        { label: `Attachments${workflowRunIsFailed ? '' : ` (${totalCount ?? 0})`}`, value: 'attachments' },
     ]
     const isFailedRun = useMemo(() => (
         workflowRun && [
diff --git a/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx b/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx
@@ -217,7 +217,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
         if (updateObj.paymentStatus !== undefined) {
             if (updateObj.paymentStatus === 'Owed') {
                 paymentStatus = 'OWED'
-            } else if (updateObj.paymentStatus === 'On Hold') {
+            } else if (updateObj.paymentStatus === 'On Hold (Admin)') {
                 paymentStatus = 'ON_HOLD_ADMIN'
             } else if (updateObj.paymentStatus === 'Cancel') {
                 paymentStatus = 'CANCELLED'
@@ -267,24 +267,14 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
     }, [fetchWinnings])
 
     const onPaymentEditCallback = useCallback((payment: Winning) => {
-        let status = payment.status
-        if (status === 'On Hold (Admin)') {
-            status = 'On Hold'
-        } else if (['On Hold (Member)', 'On Hold (Tax Form)', 'On Hold (Payment Provider)'].indexOf(status) !== -1) {
-            status = 'Owed'
-        }
-
         setConfirmFlow({
             action: 'Save',
             callback: async () => {
                 updatePayment(payment.id)
             },
             content: (
                 <PaymentEditForm
-                    payment={{
-                        ...payment,
-                        status,
-                    }}
+                    payment={payment}
                     canSave={setIsConfirmFormValid}
                     onValueUpdated={handleValueUpdated}
                 />
diff --git a/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx b/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx
@@ -179,9 +179,16 @@ const PaymentEdit: React.FC<PaymentEditFormProps> = (props: PaymentEditFormProps
 
     const options = useCallback(() => {
         if (props.payment.status.toUpperCase() !== 'PAID') {
+            const isMemberHold = [
+                'On Hold (Member)',
+                'On Hold (Tax Form)',
+                'On Hold (Payment Provider)',
+            ].includes(props.payment.status)
+
             return [
+                ...(isMemberHold ? [{ label: props.payment.status, value: props.payment.status }] : []),
                 { label: 'Owed', value: 'Owed' },
-                { label: 'On Hold', value: 'On Hold' },
+                { label: 'On Hold (Admin)', value: 'On Hold (Admin)' },
                 { label: 'Cancel', value: 'Cancel' },
             ]
         }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,13 @@`
`10`	`10`	`width: 100%;`
`11`	`11`	`border-collapse: collapse;`
`12`	`12`
	`13`	`+ &.reviewsTable {`
	`14`	`+ tr:last-child {`
	`15`	`+ td {`
	`16`	`+ border-bottom: none;`
	`17`	`+ }`
	`18`	`+ }`
	`19`	`+ }`
`13`	`20`
`14`	`21`	`&.reviewsTable thead tr th {`
`15`	`22`	`border-top: 1px solid #A8A8A8;`
`@@ -25,7 +32,7 @@`
`25`	`32`	`}`
`26`	`33`
`27`	`34`	`.scoreCol {`
`28`		`- text-align: right;`
	`35`	`+ text-align: left;`
`29`	`36`	`}`
`30`	`37`	`}`
`31`	`38`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`.aiReviewerRow {`
	`131`	`+ padding-bottom: 0;`
`131`	`132`	`@include ltelg {`
`132`	`133`	`tr:has(&) {`
`133`	`134`	`td:first-child {`