From 3e476eda1b1f265e722d18d3c7a138d9bc6b791d Mon Sep 17 00:00:00 2001 From: Aman Chaturvedi Date: Thu, 30 Mar 2023 17:00:17 +0530 Subject: [PATCH] TP-22961, TP-22449 | collectionCaseStatus changes and case detail additional information | Aman C (#188) * TP-22449 | Case Details Additional Information | Aman C * TP-22961 | collectionCaseStatus used to move case to completed * TP-22455 | Rever collectionCaseStatus --- src/screens/allCases/constants.ts | 2 ++ .../journeyStepper/OpenStepperRenderer.tsx | 33 +++++++------------ .../journeyStepper/StepperHeader.tsx | 7 ++-- .../journeyStepper/TaskContent.tsx | 27 +++++++++------ 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/screens/allCases/constants.ts b/src/screens/allCases/constants.ts index d9475316..819797ee 100644 --- a/src/screens/allCases/constants.ts +++ b/src/screens/allCases/constants.ts @@ -2,6 +2,8 @@ import { CaseTypes } from './interface'; export const COMPLETED_STATUSES = ['CLOSED', 'EXPIRED', 'FORCED_CLOSE']; +export const COMPLETED_COLLECTION_STATUSES = ['COMPLETED']; + export const ListHeaderItems = { BANNER: { type: CaseTypes.BANNER, diff --git a/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx b/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx index 502107e7..d5d7a2a9 100644 --- a/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx +++ b/src/screens/caseDetails/journeyStepper/OpenStepperRenderer.tsx @@ -38,14 +38,18 @@ const OpenStepperRenderer: React.FC = ({tasks, context <> { tasks.map((task, index) => { - if (currentStateMap[task.taskType] === STEPPER_STATE.CURRENT) { + const isLastIndex = index === tasks.length - 1; + const isCurrentTaskActive = currentStateMap[task.taskType] === STEPPER_STATE.CURRENT; return ( - + = ({tasks, context } taskType={task.taskType} caseId={caseReferenceId} + isCurrentTaskActive={ + isCurrentTaskActive + } /> } - isLastTask={ - index === tasks.length - 1 - } + isLastTask={isLastIndex} /> ); - } - return ( - currentTaskIndex && styles.pendingListContainer]}> - - - - ); }) } diff --git a/src/screens/caseDetails/journeyStepper/StepperHeader.tsx b/src/screens/caseDetails/journeyStepper/StepperHeader.tsx index 9cca87eb..fdc0bdb1 100644 --- a/src/screens/caseDetails/journeyStepper/StepperHeader.tsx +++ b/src/screens/caseDetails/journeyStepper/StepperHeader.tsx @@ -20,10 +20,11 @@ interface IStepperHeader { header: string; currentState: STEPPER_STATE; verdict: CONTEXT_TASK_STATUSES; + isCurrentTaskActive: boolean; } const StepperHeader: React.FC = props => { - const {stepNumber, header, verdict, currentState} = props; + const {stepNumber, header, verdict, currentState, isCurrentTaskActive} = props; switch (currentState) { case STEPPER_STATE.CURRENT: @@ -43,7 +44,7 @@ const StepperHeader: React.FC = props => { ); case STEPPER_STATE.DEFAULT: return ( - + {stepNumber} @@ -69,7 +70,7 @@ const StepperHeader: React.FC = props => { // ); case STEPPER_STATE.SYNCED: return ( - + {/*{stepNumber}*/} diff --git a/src/screens/caseDetails/journeyStepper/TaskContent.tsx b/src/screens/caseDetails/journeyStepper/TaskContent.tsx index 0da088fa..d970fc63 100644 --- a/src/screens/caseDetails/journeyStepper/TaskContent.tsx +++ b/src/screens/caseDetails/journeyStepper/TaskContent.tsx @@ -17,11 +17,13 @@ const TaskContent = ({ geolocationUrl, taskType, caseId, + isCurrentTaskActive }: { address?: any; geolocationUrl: string | undefined; taskType: TaskTitle; caseId: string; + isCurrentTaskActive: boolean; }) => { const openGeolocation = () => { addClickstreamEvent( @@ -60,9 +62,9 @@ const TaskContent = ({ }; return ( - {address && {getCommunicationAddress(address)}} - - {!!geolocationUrl && ( + {address && {getCommunicationAddress(address)}} + + {!!geolocationUrl ? (