Merge pull request #1381 from topcoder-platform/dev

[HOTFIX] - Fix broken review UI flow

Author: kkartunov

.circleci/config.yml

@@ -226,7 +226,6 @@ workflows:
                       branches:
                           only:
                               - dev
-                              - pm-3141_3
 
             - deployQa:
                   context: org-global

src/apps/review/src/lib/components/FieldMarkdownEditor/FieldMarkdownEditor.tsx

@@ -135,7 +135,7 @@ const toggleStrategy = {
     },
     italic: (start: any, end: any) => {
         const startType = start.replace(/(\*|_)(?![\s\S]*(\*|_))/, '')
-        const endType = end.replace(/(\*|_)/, '')
+        const endType = end.replace(/(\*|_)/g, '')
         return { endType, startType }
     },
     strikethrough: (start: any, end: any) => {

src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx

@@ -31,6 +31,7 @@ interface ReviewManagerCommentProps {
 const ReviewManagerComment: FC<ReviewManagerCommentProps> = props => {
     const {
         isManagerEdit,
+        canAddManagerComment,
         isSavingManagerComment,
         addManagerComment,
     }: ScorecardViewerContextValue = useScorecardViewerContext()
@@ -131,7 +132,7 @@ const ReviewManagerComment: FC<ReviewManagerCommentProps> = props => {
                 </div>
             )}
 
-            {!showCommentForm && !comment && isManagerEdit && (
+            {!showCommentForm && !comment && isManagerEdit && canAddManagerComment && (
                 <button
                     type='button'
                     onClick={handleShowCommentForm}

src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardViewer.context.tsx

@@ -22,6 +22,7 @@ export interface ScorecardViewerContextProps {
     children: ReactNode;
     scorecard: Scorecard | ScorecardInfo
     aiFeedbackItems?: AiFeedbackItem[]
+    canAddManagerComment?: boolean
     reviewInfo?: ReviewInfo
     isEdit?: boolean
     isManagerEdit?: boolean
@@ -66,6 +67,7 @@ export interface ScorecardViewerContextProps {
 
 export type ScorecardViewerContextValue = {
     aiFeedbackItems?: AiFeedbackItem[]
+    canAddManagerComment?: boolean
     toggledItems: {[key: string]: boolean}
     toggleItem: (id: string, toggle?: boolean) => void
     reviewInfo?: ReviewInfo
@@ -142,6 +144,7 @@ export const ScorecardViewerContextProvider: FC<ScorecardViewerContextProps> = p
         addAppealResponse: props.addAppealResponse,
         addManagerComment: props.addManagerComment,
         aiFeedbackItems: props.aiFeedbackItems,
+        canAddManagerComment: props.canAddManagerComment,
         doDeleteAppeal: props.doDeleteAppeal,
         form: props.isEdit ? reviewFormCtx.form : undefined,
         formErrors: props.isEdit ? reviewFormCtx.form.formState.errors : undefined,
@@ -161,6 +164,7 @@ export const ScorecardViewerContextProvider: FC<ScorecardViewerContextProps> = p
         touchedAllFields: reviewFormCtx.touchedAllFields,
     }), [
         props.aiFeedbackItems,
+        props.canAddManagerComment,
         props.reviewInfo,
         props.isEdit,
         props.isManagerEdit,

src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardViewer.tsx

@@ -44,6 +44,7 @@ interface ScorecardViewerProps {
     isSavingAppeal?: boolean
     isSavingAppealResponse?: boolean
     isSavingManagerComment?: boolean
+    canAddManagerComment?: boolean
     setReviewStatus?: (status: ReviewCtxStatus) => void
     setActionButtons?: (buttons?: ReactNode) => void
     saveReviewInfo?: (
@@ -335,6 +336,7 @@ const ScorecardViewer: FC<ScorecardViewerProps> = props => (
     <ScorecardViewerContextProvider
         scorecard={props.scorecard}
         aiFeedbackItems={props.aiFeedback}
+        canAddManagerComment={props.canAddManagerComment}
         reviewInfo={props.reviewInfo}
         isEdit={props.isEdit}
         isManagerEdit={props.isManagerEdit}

src/apps/review/src/lib/components/TableAppeals/TableAppeals.tsx

@@ -256,6 +256,7 @@ export const TableAppeals: FC<TableAppealsProps> = (props: TableAppealsProps) =>
                         ? ownedMemberIds.has(submissionOwnerId)
                         : false
                 },
+                canRespondToAppeals: isAdmin || hasReviewerRole,
                 canViewScorecard: canAccessScorecards,
                 isAppealsTab: true,
             }

src/apps/review/src/lib/components/TableAppealsResponse/TableAppealsResponse.tsx

@@ -319,10 +319,11 @@ export const TableAppealsResponse: FC<TableAppealsResponseProps> = (props: Table
     const scoreVisibilityConfig = useMemo<ScoreVisibilityConfig>(
         () => ({
             canDisplayScores: () => true,
+            canRespondToAppeals,
             canViewScorecard: true,
             isAppealsTab: false,
         }),
-        [],
+        [canRespondToAppeals],
     )
 
     const columns = useMemo<TableColumn<SubmissionRow>[]>(() => {
@@ -467,7 +468,7 @@ export const TableAppealsResponse: FC<TableAppealsResponseProps> = (props: Table
                                 >
                                     <Link
                                         className={styles.respondButton}
-                                        to={getReviewRoute(submission.id, reviewId)}
+                                        to={getReviewRoute(submission.id, reviewId, canRespondToAppeals)}
                                     >
                                         Respond to Appeals
                                     </Link>

src/apps/review/src/lib/components/TableReview/TableReview.tsx

@@ -266,21 +266,11 @@ export const TableReview: FC<TableReviewProps> = (props: TableReviewProps) => {
     const minimumPassingScoreByScorecardId = useScorecardPassingScores(scorecardIds)
 
     const aggregatedRows = useMemo<SubmissionRow[]>(() => {
-        const rows = aggregatedSubmissionRows
-            .filter(aggregated => {
-                const reviews = aggregated.reviews ?? []
-                const myReviewDetail = reviews.find(review => {
-                    const resourceId = review.reviewInfo?.resourceId ?? review.resourceId
-                    return resourceId ? myReviewerResourceIds.has(resourceId) : false
-                })
-
-                return !!myReviewDetail?.reviewId
-            })
-            .map(aggregated => ({
-                ...(aggregated.submission ?? {}),
-                ...aggregated.submission,
-                aggregated,
-            })) as SubmissionRow[]
+        const rows = aggregatedSubmissionRows.map(aggregated => ({
+            ...(aggregated.submission ?? {}),
+            ...aggregated.submission,
+            aggregated,
+        })) as SubmissionRow[]
 
         if (!restrictToLatest) {
             return rows

src/apps/review/src/lib/components/common/TableColumnRenderers.tsx

@@ -522,6 +522,7 @@ export function renderScoreCell(
         canViewScorecard,
         viewOwnScorecardTooltip = VIEW_OWN_SCORECARD_TOOLTIP,
         getReviewUrl,
+        canRespondToAppeals,
     }: ScoreVisibilityConfig = configWithDefaults
 
     const reviewDetail = submission.aggregated?.reviews?.[reviewIndex]
@@ -585,7 +586,9 @@ export function renderScoreCell(
         )
     }
 
-    const reviewUrl = getReviewUrl ? getReviewUrl(reviewId) : getReviewRoute(submission.id, reviewId)
+    const reviewUrl = getReviewUrl
+        ? getReviewUrl(reviewId)
+        : getReviewRoute(submission.id, reviewId, canRespondToAppeals)
 
     return (
         <div className={styles.scoreReopenBlock}>
@@ -615,6 +618,7 @@ export function renderAppealsCell(
         canViewScorecard,
         viewOwnScorecardTooltip = VIEW_OWN_SCORECARD_TOOLTIP,
         getReviewUrl,
+        canRespondToAppeals,
     }: ScoreVisibilityConfig = configWithDefaults
 
     const reviewDetail = submission.aggregated?.reviews?.[reviewIndex]
@@ -668,7 +672,9 @@ export function renderAppealsCell(
         )
     }
 
-    const reviewUrl = getReviewUrl ? getReviewUrl(reviewId) : getReviewRoute(submission.id, reviewId)
+    const reviewUrl = getReviewUrl
+        ? getReviewUrl(reviewId)
+        : getReviewRoute(submission.id, reviewId, canRespondToAppeals)
 
     return (
         <Link

src/apps/review/src/lib/components/common/types.ts

@@ -75,6 +75,8 @@ export interface ScoreVisibilityConfig {
     isAppealsTab?: boolean
     /** Optional function to build review detail URLs by ID. */
     getReviewUrl?: (reviewId: string) => string
+    /** Indicates whether the viewer can appeal to respond. */
+    canRespondToAppeals?: boolean
 }
 
 export type { AggregatedReviewDetail, AggregatedSubmissionReviews }