From 669ba50ce1b1718df430621c55cfc6be443147f6 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Tue, 4 Feb 2025 22:08:01 -0500
Subject: [PATCH 1/4] mapping ops

---
 .../tera-compare-datasets-drilldown.vue       | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
index 337af22f23..122357c721 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
@@ -83,18 +83,14 @@
 								placeholder="Dataset"
 							/>
 							<label class="mt-2"> Map column names for each input </label>
-							<label class="mt-1"> (This mapping just assists in making the WIS table appear) </label>
+							<label class="mt-1"> (This mapping just assists in making the WIS table appear)</label>
 							<DataTable class="mt-2" :value="knobs.mapping">
-								<Column v-if="datasets[groundTruthDatasetIndex]?.id" :header="datasets[groundTruthDatasetIndex].name">
+								<Column v-if="knobs.selectedGroundTruthDatasetId" :header="datasets[groundTruthDatasetIndex].name">
 									<template #body="{ data }">
 										<Dropdown
 											class="mapping-dropdown"
 											v-model="data[datasets?.[groundTruthDatasetIndex].id as string]"
-											:options="
-												datasets[groundTruthDatasetIndex].columns
-													?.map((ele) => ele.name)
-													.filter((ele) => ele?.includes('mean') || ele?.includes('time'))
-											"
+											:options="mappingOptions[knobs.selectedGroundTruthDatasetId]"
 											filter
 											placeholder="Variable"
 											@change="constructWisTable"
@@ -113,17 +109,7 @@
 											placeholder="Variable"
 											filter
 											v-model="data[dataset.id]"
-											:options="
-												dataset.columns
-													?.map((ele) => ele.name)
-													.filter(
-														(ele) =>
-															!ele?.includes('median') &&
-															!ele?.includes('std') &&
-															!ele?.includes('min') &&
-															!ele?.includes('max')
-													)
-											"
+											:options="mappingOptions[dataset.id]"
 											@change="constructWisTable"
 										/>
 									</template>
@@ -137,6 +123,7 @@
 									</template>
 								</Column>
 							</DataTable>
+							ssss
 							<div class="flex justify-content-between mt-2">
 								<Button class="p-button-sm p-button-text" icon="pi pi-plus" label="Add mapping" @click="addMapping" />
 								<!-- TODO: Automapping
@@ -555,11 +542,8 @@ const rankingChartData = ref<ChartData | null>(null);
 const rankingResultsChart = ref<any>(null);
 const rankingCriteriaCharts = ref<any>([]);
 
