Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ui changes for adjusted estimator db model #1882

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Ui changes for adjusted estimator db model #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d86570e
no more "_" in estimator name
SzymanskiBartlomiej Dec 6, 2024
2f367db
remove estimators ordering
SzymanskiBartlomiej Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/WrapperApp/components/Results/EstimatorsSelect/EstimatorsSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const EstimatorsSelect = ({
const estimatorData = await getJobResult(
{
jobId: simulationJobId,
estimatorName: estimatorsTabData[id] + '_'
estimatorName: estimatorsTabData[id]
},
controller.signal,
true
Expand Down
4 changes: 1 addition & 3 deletions src/WrapperApp/components/Results/ResultsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ function ResultsPanel() {
const [estimatorsResults, setEstimatorsResults] = useState<EstimatorResults[]>([]);
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
Expand Down
20 changes: 2 additions & 18 deletions src/services/ShSimulatorService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,6 @@ export interface RestSimulationContext {
) => Promise<FullSimulationData | undefined>;
}

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;
Expand All @@ -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;
};
Expand Down Expand Up @@ -586,7 +570,7 @@ const ShSimulation = ({ children }: GenericContextProviderProps) => {
}

if (firstEstimatorName) {
return firstEstimatorName + '_';
return firstEstimatorName;
}
},
[]
Expand Down
Loading