Skip to content

Commit

Permalink
Project Params Hotfix (#62)
Browse files Browse the repository at this point in the history
* Hotfix: Add support for experimentNames in getProjectParams

* Fetch project params on selectedExperiment change
  • Loading branch information
jescalada authored Apr 8, 2024
1 parent a4ea0f1 commit ea4e25f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
13 changes: 8 additions & 5 deletions src/src/services/api/projects/projectsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,17 @@ function fetchActivityData(): IApiRequest<any> {

function getProjectParams(
sequences: string[] = ['metric'],
selectedExperimentNames: string[] = [],
): IApiRequest<IProjectParamsMetrics> {
const query = sequences.reduce(
(acc: string, sequence: string, index: number) => {
const query =
sequences.reduce((acc: string, sequence: string, index: number) => {
acc += `${index === 0 ? '?' : '&'}sequence=${sequence}`;
return acc;
},
'',
);
}, '') +
selectedExperimentNames.reduce((acc: string, experimentName: string) => {
acc += `&experiment_names=${experimentName}`;
return acc;
}, '');
return API.get<IProjectParamsMetrics>(endpoints.GET_PROJECTS_PARAMS + query);
}

Expand Down
17 changes: 13 additions & 4 deletions src/src/services/models/explorer/createAppModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,10 @@ function createAppModel(appConfig: IAppInitialConfig) {
}

function fetchProjectParamsAndUpdateState() {
const selectedExperimentNames =
model.getState()?.config?.select.selectedExperimentNames;
projectsService
.getProjectParams(['metric'])
.getProjectParams(['metric'], selectedExperimentNames)
.call()
.then((data) => {
const advancedSuggestions: Record<any, any> = getAdvancedSuggestion(
Expand Down Expand Up @@ -2016,6 +2018,7 @@ function createAppModel(appConfig: IAppInitialConfig) {
onSelectExperimentNamesChange(experimentName: string): void {
// Handle experiment change, then re-fetch metrics data
onSelectExperimentNamesChange({ experimentName, model });
fetchProjectParamsAndUpdateState();
getMetricsData(true, true).call();
},
onToggleAllExperiments(experimentNames: string[]): void {
Expand Down Expand Up @@ -2232,9 +2235,11 @@ function createAppModel(appConfig: IAppInitialConfig) {
setModelDefaultAppConfigData();
}

const selectedExperimentNames =
model.getState()?.config?.select?.selectedExperimentNames;
const liveUpdateState = model.getState()?.config.liveUpdate;
projectsService
.getProjectParams(['metric'])
.getProjectParams(['metric'], selectedExperimentNames)
.call()
.then((data) => {
model.setState({
Expand Down Expand Up @@ -3281,8 +3286,10 @@ function createAppModel(appConfig: IAppInitialConfig) {
chartPanelRef: { current: null },
};
}
const selectedExperimentNames =
model.getState()?.config?.select?.selectedExperimentNames;
projectsService
.getProjectParams(['metric'])
.getProjectParams(['metric'], selectedExperimentNames)
.call()
.then((data) => {
model.setState({
Expand Down Expand Up @@ -4894,8 +4901,10 @@ function createAppModel(appConfig: IAppInitialConfig) {
}
const liveUpdateState = model.getState()?.config?.liveUpdate;

const selectedExperimentNames =
model.getState()?.config?.select.selectedExperimentNames;
projectsService
.getProjectParams(['metric'])
.getProjectParams(['metric'], selectedExperimentNames)
.call()
.then((data: IProjectParamsMetrics) => {
model.setState({
Expand Down

0 comments on commit ea4e25f

Please sign in to comment.