-const variableNames = computed(() => {
-	if (impactChartData.value === null) return [];
-	const excludes = ['timepoint_id', 'sample_id', 'timepoint_unknown'];
-	return Object.keys(impactChartData.value.pyciemssMap).filter((key) => !excludes.includes(key));
-});
+const variableNames = ref<string[]>([]);
+const mappingOptions = ref<Record<string, string[]>>({});
 
 const { generateAnnotation, getChartAnnotationsByChartId, useCompareDatasetCharts } = useCharts(
 	props.node.id,
@@ -778,11 +762,34 @@ onMounted(async () => {
 		rankingResultsChart
 	);
 
+	let allVariableNames: string[] = [];
+	if (impactChartData.value) {
+		allVariableNames = Object.keys(impactChartData.value.pyciemssMap);
+		variableNames.value = allVariableNames.filter(
+			(key) => !['timepoint_id', 'sample_id', 'timepoint_unknown'].includes(key)
+		);
+	}
+
+	datasets.value.forEach((dataset) => {
+		const datasetId = dataset.id as string;
+		mappingOptions.value[datasetId] = [];
+
+		if (!dataset.columns) return;
+		dataset.columns.forEach((column) => {
+			if (!column.name) return;
+			mappingOptions.value[datasetId].push(column.name);
+		});
+	});
+	// return Object.keys(impactChartData.value.pyciemssMap).filter((key) => !excludes.includes(key));
+
+	console.log(mappingOptions.value);
+	console.log(impactChartData.value);
+
 	constructATETable();
 
 	if (isEmpty(knobs.value.mapping)) addMapping();
 
-	constructWisTable();
+	// constructWisTable();
 });
 
 watch(

From f872a87096f25ed93a3e9c7e7fec87360bd93b73 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Wed, 5 Feb 2025 10:41:43 -0500
Subject: [PATCH 2/4] get proper name

---
 .../tera-calibrate-node-ciemss.vue            |  2 +-
 .../tera-compare-datasets-drilldown.vue       | 75 ++++++++++---------
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
index e414aac9ec..0a291c91ca 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
@@ -8,7 +8,7 @@
 				:chart-settings="[...selectedInterventionSettings, ...selectedVariableSettings]"
 				:are-embed-actions-visible="true"
 				:placeholder="placeholderText"
-				:processing="processingMessage"
+				:progress="processingMessage"
 			/>
 			<vega-chart v-if="lossChartSpec" :are-embed-actions-visible="false" :visualization-spec="lossChartSpec" />
 		</section>
diff --git a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
index 122357c721..151c3b898c 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
@@ -84,21 +84,13 @@
 							/>
 							<label class="mt-2"> Map column names for each input </label>
 							<label class="mt-1"> (This mapping just assists in making the WIS table appear)</label>
-							<DataTable class="mt-2" :value="knobs.mapping">
-								<Column v-if="knobs.selectedGroundTruthDatasetId" :header="datasets[groundTruthDatasetIndex].name">
-									<template #body="{ data }">
-										<Dropdown
-											class="mapping-dropdown"
-											v-model="data[datasets?.[groundTruthDatasetIndex].id as string]"
-											:options="mappingOptions[knobs.selectedGroundTruthDatasetId]"
-											filter
-											placeholder="Variable"
-											@change="constructWisTable"
-										/>
-									</template>
-								</Column>
+							<DataTable v-if="groundTruthDatasetIndex !== -1" class="mt-2" :value="knobs.mapping">
+								<!--Put ground truth dataset in the first column-->
 								<Column
-									v-for="dataset in datasets.filter(({ id }) => id !== knobs.selectedGroundTruthDatasetId)"
+									v-for="dataset in [
+										datasets[groundTruthDatasetIndex],
+										...datasets.filter((dataset) => dataset.id !== knobs.selectedGroundTruthDatasetId)
+									]"
 									:key="dataset.id"
 									:header="dataset.name"
 								>
@@ -123,7 +115,6 @@
 									</template>
 								</Column>
 							</DataTable>
-							ssss
 							<div class="flex justify-content-between mt-2">
 								<Button class="p-button-sm p-button-text" icon="pi pi-plus" label="Add mapping" @click="addMapping" />
 								<!-- TODO: Automapping
