@eodash/eodash 5.5.0 → 5.5.1

package/templates/expert.js

@@ -104,7 +104,7 @@ export default {
           ? {
               id: "expert-datepicker",
               type: "internal",
-              layout: { x: 4, y: 7, w: 4, h: 5 },
+              layout: { x: 4, y: 3, w: 4, h: 9 },
               title: "Date",
               widget: {
                 name: "EodashDatePicker",

package/templates/lite.js

@@ -122,7 +122,7 @@ export default {
           ? {
               id: "light-datepicker",
               type: "internal",
-              layout: { x: 4, y: 7, w: 4, h: 5 },
+              layout: { x: 4, y: 3, w: 4, h: 9 },
               title: "Date",
               widget: {
                 name: "EodashDatePicker",

package/widgets/EodashChart.vue

@@ -12,7 +12,7 @@
         </svg>
       </button>
       <eox-chart
-        class="pt-0"
+        class="pa-2"
         v-if="usedChartData && usedChartSpec"
         .spec="toRaw(usedChartSpec)"
         :key="chartRenderKey"
@@ -131,8 +131,8 @@ function toggleLayout() {
 
 .chart-toggle {
   position: absolute;
-  top: 38px;
-  right: 12px;
+  top: 18px;
+  right: 46px;
   z-index: 2;
   cursor: pointer;
 }

package/widgets/EodashDatePicker.vue

@@ -310,9 +310,12 @@ function jumpDate(reverse) {
 // fixes calendar dispalcement on lib mode
 const transform = ref("");
 onMounted(() => {
+  // keeping the reactive translate just in case,
+  // but seems like static css would work as well
+  // because the visual is same both in lib and in app mode
   transform.value = document.querySelector("eo-dash")
-    ? "translate3d(50px,-80px,0)"
-    : "translate3d(0px,-80px,0)";
+    ? "translate3d(30px,-50px,0)"
+    : "translate3d(30px,-50px,0)";
 });
 
 useTransparentPanel(rootEl);

package/widgets/EodashProcess/index.vue

@@ -13,22 +13,26 @@
       :enable-compare="enableCompare"
     >
     </EodashChart>
-    <div class="mt-2 text-right">
+    <div class="text-right">
       <v-btn
         v-if="showExecBtn"
         :loading="loading"
-        style="margin-right: 20px"
+        style="margin-right: 8px"
         :append-icon="[mdiCogPlayOutline]"
         @click="startProcess"
-        color="primary"
+        density="comfortable"
+        size="small"
       >
         Execute
       </v-btn>
       <v-btn
         v-if="processResults.length && isProcessed && !isAsync"
         color="primary"
+        style="margin-right: 8px"
         :append-icon="[mdiDownloadCircleOutline]"
         @click="downloadResults"
+        size="small"
+        density="comfortable"
       >
         Download
       </v-btn>

package/widgets/EodashProcess/methods/composables.js

@@ -70,7 +70,7 @@ export const useInitProcess = ({
       evt == "compareTime:updated"
     ) {
       await updateJsonformIdentifier({
-        jsonformSchema,
+        jsonformSchema: jsonformSchema.value,
         // @ts-expect-error TODO payload coming from time update events is not an object with layers property
         newLayers: _payload,
       });

package/widgets/EodashProcess/methods/handling.js

@@ -75,16 +75,18 @@ export async function initProcess({
   await jsonformEl.value?.editor.destroy();
   if (updatedJsonform) {
     // make sure correct target layer id is used in jsonform
-    if (updatedJsonform.properties?.feature?.options?.drawtools?.layerId) {
-      await updateJsonformIdentifier({
-        jsonformSchema,
-        newLayers: await getLayers(),
-      });
-    }
+    let newJsonForm = null;
+    newJsonForm = await updateJsonformIdentifier({
+      jsonformSchema: updatedJsonform,
+      newLayers: getLayers(),
+    });
     if (enableCompare) {
-      updatedJsonform = updateJsonformSchemaTarget(updatedJsonform);
+      newJsonForm = updateJsonformSchemaTarget(newJsonForm);
     }
-    jsonformSchema.value = updatedJsonform;
+    // trigger jsonform update in next tick
+    jsonformSchema.value = null;
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    jsonformSchema.value = newJsonForm;
   }
 }
 
@@ -94,11 +96,12 @@ export async function initProcess({
  * @export
  * @async
  * @param {Object} params
- * @param {import("vue").Ref<Record<string,any> | null>} params.jsonformSchema params.jsonformSchema
+ * @param {Record<string,any> | null} params.jsonformSchema params.jsonformSchema
  * @param {Record<string, any>[] | undefined} params.newLayers params.newLayers
+ * @returns {Promise<Record<string,any> | null | undefined>} updated jsonform schema
  */
 export async function updateJsonformIdentifier({ jsonformSchema, newLayers }) {
-  const form = jsonformSchema.value;
+  const form = jsonformSchema;
   if (!form) {
     return;
   }
@@ -130,9 +133,8 @@ export async function updateJsonformIdentifier({ jsonformSchema, newLayers }) {
         return;
       }
       for (const layer of layersArray) {
-        if (layer.layers) {
-          // @ts-expect-error TODO payload coming from time update events is not an object with layers property
-          traverseLayers(layer);
+        if (layer.type === "Group" && Array.isArray(layer.layers)) {
+          traverseLayers(layer.layers);
         } else {
           if (layer.properties?.id?.startsWith(layerId)) {
             matchedLayerId = layer.properties.id;
@@ -144,16 +146,15 @@ export async function updateJsonformIdentifier({ jsonformSchema, newLayers }) {
     traverseLayers(layers);
     if (matchedLayerId) {
       form.properties.feature.options.drawtools.layerId = matchedLayerId;
-      // trigger jsonform update in next tick
-      jsonformSchema.value = null;
-      await new Promise((resolve) => setTimeout(resolve, 0));
-      jsonformSchema.value = form;
+      return form;
     } else {
-      throw new Error(
+      console.warn(
         `Could not find matching layer for processing form with id: ${layerId}`,
       );
+      return null;
     }
   }
+  return form;
 }
 
 /**
@@ -223,7 +224,7 @@ export async function handleProcesses({
     }
 
     //@ts-expect-error we assume that the spec data is of type InlineData
-    if (tempChartSpec.data?.values?.length) {
+    if (Object.keys(tempChartSpec?.data?.values ?? {}).length) {
       //@ts-expect-error we assume that the spec data is of type InlineData
       processResults.value.push(tempChartSpec?.data.values);
     }

package/widgets/EodashProcess/methods/utils.js

@@ -564,7 +564,7 @@ export const applyProcessLayersToMap = (mapElement, processLayers) => {
 };
 /**
  * Updates the jsonform schema to target the compare map
- * @param {import("json-schema").JSONSchema7 | null | undefined} jsonformSchema
+ * @param {Record<string,any> | null | undefined} jsonformSchema
  */
 export function updateJsonformSchemaTarget(jsonformSchema) {
   if (!jsonformSchema) {
@@ -574,7 +574,5 @@ export function updateJsonformSchemaTarget(jsonformSchema) {
     "eox-map#main",
     "eox-map#compare",
   );
-  return /** @type {import("json-schema").JSONSchema7} */ (
-    JSON.parse(stringified)
-  );
+  return JSON.parse(stringified);
 }