Skip to content

Commit 1d238d7

Browse files
Merge pull request #2151 from topcoder-platform/PM-5820
PM-5820 Show N/A daysLeftInEngagement for terminated assignments
2 parents 13572d3 + 45a6496 commit 1d238d7

3 files changed

Lines changed: 16 additions & 4 deletions

File tree

src/apps/work/src/lib/utils/assignment-dates.utils.spec.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('assignment-dates.utils', () => {
5757
.toBe('-')
5858
})
5959

60-
it('returns N/A for cancelled or closed engagements', () => {
60+
it('returns N/A for cancelled or closed engagements, and terminated assignments', () => {
6161
expect(formatAssignmentDaysLeftInEngagement(
6262
'2026-01-01T12:00:00.000Z',
6363
1,
@@ -74,6 +74,14 @@ describe('assignment-dates.utils', () => {
7474
))
7575
.toBe('N/A')
7676

77+
expect(formatAssignmentDaysLeftInEngagement(
78+
'2026-01-01T12:00:00.000Z',
79+
1,
80+
'TERMINATED',
81+
new Date('2026-01-16T12:00:00.000Z'),
82+
))
83+
.toBe('N/A')
84+
7785
expect(formatAssignmentDaysLeftInEngagement(
7886
'2026-01-01T12:00:00.000Z',
7987
1,

src/apps/work/src/lib/utils/assignment-dates.utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ export function getAssignmentDaysLeftInEngagement(
146146
/**
147147
* Formats remaining engagement days for Assignments list display.
148148
*
149-
* Cancelled or closed engagements show `N/A`.
149+
* Cancelled or closed engagements, and terminated assignments, show `N/A`.
150150
*
151151
* @param startDate billing start date.
152152
* @param durationMonths assignment duration in months.
153-
* @param engagementStatus optional engagement status.
153+
* @param engagementStatus optional engagement or assignment status.
154154
* @param now optional "today" override for tests.
155155
* @returns display string such as `16 days`, `N/A`, or `-` when unavailable.
156156
*/

src/apps/work/src/pages/engagements/EngagementPaymentPage/EngagementPaymentPage.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,11 @@ export const EngagementPaymentPage: FC = () => {
11251125
{formatAssignmentDaysLeftInEngagement(
11261126
assignment.startDate,
11271127
assignment.durationMonths,
1128-
engagementResult.engagement?.status,
1128+
String(assignment.status || '')
1129+
.trim()
1130+
.toUpperCase() === 'TERMINATED'
1131+
? assignment.status
1132+
: engagementResult.engagement?.status,
11291133
)}
11301134
</span>
11311135
</div>

0 commit comments

Comments
 (0)