diff --git a/app/static/src/app/store/sensitivity/actions.ts b/app/static/src/app/store/sensitivity/actions.ts index 39d2d1977..3967f6a9f 100644 --- a/app/static/src/app/store/sensitivity/actions.ts +++ b/app/static/src/app/store/sensitivity/actions.ts @@ -40,11 +40,8 @@ const batchRunOde = (runner: OdinRunnerOde, endTime: number, advancedSettings: AdvancedSettings, paramValues: OdinUserType | null): Batch => { - console.log("doing batch run ode"); const advancedSettingsOdin = convertAdvancedSettingsToOdin(advancedSettings, paramValues); - console.log("got adv settings"); const batch = runner.batchRun(odin, pars, 0, endTime, advancedSettingsOdin); - console.log("got batch"); return batch; }; @@ -79,9 +76,7 @@ export const runSensitivity = ( const isStochastic = rootState.appType === AppType.Stochastic; const hasRunner = rootGetters[`model/${ModelGetter.hasRunner}`]; - console.log("1"); if (hasRunner && odin && batchPars) { - console.log("2"); const payload : OdinSensitivityResult = { inputs: { endTime, pars: batchPars }, batch: null, @@ -102,9 +97,7 @@ export const runSensitivity = ( detail: (e as Error).message }; } - console.log("3"); commit(BaseSensitivityMutation.SetResult, payload); - console.log("4"); if (!multiSensitivity && getters.parameterSetSensitivityUpdateRequired && !isStochastic) { const parameterSetBatchPars = getters[SensitivityGetter.parameterSetBatchPars]; diff --git a/app/static/src/app/userMessages.ts b/app/static/src/app/userMessages.ts index 6048e062d..f1316a419 100644 --- a/app/static/src/app/userMessages.ts +++ b/app/static/src/app/userMessages.ts @@ -84,7 +84,7 @@ export default { } }, sensitivity: { - compileRequiredForOptions: (multiSens: boolean) => "Please compile a valid model in order to set" + compileRequiredForOptions: (multiSens: boolean) => "Please compile a valid model in order to set " + `${sensType(multiSens)} options.`, compileRequiredForUpdate: (multiSens: boolean) => "Model code has been updated. " + `Compile code and Run ${sensType(multiSens)} to update.`, diff --git a/app/static/tests/e2e/fit.etest.ts b/app/static/tests/e2e/fit.etest.ts index 14418ff78..cf38deb17 100644 --- a/app/static/tests/e2e/fit.etest.ts +++ b/app/static/tests/e2e/fit.etest.ts @@ -276,7 +276,7 @@ test.describe("Wodin App model fit tests", () => { // Back to sensitivity tab await page.click(":nth-match(.wodin-right .nav-tabs a, 3)"); await expect(await page.innerText(".action-required-msg")) - .toBe("Plot is out of date: parameters have been changed. Run sensitivity to update."); + .toBe("Plot is out of date: parameters have been changed. Run Sensitivity to update."); }); test("can display sum of squares on run tab", async ({ page }) => { diff --git a/app/static/tests/e2e/sensitivity.etest.ts b/app/static/tests/e2e/sensitivity.etest.ts index 78b6e430a..a5fc1e15a 100644 --- a/app/static/tests/e2e/sensitivity.etest.ts +++ b/app/static/tests/e2e/sensitivity.etest.ts @@ -116,7 +116,7 @@ test.describe("Sensitivity tests", () => { // change parameter - should see update required message await page.fill("#model-params .parameter-input", "5"); await expect(await page.innerText(".action-required-msg")) - .toBe("Plot is out of date: parameters have been changed. Run sensitivity to update."); + .toBe("Plot is out of date: parameters have been changed. Run Sensitivity to update."); // re-run - message should be removed await page.click("#run-sens-btn"); diff --git a/app/static/tests/unit/store/multiSensitivity/actions.test.ts b/app/static/tests/unit/store/multiSensitivity/actions.test.ts index 84046ef66..c03edfbdd 100644 --- a/app/static/tests/unit/store/multiSensitivity/actions.test.ts +++ b/app/static/tests/unit/store/multiSensitivity/actions.test.ts @@ -39,7 +39,6 @@ describe("multiSensitivity actions", () => { rootState, getters: testGetters, commit, dispatch, rootGetters }); - console.log("expecting..."); expect(commit).toHaveBeenCalledTimes(2); expect(commit.mock.calls[0][0]).toBe(BaseSensitivityMutation.SetResult); expect(commit.mock.calls[0][1]).toStrictEqual({