diff --git a/src/WrapperApp/components/Results/EstimatorsSelect/EstimatorsSelect.tsx b/src/WrapperApp/components/Results/EstimatorsSelect/EstimatorsSelect.tsx index fcb5b8593..ede239fa3 100644 --- a/src/WrapperApp/components/Results/EstimatorsSelect/EstimatorsSelect.tsx +++ b/src/WrapperApp/components/Results/EstimatorsSelect/EstimatorsSelect.tsx @@ -34,7 +34,7 @@ const EstimatorsSelect = ({ const estimatorData = await getJobResult( { jobId: simulationJobId, - estimatorName: estimatorsTabData[id] + '_' + estimatorName: estimatorsTabData[id] }, controller.signal, true diff --git a/src/WrapperApp/components/Results/ResultsPanel.tsx b/src/WrapperApp/components/Results/ResultsPanel.tsx index 3561d1213..89f8c66a9 100644 --- a/src/WrapperApp/components/Results/ResultsPanel.tsx +++ b/src/WrapperApp/components/Results/ResultsPanel.tsx @@ -28,9 +28,7 @@ function ResultsPanel() { const [estimatorsResults, setEstimatorsResults] = useState([]); const [groupQuantities, setGroupQuantities] = useState(false); - const userTabInputFilesEstimatorNames = simulation?.input.userInputFilesEstimatorNames?.map( - output => output.slice(0, -1) - ); + const userTabInputFilesEstimatorNames = simulation?.input.userInputFilesEstimatorNames; const uploadedInputFilesEstimatorNames = estimatorsResults?.map(estimator => estimator.name); const editorEstimatorNames = simulation?.input.inputJson?.scoringManager.outputs diff --git a/src/services/ShSimulatorService.tsx b/src/services/ShSimulatorService.tsx index d2a33baba..273c93cb2 100644 --- a/src/services/ShSimulatorService.tsx +++ b/src/services/ShSimulatorService.tsx @@ -87,18 +87,6 @@ export interface RestSimulationContext { ) => Promise; } -const recreateOrderInEstimators = ( - estimators: Estimator[], - scoringManagerJSON: ScoringManagerJSON -): Estimator[] => { - return orderAccordingToList( - estimators, - scoringManagerJSON.outputs, - 'name', - (e, o) => (e.scoringOutputJsonRef = o) - ); -}; - const recreateRefToFilters = (estimators: Estimator[], FiltersJSON: FilterJSON[]): Estimator[] => { estimators.forEach(estimator => { const { pages, scoringOutputJsonRef } = estimator; @@ -119,11 +107,7 @@ export const recreateRefsInResults = (inputJson: EditorJson, estimators: Estimat const { scoringManager }: EditorJson = inputJson; - const estimatorsOrdered = recreateOrderInEstimators(estimators, scoringManager); - const estimatorsWithFixedFilters = recreateRefToFilters( - estimatorsOrdered, - scoringManager.filters - ); + const estimatorsWithFixedFilters = recreateRefToFilters(estimators, scoringManager.filters); return estimatorsWithFixedFilters; }; @@ -586,7 +570,7 @@ const ShSimulation = ({ children }: GenericContextProviderProps) => { } if (firstEstimatorName) { - return firstEstimatorName + '_'; + return firstEstimatorName; } }, []