@eodash/eodash 5.4.0 → 5.5.0

package/widgets/EodashProcess/methods/outputs.js

@@ -17,7 +17,7 @@ import { isFirstLoad } from "@/utils/states";
  * @param {Record<string,any>} options.jsonformSchema
  * @param {import("vue").Ref<import("../types").AsyncJob[]>} options.jobs
  * @param {boolean} [options.enableCompare=false] - Whether to enable compare mode
- * @returns {Promise<[import("@eox/chart").EOxChart["spec"] | null,Record<string,any>|null]>}
+ * @returns {Promise<[import("vega-embed").VisualizationSpec | null,Record<string,any>|null]>}
  **/
 export async function processCharts({
   links,
@@ -61,10 +61,50 @@ export async function processCharts({
   if (data && data.length) {
     //@ts-expect-error we assume data to exist in spec
     spec.data.values = data;
-    return [spec, dataValues];
+    return [structuredClone(spec), structuredClone(dataValues)];
   }
-
   const dataLinks = standardLinks.filter((link) => link.rel === "service");
+
+  // We count if there are at least two application/json links, if yes,
+  // we download the data and assign them to specific data ids in the spec
+  const jsonLinks = dataLinks.filter(
+    (link) => link.type === "application/json",
+  );
+  if (jsonLinks.length >= 2) {
+    for (const link of jsonLinks ?? []) {
+      let linkType = link.type;
+      switch (linkType) {
+        case undefined:
+          continue;
+        case "application/json":
+          dataValues[/** @type {string} */ (link.id)] = await axios
+            .get(
+              mustache.render(link.href, {
+                ...(jsonformValue ?? {}),
+              }),
+            )
+            .then((resp) => resp.data);
+          // assign to spec datasets, assuming spec.data is InlineData
+          // Always assign values as an object with string keys
+          if (spec.data) {
+            /** @type {import("vega-lite/build/src/data").InlineData} */
+            (spec.data).values = {
+              ...(spec.data &&
+              "values" in spec.data &&
+              typeof spec.data.values === "object"
+                ? spec.data.values
+                : {}),
+              [/** @type {string} */ (link.id)]:
+                dataValues[/** @type {string} */ (link.id)],
+            };
+          }
+          break;
+        default:
+          break;
+      }
+    }
+    return [spec, dataValues];
+  }
   try {
     checkForData: for (const link of dataLinks ?? []) {
       switch (link.type) {
@@ -104,7 +144,7 @@ export async function processCharts({
   } catch (e) {
     console.error("[eodash] Error while injecting Vega data", e);
   }
-  return [spec, dataValues];
+  return [structuredClone(spec), structuredClone(dataValues)];
 }
 
 /**

package/widgets/EodashProcess/methods/utils.js

@@ -543,7 +543,7 @@ export const applyProcessLayersToMap = (mapElement, processLayers) => {
       (l) => l.properties?.id === layer.properties?.id,
     );
     if (!exists) {
-      analysisGroup.layers.unshift(layer);
+      analysisGroup.layers.push(layer);
     } else {
       analysisGroup.layers = replaceLayer(
         analysisGroup.layers,

package/widgets/EodashStacInfo.vue

@@ -6,9 +6,7 @@
       .body="body"
       .featured="featured"
       .footer="footer"
-      .styleOverride="styleOverride"
       .header="header"
-      .subheader="subheader"
       .tags="tags"
       style="--color-primary-lighter: none"
     >
@@ -20,25 +18,12 @@
 import "@eox/stacinfo";
 import { currentUrl } from "@/store/states";
 
-const {
-  allowHtml,
-  featured,
-  footer,
-  header,
-  body,
-  styleOverride,
-  subheader,
-  tags,
-} = defineProps({
+const { allowHtml, featured, footer, header, body, tags } = defineProps({
   allowHtml: {
     type: Boolean,
     default: true,
   },
 
-  styleOverride: {
-    type: String,
-    default: "",
-  },
   header: {
     /** @type {import("vue").PropType<string[]>}  */
     type: Array,
@@ -49,15 +34,17 @@ const {
     type: Array,
     default: () => ["themes"],
   },
-  subheader: {
-    /** @type {import("vue").PropType<string[]>}  */
-    type: Array,
-    default: () => [],
-  },
   body: {
     /** @type {import("vue").PropType<string[]>}  */
     type: Array,
-    default: () => ["satellite", "sensor", "agency", "extent"],
+    default: () => [
+      "satellite",
+      "sensor",
+      "insituSources",
+      "otherSources",
+      "agency",
+      "extent",
+    ],
   },
   featured: {
     /** @type {import("vue").PropType<string[]>}  */
@@ -67,7 +54,7 @@ const {
   footer: {
     /** @type {import("vue").PropType<string[]>}  */
     type: Array,
-    default: () => ["sci:citation"],
+    default: () => ["sci:citation", "sci:doi", "sci:publication"],
   },
 });
 </script>

package/widgets/ExportState.vue

@@ -37,7 +37,7 @@
           {{ removeUnneededProperties(getLayers()) }}
         </div>
 
-        <div v-if="props.getChartSpec?.()" class="mb-4">
+        <div v-if="chartSpec" class="mb-4">
           <p class="text-body-2 mb-2">
             <strong>Chart Spec (for export)</strong>
           </p>
@@ -61,12 +61,10 @@ import { mdiClipboardCheckOutline, mdiContentCopy } from "@mdi/js";
 import PopUp from "./PopUp.vue";
 import { copyToClipBoard } from "@/utils";
 import { ref } from "vue";
-import {
-  getLayers as getLayerAction,
-  getChartSpec as getChartSpecAction,
-} from "@/store/actions";
-import { mapPosition, availableMapProjection } from "@/store/states";
+import { getLayers as getLayerAction } from "@/store/actions";
+import { mapPosition, availableMapProjection, chartSpec } from "@/store/states";
 import { removeUnneededProperties } from "@/eodashSTAC/helpers";
+import { base64EncodeSpec } from "@eox/chart";
 
 const dialog = defineModel({ type: Boolean, required: true, default: false });
 
@@ -75,10 +73,6 @@ const props = defineProps({
     type: Function,
     default: getLayerAction,
   },
-  getChartSpec: {
-    type: Function,
-    default: getChartSpecAction,
-  },
 });
 
 const copySuccess = ref(false);
@@ -105,7 +99,7 @@ const copyBtns = [
     copyFn: async () =>
       await copyToClipBoard(getChartExportCode(), copySuccess),
     copyAs: "chart",
-    showIf: () => !!props.getChartSpec?.(),
+    showIf: () => chartSpec.value,
   },
 ];
 
@@ -128,12 +122,12 @@ const getMapEntryCode = () => {
 };
 
 const getChartExportCode = () => {
-  const chartSpec = props.getChartSpec?.();
-  if (!chartSpec) return "";
+  if (!chartSpec.value) return "";
   const preTag =
-    "## Chart Example <!" + '--{as="eox-chart" style="height: 300px;" spec=';
+    "## Chart Example <!" + '--{as="eox-chart" style="height: 400px;" spec=';
   const endTag = " }-->";
-  return `${preTag}'${JSON.stringify(chartSpec)}'${endTag}`;
+  const escapedSpec = base64EncodeSpec(chartSpec.value);
+  return `${preTag}'${escapedSpec}'${endTag}`;
 };
 </script>
 <style scoped>