diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/mod.ts b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/mod.ts index 42bad1cc81..3a10952049 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/mod.ts +++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/mod.ts @@ -1,6 +1,6 @@ import { CalibrateEnsembleCiemssOperation as operation } from './calibrate-ensemble-ciemss-operation'; import node from './tera-calibrate-ensemble-node-ciemss.vue'; -import drilldown from './tera-calibrate-ensemble-ciemss.vue'; +import drilldown from './tera-calibrate-ensemble-ciemss-drilldown.vue'; const name = operation.name; diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss-drilldown.vue similarity index 100% rename from packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue rename to packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss-drilldown.vue diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/mod.ts b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/mod.ts index 4f9c1e4a45..68086b6954 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/mod.ts +++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/mod.ts @@ -1,6 +1,6 @@ import { SimulateEnsembleCiemssOperation as operation } from './simulate-ensemble-ciemss-operation'; import node from './tera-simulate-ensemble-node-ciemss.vue'; -import drilldown from './tera-simulate-ensemble-ciemss.vue'; +import drilldown from './tera-simulate-ensemble-ciemss-drilldown.vue'; const name = operation.name; diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/simulate-ensemble-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/simulate-ensemble-ciemss-operation.ts index b1f100275f..e90e2f79d8 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/simulate-ensemble-ciemss-operation.ts +++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/simulate-ensemble-ciemss-operation.ts @@ -9,7 +9,8 @@ export interface SimulateEnsembleCiemssOperationState extends BaseState { mapping: EnsembleModelConfigs[]; timeSpan: TimeSpan; numSamples: number; - inProgressSimulationId: string; + inProgressForecastId: string; + forecastId: string; // Completed run's Id errorMessage: { name: string; value: string; traceback: string }; } @@ -20,7 +21,7 @@ export const SimulateEnsembleCiemssOperation: Operation = { documentationUrl: DOCUMENTATION_URL, imageUrl: simulateEnsembleCiemss, inputs: [{ type: 'modelConfigId', label: 'Model configuration', acceptMultiple: false }], - outputs: [{ type: 'simulationId' }], + outputs: [{ type: 'datasetId' }], isRunnable: true, // TODO: Figure out mapping @@ -35,7 +36,8 @@ export const SimulateEnsembleCiemssOperation: Operation = { mapping: [], timeSpan: { start: 0, end: 40 }, numSamples: 40, - inProgressSimulationId: '', + inProgressForecastId: '', + forecastId: '', errorMessage: { name: '', value: '', traceback: '' } }; return init; diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss-drilldown.vue similarity index 97% rename from packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue rename to packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss-drilldown.vue index 5ddc448f93..02152f8832 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss-drilldown.vue @@ -238,7 +238,7 @@ const numSamples = ref(props.node.state.numSamples); const newSolutionMappingKey = ref(''); const runResults = ref({}); -const cancelRunId = computed(() => props.node.state.inProgressSimulationId); +const cancelRunId = computed(() => props.node.state.inProgressForecastId); // Preview selection const outputs = computed(() => { if (!_.isEmpty(props.node.outputs)) { @@ -302,7 +302,7 @@ const runEnsemble = async () => { const response = await makeEnsembleCiemssSimulation(params, nodeMetadata(props.node)); const state = _.cloneDeep(props.node.state); - state.inProgressSimulationId = response.simulationId; + state.inProgressForecastId = response.simulationId; emit('update-state', state); }; @@ -344,7 +344,7 @@ onMounted(async () => { }); watch( - () => props.node.state.inProgressSimulationId, + () => props.node.state.inProgressForecastId, (id) => { if (id === '') showSpinner.value = false; else showSpinner.value = true; @@ -359,8 +359,10 @@ watch( selectedOutputId.value = output.id; selectedRunId.value = output.value[0]; + const forecastId = props.node.state.forecastId; + if (!forecastId) return; - const response = await getRunResultCiemss(output.value[0], 'result.csv'); + const response = await getRunResultCiemss(forecastId, 'result.csv'); runResults.value = response.runResults; }, { immediate: true } diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue index 71c7d24f39..40f9304e72 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue @@ -1,5 +1,5 @@