LPS-183520 The Incorrect Flow in Case Result

shuyangzhou · May 5, 2023 · 186465a · 186465a
1 parent 66b2cad
commit 186465a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/...remote-app/src/pages/Project/Routines/Builds/Inner/CaseResult/CaseResultHeaderActions.tsx b/...remote-app/src/pages/Project/Routines/Builds/Inner/CaseResult/CaseResultHeaderActions.tsx
@@ -57,7 +57,9 @@ const CaseResultHeaderActions: React.FC<{
 		completeTest:
 			workflowDisabled ||
 			caseResult.dueStatus.key !== CaseResultStatuses.IN_PROGRESS,
+
 		editValidation: assignedUserId > 0 && assignedUserId !== userId,
+
 		reopenTest: workflowDisabled || isReopened,
 	};
 
@@ -73,19 +75,21 @@ const CaseResultHeaderActions: React.FC<{
 				spaced
 			>
 				<ClayButton
-					disabled={isCaseResultAssignedToMe}
+					disabled={!buttonValidations.completeTest}
 					displayType={
-						isCaseResultAssignedToMe ? 'unstyled' : undefined
+						!buttonValidations.completeTest ? 'unstyled' : undefined
 					}
 					onClick={() => modal.open()}
 				>
 					{i18n.translate('assign')}
 				</ClayButton>
 
 				<ClayButton
-					disabled={isCaseResultAssignedToMe}
+					disabled={!buttonValidations.completeTest}
 					displayType={
-						isCaseResultAssignedToMe ? 'unstyled' : 'secondary'
+						buttonValidations.completeTest
+							? 'secondary'
+							: 'unstyled'
 					}
 					onClick={() =>
 						(isCaseResultAssignedToMe
@@ -132,11 +136,11 @@ const CaseResultHeaderActions: React.FC<{
 				<ClayButton
 					disabled={
 						buttonValidations.editValidation ||
-						isCaseResultAssignedToMe
+						!buttonValidations.completeTest
 					}
 					displayType={
 						buttonValidations.editValidation ||
-						isCaseResultAssignedToMe
+						!buttonValidations.completeTest
 							? 'unstyled'
 							: 'secondary'
 					}