Trigger plot drawing and selectors update only after Go! is clicked (#…

…174) * Trigger plot drawing and selectors update only after button is clicked * Company-level: update plots and selectors after go * Fix wrong variable name emission intensity * Fix wrong sector name emission intensity
RMI-PACTA · Jan 14, 2025 · 7baaed9 · 7baaed9
1 parent 9905962
commit 7baaed9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/src/routes/company_view.svelte b/src/routes/company_view.svelte
@@ -281,6 +281,9 @@
 				fetchExposureStats();
 				if (checkDataAvailability()) {
 					showAnalysisHideAlert();
+					updateScenarioSourceSelector();
+					updateScenarioSelector();
+					updateAllocationMethodSelector();
 					fetchCompanyBubble();
 					fetchCompanyTechmix();
 				} else {
@@ -334,13 +337,7 @@
 
 		setValuesSectorSelectors();
 		setValuesAssetClassSelector();
-		updateScenarioSourceSelector();
-		updateScenarioSelector();
-		updateAllocationMethodSelector();
 		addEventListeners();
-		fetchExposureStats();
-		fetchCompanyBubble();
-		fetchCompanyTechmix();
 	});
 </script>
 

diff --git a/src/routes/sector_view.svelte b/src/routes/sector_view.svelte
@@ -117,7 +117,7 @@
 
 			let filteredEmissionsData = emissionsData
 				.filter((d) => d.asset_class == selectedClass)
-				.filter((d) => d.ald_sector == selectedSector);
+				.filter((d) => d.sector == selectedSector);
 
 			let check = [filteredTechmixData, filteredVolTrajData, filteredEmissionsData].some(
 				(x) => x.length != 0
@@ -212,7 +212,7 @@
 
 			let filteredEmissionsData = emissionsData
 				.filter((d) => d.asset_class == selectedClass)
-				.filter((d) => d.ald_sector == selectedSector);
+				.filter((d) => d.sector == selectedSector);
 			let allocationsEmissions = new Set(
 				d3.map(filteredEmissionsData, (d) => d.allocation_translation).keys()
 			);
@@ -324,6 +324,11 @@
 				fetchExposureStats();
 				if (checkDataAvailability()) {
 					showAnalysisHideAlert();
+					updateScenarioSourceSelector();
+					updateScenarioSelector();
+					updateAllocationMethodSelector();
+					updateEquityMarketSelector();
+					updateBenchmarkSelector();
 					fetchTrajectoryAlignmentIfApplicable();
 					fetchTechmix();
 					fetchEmissionIntensityPlot();
@@ -399,16 +404,7 @@
 		setValuesAssetClassSelector();
 		fetchExposureStats();
 		if (checkDataAvailability()) {
-			showAnalysisHideAlert();
-			updateScenarioSourceSelector();
-			updateScenarioSelector();
-			updateAllocationMethodSelector();
-			updateEquityMarketSelector();
-			updateBenchmarkSelector();
 			addEventListeners();
-			fetchTechmix();
-			fetchTrajectoryAlignmentIfApplicable();
-			fetchEmissionIntensityPlot();
 		} else {
 			handleNoDataForAssetSectorCombination();
 		}