Edit function: draw column chart, selection-based

Use spread operator to replace the references that contain the values
for the formatted observations and formatted metadata

public/js/appChart.js

@@ -193,7 +193,7 @@ const drawChartUsingSelectedOptions = async function () {
           )
         : selectedBuildingsDataPointsSamplingRateAbbrevNestedArr;
 
-    // Check if we have dT (temperature difference)
+    // Check if we have dT (temperature difference), if so, extract these options
     const selectedBuildingsDataPointsSamplingRateAbbrevTempDiffArr =
       checkIfSelectedOptionsContainTemperatureDifference(
         selectedBuildingsDataPointsSamplingRateAbbrevNestedArr

public/js/src_modules/dropDownListChartColumn.mjs

@@ -46,19 +46,16 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Sum" &&
     selectedAggregationDuration === "Daily"
   ) {
-    const [
-      formattedObservationsSumDailyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatDailySumObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
+    // Note: The `drawColumnChart` function expects two arguments,
+    // these are obtained by using the spread operator on the
+    // result returned from the `calculateAndFormat...` functions
     drawColumnChartHighcharts(
-      formattedObservationsSumDailyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatDailySumObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
   // Monthly / sum
@@ -66,19 +63,13 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Sum" &&
     selectedAggregationDuration === "Monthly"
   ) {
-    const [
-      formattedObservationsSumMonthlyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatMonthlySumObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
     drawColumnChartHighcharts(
-      formattedObservationsSumMonthlyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatMonthlySumObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
   // Daily / maximum
@@ -86,20 +77,13 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Maximum" &&
     selectedAggregationDuration === "Daily"
   ) {
-    // Formatted observations and metadata for chart - daily / maximum
-    const [
-      formattedObservationsMaximumDailyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatDailyMaximumObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
     drawColumnChartHighcharts(
-      formattedObservationsMaximumDailyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatDailyMaximumObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
   // Monthly / maximum
@@ -107,19 +91,13 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Maximum" &&
     selectedAggregationDuration === "Monthly"
   ) {
-    const [
-      formattedObservationsMaximumMonthlyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatMonthlyMaximumObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
     drawColumnChartHighcharts(
-      formattedObservationsMaximumMonthlyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatMonthlyMaximumObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
   // Daily / minimum
@@ -127,20 +105,13 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Minimum" &&
     selectedAggregationDuration === "Daily"
   ) {
-    // Formatted observations and metadata for chart - daily / minimum
-    const [
-      formattedObservationsMinimumDailyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatDailyMinimumObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
     drawColumnChartHighcharts(
-      formattedObservationsMinimumDailyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatDailyMinimumObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
   // Monthly / minimum
@@ -148,19 +119,13 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Minimum" &&
     selectedAggregationDuration === "Monthly"
   ) {
-    const [
-      formattedObservationsMinimumMonthlyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatMonthlyMinimumObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
     drawColumnChartHighcharts(
-      formattedObservationsMinimumMonthlyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatMonthlyMinimumObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
   // Daily / average
@@ -168,19 +133,13 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Average" &&
     selectedAggregationDuration === "Daily"
   ) {
-    const [
-      formattedObservationsAverageDailyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatDailyAverageObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
     drawColumnChartHighcharts(
-      formattedObservationsAverageDailyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatDailyAverageObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
   // Monthly / average
@@ -188,19 +147,13 @@ export const drawColumnChartBasedOnSelectedAggregationOptions = function (
     selectedAggregationType === "Average" &&
     selectedAggregationDuration === "Monthly"
   ) {
-    const [
-      formattedObservationsAverageMonthlyNestedArr,
-      extractedFormattedDatastreamProperties,
-    ] = calculateAndFormatMonthlyAverageObservations(
-      uniqueCalendarDatesNestedArr,
-      observationsNestedArr,
-      selectedSamplingRateAbbrev,
-      formattedMetadataNestedArr
-    );
-
     drawColumnChartHighcharts(
-      formattedObservationsAverageMonthlyNestedArr,
-      extractedFormattedDatastreamProperties
+      ...calculateAndFormatMonthlyAverageObservations(
+        uniqueCalendarDatesNestedArr,
+        observationsNestedArr,
+        selectedSamplingRateAbbrev,
+        formattedMetadataNestedArr
+      )
     );
   }
 };

public/js/src_modules/fetchData.mjs

@@ -35,7 +35,7 @@ const getDatastream = function (urlDatastream) {
 };
 
 /**
- * Perform a GET request using the Axios library
+ * Perform a GET request to fetch Observations using the Axios library
  * @param {String} urlObservations A URL that fetches Observations from an STA instance
  * @param {Object} urlParamObj The URL parameters to be sent together with the GET request
  * @returns {Promise} A promise that contains the first page of results when fulfilled