Skip to content

Commit 5cf27f1

Browse files
authored
[frontend] fix(expectations): fix multiple manual expectations display (#3589)
1 parent 291e75d commit 5cf27f1

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

openaev-front/src/actions/atomic_testings/atomic-testing-actions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ export const relaunchAtomicTesting = (injectId: string) => {
4949
return simplePostCall(uri);
5050
};
5151

52-
export const fetchTargetResultMerged = (injectId: string, targetId: string, targetType: string) => {
53-
const uri = `${ATOMIC_TESTING_URI}/${injectId}/target_results/${targetId}/types/${targetType}/merged`;
52+
export const fetchTargetResult = (injectId: string, targetId: string, targetType: string) => {
53+
const uri = `${ATOMIC_TESTING_URI}/${injectId}/target_results/${targetId}/types/${targetType}`;
5454
return simpleCall(uri);
5555
};
5656

openaev-front/src/admin/components/atomic_testings/atomic_testing/target_result/TargetResultsDetail.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { type SyntheticEvent, useContext, useEffect, useState } from 'react';
33
import { useSearchParams } from 'react-router';
44
import { makeStyles } from 'tss-react/mui';
55

6-
import { fetchTargetResultMerged } from '../../../../../actions/atomic_testings/atomic-testing-actions';
6+
import { fetchTargetResult } from '../../../../../actions/atomic_testings/atomic-testing-actions';
77
import Paper from '../../../../../components/common/Paper';
88
import { useFormatter } from '../../../../../components/i18n';
99
import type { InjectResultOverviewOutput, InjectTarget } from '../../../../../utils/api-types';
@@ -32,6 +32,11 @@ const useStyles = makeStyles()(theme => ({
3232
},
3333
allWidth: { gridColumn: 'span 3' },
3434
paddingTop: { paddingTop: theme.spacing(2) },
35+
gap: {
36+
display: 'flex',
37+
flexDirection: 'column',
38+
gap: theme.spacing(1),
39+
},
3540
}));
3641

3742
const TargetResultsDetail = ({ inject, target }: Props) => {
@@ -82,7 +87,7 @@ const TargetResultsDetail = ({ inject, target }: Props) => {
8287
};
8388

8489
useEffect(() => {
85-
fetchTargetResultMerged(inject.inject_id, target.target_id!, target.target_type!)
90+
fetchTargetResult(inject.inject_id, target.target_id!, target.target_type!)
8691
.then((result: { data: InjectExpectationsStore[] }) => {
8792
setSortedGroupedTargetResults(transformToSortedGroupedResults(result.data ?? []));
8893
});
@@ -132,7 +137,7 @@ const TargetResultsDetail = ({ inject, target }: Props) => {
132137
{canShowExecutionTab && <Tab label={t('Execution')} />}
133138
</Tabs>
134139

135-
<div className={`${classes.allWidth} ${classes.paddingTop}`}>
140+
<div className={`${classes.allWidth} ${classes.paddingTop} ${classes.gap}`}>
136141
{Object.entries(sortedGroupedTargetResults).length > 0
137142
&& Object.entries(sortedGroupedTargetResults).length > activeTab
138143
&& Object.entries(sortedGroupedTargetResults)[activeTab][1].map(expectationResult => (
@@ -143,7 +148,6 @@ const TargetResultsDetail = ({ inject, target }: Props) => {
143148
onUpdateInjectExpectationResult={updateInjectResultOverviewOutput}
144149
/>
145150
))}
146-
147151
{(activeTab === Object.keys(sortedGroupedTargetResults).length && canShowExecutionTab) && (
148152
<ExecutionStatusDetail
149153
target={{

0 commit comments

Comments
 (0)