@geo2france/api-dashboard 1.11.1 → 1.11.2

package/dist/components/DashboardPage/Page.d.ts

@@ -25,6 +25,7 @@ type dataset = {
     isError: boolean;
     producers?: any[];
     geojson?: any;
+    dataHash?: number;
 };
 type ControlContextType = {
     values: Record<string, any>;

package/dist/components/Dataset/Dataset.js

@@ -4,11 +4,12 @@ import { useApi } from "../..";
 import { ControlContext, DatasetRegistryContext } from "../DashboardPage/Page";
 import { Producer } from "./Producer";
 import React from "react";
-import { Filter, Transform, useAllDatasets } from "../../dsl";
+import { Filter, Transform, useAllDatasets, useDatasets } from "../../dsl";
 import alasql from "alasql";
 import { DataProviderContext, getProviderFromType } from "./Provider";
 import { Join } from "./Join";
 import { from } from "arquero";
+import hashCode from "../../utils/hash_data";
 export const DSL_Dataset = ({ children, id, provider: provider_input, type: providerType = 'file', url: providerUrl, resource, pageSize, meta }) => {
     const getTransformerFn = (component) => {
         /*
@@ -37,9 +38,16 @@ export const DSL_Dataset = ({ children, id, provider: provider_input, type: prov
                     inner: { left: false, right: false },
                 }[join_type] ?? { left: false, right: false };
                 const otherData = allDatasets?.find((d) => d.id === props.dataset)?.data;
-                if (!otherData || otherData.length < 1)
+                // Return undefinied if otherData is Fetching ?
+                if (!otherData || !data)
                     return undefined; // prevent arquero from crash on missed data
-                return from(data).join(from(otherData), props.joinKey, undefined, aq_join_option).objects();
+                //fallback if one of dataset is empty. Build a 1 row table with existing joinKey
+                const [leftKey, rightKey] = Array.isArray(props.joinKey) // joinKey can be a string or un string[]
+                    ? props.joinKey
+                    : [props.joinKey, props.joinKey];
+                const leftTable = data.length >= 1 ? data : [{ [leftKey]: null }];
+                const rightTable = otherData.length >= 1 ? otherData : [{ [rightKey]: null }];
+                return from(leftTable).join(from(rightTable), props.joinKey, undefined, aq_join_option).objects();
             };
             return funct;
         }
@@ -49,7 +57,6 @@ export const DSL_Dataset = ({ children, id, provider: provider_input, type: prov
     };
     const datasetRegistryContext = useContext(DatasetRegistryContext);
     const allDatasets = useAllDatasets();
-    const someFetching = !!allDatasets?.some(d => d.isFetching);
     const controlContext = useContext(ControlContext);
     const controls = controlContext?.values;
     const providerContext = useContext(DataProviderContext);
@@ -70,12 +77,15 @@ export const DSL_Dataset = ({ children, id, provider: provider_input, type: prov
         });
     });
     const { data, isFetching, isError } = useApi({ dataProvider: provider, resource: resource, filters: filters, pagination: { pageSize: pageSize }, meta: meta });
+    const dep_dataset_id = []; // Dependencies
     const transformers = [];
     /* Récuperer les fonctions transformers */
     React.Children.toArray(children)
         .filter((c) => React.isValidElement(c))
         .filter((c) => typeof c.type != 'string' && (c.type.name == Transform.name || c.type.name == Join.name)).forEach((c) => {
         transformers.push(getTransformerFn(c));
+        if (typeof c.type != 'string' && c.type.name == Join.name)
+            dep_dataset_id.push(c.props.dataset); // Add joint dataset in dep list
     });
     const producers = [];
     React.Children.toArray(children)
@@ -83,12 +93,24 @@ export const DSL_Dataset = ({ children, id, provider: provider_input, type: prov
         .filter((c) => typeof c.type != 'string' && c.type.name == Producer.name).forEach((c) => {
         producers.push({ nom: c.props.children, url: c.props.url });
     });
+    const depDataset = useDatasets(dep_dataset_id);
+    const depDataHash = depDataset?.map(d => d?.dataHash); //Build hash array from data
+    const someDepsAreFetching = depDataset?.some(d => d?.isFetching);
     useEffect(() => {
         const finalData = data?.data && transformers.reduce((datat, fn) => fn(datat), data.data);
         if (datasetRegistryContext) {
-            datasetRegistryContext({ id: id, resource: resource, data: finalData, isFetching: isFetching, isError: isError, producers: producers, geojson: data?.geojson });
+            datasetRegistryContext({
+                id: id,
+                resource: resource,
+                data: finalData,
+                isFetching: !!isFetching || !!someDepsAreFetching,
+                isError: isError,
+                producers: producers,
+                geojson: data?.geojson,
+                dataHash: hashCode(finalData)
+            });
             //Ajouter une info pour distinguer les erreurs du fourniseurs et celles des transformers ?
         }
-    }, [resource, data, isFetching, someFetching, children]);
+    }, [resource, data, (!!isFetching || !!someDepsAreFetching), hashCode(depDataHash), children]);
     return (_jsx(_Fragment, { children: children }));
 };

package/dist/components/Dataset/hooks.d.ts

@@ -6,6 +6,7 @@ export declare const useDataset: (dataset_id?: string) => {
     isError: boolean;
     producers?: any[];
     geojson?: any;
+    dataHash?: number;
 } | undefined;
 export declare const useDatasets: (dataset_ids?: string[]) => {
     id: string;
@@ -15,6 +16,7 @@ export declare const useDatasets: (dataset_ids?: string[]) => {
     isError: boolean;
     producers?: any[];
     geojson?: any;
+    dataHash?: number;
 }[] | undefined;
 export declare const useAllDatasets: () => {
     id: string;
@@ -24,4 +26,5 @@ export declare const useAllDatasets: () => {
     isError: boolean;
     producers?: any[];
     geojson?: any;
+    dataHash?: number;
 }[] | undefined;

package/dist/utils/hash_data.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Returns a hash code from a string
+ * From https://stackoverflow.com/a/8831937/10995624
+ * @param  {String} str The string to hash.
+ * @return {Number}    A 32bit integer
+ * @see http://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
+ */
+declare function hashCode(input: any): number | undefined;
+export default hashCode;

package/dist/utils/hash_data.js

@@ -0,0 +1,20 @@
+/**
+ * Returns a hash code from a string
+ * From https://stackoverflow.com/a/8831937/10995624
+ * @param  {String} str The string to hash.
+ * @return {Number}    A 32bit integer
+ * @see http://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
+ */
+function hashCode(input) {
+    if (input === undefined)
+        return undefined;
+    let hash = 0;
+    const str = JSON.stringify(input);
+    for (let i = 0, len = str.length; i < len; i++) {
+        let chr = str.charCodeAt(i);
+        hash = (hash << 5) - hash + chr;
+        hash |= 0; // Convert to 32bit integer
+    }
+    return hash;
+}
+export default hashCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geo2france/api-dashboard",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "private": false,
   "description": "Build dashboards with JSX/TSX",
   "main": "dist/index.js",