@@ -689,6 +680,8 @@ function constructWisTable() {
 
 	const observationsKeyNames = Object.keys(observationsMap);
 
+	console.log(observationsMap);
+
 	datasets.value.forEach((dataset, index) => {
 		if (index === groundTruthDatasetIndex.value) return;
 
@@ -699,20 +692,28 @@ function constructWisTable() {
 			const key = `${variableName}${type}mean:${index}`;
 			if (!observationsKeyNames.includes(key)) return;
 
-			let groundTruthKey = `${key.slice(0, -1)}${groundTruthDatasetIndex.value}`;
+			let groundTruthKey = ''; // `${key.slice(0, -1)}${groundTruthDatasetIndex.value}`;
 			// Use mapping to get ground truth key
-			if (!observationsKeyNames.includes(groundTruthKey)) {
-				let isFound = false;
-				knobs.value.mapping.forEach((mapping) => {
-					if (
-						!isFound &&
-						Object.values(mapping).includes(key.slice(0, -2)) &&
-						knobs.value.selectedGroundTruthDatasetId
-					) {
-						groundTruthKey = `${mapping[knobs.value.selectedGroundTruthDatasetId]}:${groundTruthDatasetIndex.value}`;
-						isFound = true;
-					}
-				});
+			// if (!observationsKeyNames.includes(groundTruthKey)) {/
+			let isFound = false;
+			knobs.value.mapping.forEach((mapping) => {
+				// Object.values(mapping).includes(key.slice(0, -2)) &&
+				if (!isFound && knobs.value.selectedGroundTruthDatasetId) {
+					groundTruthKey = `${mapping[knobs.value.selectedGroundTruthDatasetId]}${type}mean:${groundTruthDatasetIndex.value}`;
+					console.log('found', groundTruthKey);
+					isFound = true;
+				}
+			});
+			// }
+
+			// console.log(observationsMap[groundTruthKey]);
+			// console.log(groundTruthKey);
+			// console.log(knobs.value.mapping);
+			// console.log('key', key);
+			// console.log('_____');
+
+			if (!observationsMap[groundTruthKey]) {
+				return;
 			}
 
 			const wis = getWeightedIntervalScore(
@@ -762,6 +763,7 @@ onMounted(async () => {
 		rankingResultsChart
 	);
 
+	// Prepare variable dropdowns
 	let allVariableNames: string[] = [];
 	if (impactChartData.value) {
 		allVariableNames = Object.keys(impactChartData.value.pyciemssMap);
@@ -770,6 +772,12 @@ onMounted(async () => {
 		);
 	}
 
+	const swappedPyCiemssMap: Record<string, string> = {};
+	Object.entries(impactChartData.value?.pyciemssMap ?? {}).forEach(([key, value]) => {
+		swappedPyCiemssMap[value] = key;
+	});
+	const pyciemssNames = Object.keys(swappedPyCiemssMap);
+
 	datasets.value.forEach((dataset) => {
 		const datasetId = dataset.id as string;
 		mappingOptions.value[datasetId] = [];
@@ -777,19 +785,18 @@ onMounted(async () => {
 		if (!dataset.columns) return;
 		dataset.columns.forEach((column) => {
 			if (!column.name) return;
-			mappingOptions.value[datasetId].push(column.name);
+			if (pyciemssNames.includes(column.name)) {
+				mappingOptions.value[datasetId].push(swappedPyCiemssMap[column.name]);
+			}
 		});
 	});
-	// return Object.keys(impactChartData.value.pyciemssMap).filter((key) => !excludes.includes(key));
-
-	console.log(mappingOptions.value);
-	console.log(impactChartData.value);
 
+	// Construct tables
 	constructATETable();
 
 	if (isEmpty(knobs.value.mapping)) addMapping();
 
-	// constructWisTable();
+	constructWisTable();
 });
 
 watch(

From 6c323aa0230f823937d7bbf3acfad1e6297c1492 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Wed, 5 Feb 2025 15:31:40 -0500
Subject: [PATCH 3/4] options appear

---
 .../tera-compare-datasets-drilldown.vue          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
index a7d665328c..034b704bf0 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
@@ -780,17 +780,29 @@ onMounted(async () => {
 	});
 	const pyciemssNames = Object.keys(swappedPyCiemssMap);
 
+	console.log(impactChartData.value?.pyciemssMap);
+	console.log(swappedPyCiemssMap);
+
 	datasets.value.forEach((dataset) => {
 		const datasetId = dataset.id as string;
 		mappingOptions.value[datasetId] = [];
 
 		if (!dataset.columns) return;
 		dataset.columns.forEach((column) => {
-			if (!column.name || column.fileName !== getFileName(dataset) || !pyciemssNames.includes(column.name)) return;
-			mappingOptions.value[datasetId].push(swappedPyCiemssMap[column.name]);
+			if (!column.name || column.fileName !== getFileName(dataset)) return;
+
+			let option = '';
+			if (pyciemssNames.includes(column.name)) option = swappedPyCiemssMap[column.name];
+			else if (pyciemssNames.includes(`data/${column.name}`)) option = swappedPyCiemssMap[`data/${column.name}`];
+			if (!option) return;
+
+			mappingOptions.value[datasetId].push(option);
 		});
 	});
 
+	console.log(mappingOptions.value);
+	console.log(swappedPyCiemssMap);
+
 	// Construct tables
 	constructATETable();
 

From 7e8cb58ddaf2f50e485832c2d734a43ba1564f1b Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Wed, 5 Feb 2025 15:32:11 -0500
Subject: [PATCH 4/4] rm log

---
 .../compare-datasets/tera-compare-datasets-drilldown.vue    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
index 034b704bf0..be34e3c970 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
@@ -780,9 +780,6 @@ onMounted(async () => {
 	});
 	const pyciemssNames = Object.keys(swappedPyCiemssMap);
 
-	console.log(impactChartData.value?.pyciemssMap);
-	console.log(swappedPyCiemssMap);
-
 	datasets.value.forEach((dataset) => {
 		const datasetId = dataset.id as string;
 		mappingOptions.value[datasetId] = [];
@@ -800,9 +797,6 @@ onMounted(async () => {
 		});
 	});
 
-	console.log(mappingOptions.value);
-	console.log(swappedPyCiemssMap);
-
 	// Construct tables
 	constructATETable();