@xyo-network/react-map 2.38.10 → 2.38.12

package/dist/esm/hooks/useFetchPayloads.d.ts

@@ -1,6 +1,9 @@
-import { XyoApiError } from '@xyo-network/api';
 declare const useFetchPayloads: (hashes?: string[]) => {
-    apiError: XyoApiError<any, any> | undefined;
+    apiError: (import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+        message?: string | undefined;
+        schema: "network.xyo.error";
+        sources: string[];
+    }) | undefined;
     features: import("geojson").Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>[];
     multipleFeatureSets: import("geojson").Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>[][];
     notFound: boolean;

package/dist/esm/hooks/useFetchPayloads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFetchPayloads.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFetchPayloads.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAQ9C,QAAA,MAAM,gBAAgB,YAAa,MAAM,EAAE;;;;;CA6C1C,CAAA;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"useFetchPayloads.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFetchPayloads.tsx"],"names":[],"mappings":"AASA,QAAA,MAAM,gBAAgB,YAAa,MAAM,EAAE;;;;;;;;;CAqC1C,CAAA;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/dist/esm/hooks/useFetchPayloads.js

@@ -1,11 +1,10 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { useArchive } from '@xyo-network/react-archive';
-import { useArchivistApi } from '@xyo-network/react-archivist-api';
+import { XyoArchivistWrapper } from '@xyo-network/archivist';
+import { useArchivist } from '@xyo-network/react-archivist';
 import { useState } from 'react';
 import { useQuadKeyPayloadsToFeatures } from './useQuadKeyPayloadsToFeatures';
 const useFetchPayloads = (hashes) => {
-    const { api: ArchivistApi } = useArchivistApi();
-    const { archive } = useArchive();
+    const { archivist } = useArchivist();
     const [apiError, setApiError] = useState();
     const [payloads, setPayloads] = useState();
     const { features, multipleFeatureSets } = useQuadKeyPayloadsToFeatures(payloads);
@@ -14,35 +13,29 @@ const useFetchPayloads = (hashes) => {
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-        if (ArchivistApi && payloads === undefined && hashes?.length && !inFlight) {
+        if (archivist && payloads === undefined && hashes?.length && !inFlight) {
+            const archivistWrapper = new XyoArchivistWrapper(archivist);
             try {
                 setInFlight(true);
-                const payloads = await Promise.allSettled(hashes.map((hash) => ArchivistApi.archive(archive).payload.hash(hash).get()));
-                if (payloads?.length) {
-                    const validPayloads = [];
-                    payloads.forEach((result) => {
-                        if (result.status === 'fulfilled' && result.value && result.value[0]) {
-                            validPayloads.push(result.value[0]);
-                        }
-                        else if (result.status === 'rejected') {
-                            setApiError(result.reason);
-                        }
-                    });
-                    if (validPayloads.length) {
-                        setPayloads(validPayloads);
-                    }
-                    if (validPayloads.length === 0 && apiError === undefined) {
+                const payloads = await archivistWrapper.get(hashes);
+                if (mounted()) {
+                    if (payloads.length === 0 && apiError === undefined) {
                         setNotFound(true);
+                        setPayloads([]);
+                    }
+                    else {
+                        setPayloads(payloads);
                     }
                 }
             }
             catch (e) {
+                const error = e;
                 if (mounted()) {
-                    setApiError(e);
+                    setApiError(error.errors.reduce((answer, error) => answer ?? error ?? null, null) ?? undefined);
                 }
             }
         }
-    }, [ArchivistApi, apiError, archive, hashes, inFlight, payloads]);
+    }, [apiError, hashes, inFlight, payloads, archivist]);
     return { apiError, features, multipleFeatureSets, notFound };
 };
 export { useFetchPayloads };

package/dist/esm/hooks/useFetchPayloads.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFetchPayloads.js","sourceRoot":"","sources":["../../../src/hooks/useFetchPayloads.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAE7E,MAAM,gBAAgB,GAAG,CAAC,MAAiB,EAAE,EAAE;IAC7C,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAA;IAC/C,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAmD,CAAA;IAC3F,MAAM,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAA;IAChF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE/C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,YAAY,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,EAAE,MAAM,IAAI,CAAC,QAAQ,EAAE;YACzE,IAAI;gBACF,WAAW,CAAC,IAAI,CAAC,CAAA;gBACjB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;gBACvH,IAAI,QAAQ,EAAE,MAAM,EAAE;oBACpB,MAAM,aAAa,GAAoD,EAAE,CAAA;oBACzE,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;wBAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;4BACpE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAkD,CAAC,CAAA;yBACrF;6BAAM,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE;4BACvC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;yBAC3B;oBACH,CAAC,CAAC,CAAA;oBAEF,IAAI,aAAa,CAAC,MAAM,EAAE;wBACxB,WAAW,CAAC,aAAa,CAAC,CAAA;qBAC3B;oBAED,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,KAAK,SAAS,EAAE;wBACxD,WAAW,CAAC,IAAI,CAAC,CAAA;qBAClB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,OAAO,EAAE,EAAE;oBACb,WAAW,CAAC,CAAgB,CAAC,CAAA;iBAC9B;aACF;SACF;IACH,CAAC,EACD,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAC9D,CAAA;IAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,CAAA;AAC9D,CAAC,CAAA;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"useFetchPayloads.js","sourceRoot":"","sources":["../../../src/hooks/useFetchPayloads.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAE7E,MAAM,gBAAgB,GAAG,CAAC,MAAiB,EAAE,EAAE;IAC7C,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IAEpC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAY,CAAA;IACpD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAmD,CAAA;IAC3F,MAAM,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAA;IAChF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE/C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,SAAS,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,EAAE,MAAM,IAAI,CAAC,QAAQ,EAAE;YACtE,MAAM,gBAAgB,GAAG,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAA;YAC3D,IAAI;gBACF,WAAW,CAAC,IAAI,CAAC,CAAA;gBACjB,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBACnD,IAAI,OAAO,EAAE,EAAE;oBACb,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,KAAK,SAAS,EAAE;wBACnD,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,WAAW,CAAC,EAAE,CAAC,CAAA;qBAChB;yBAAM;wBACL,WAAW,CAAC,QAA2D,CAAC,CAAA;qBACzE;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,KAAK,GAAG,CAAiB,CAAA;gBAC/B,IAAI,OAAO,EAAE,EAAE;oBACb,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,IAAI,KAAK,IAAI,IAAI,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC,CAAA;iBAChG;aACF;SACF;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAClD,CAAA;IAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,CAAA;AAC9D,CAAC,CAAA;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/package.json

@@ -12,11 +12,11 @@
   "dependencies": {
     "@xylabs/react-flexbox": "^2.15.1",
     "@xylabs/react-shared": "^2.15.1",
-    "@xyo-network/react-app-settings": "^2.38.10",
-    "@xyo-network/react-archive": "^2.38.10",
-    "@xyo-network/react-archivist-api": "^2.38.10",
-    "@xyo-network/react-network": "^2.38.10",
-    "@xyo-network/react-shared": "^2.38.10",
+    "@xyo-network/react-app-settings": "^2.38.12",
+    "@xyo-network/react-archive": "^2.38.12",
+    "@xyo-network/react-archivist": "^2.38.12",
+    "@xyo-network/react-network": "^2.38.12",
+    "@xyo-network/react-shared": "^2.38.12",
     "@xyo-network/sdk-geo": "^2.7.0",
     "geojson": "^0.5.0",
     "mapbox-gl": "^2.10.0",
@@ -27,7 +27,8 @@
     "@mui/material": "^5.10.3",
     "@mui/styles": "^5.10.3",
     "@xylabs/sdk-js": "^2.6.7",
-    "@xyo-network/api": "*",
+    "@xyo-network/archivist": "*",
+    "@xyo-network/module": "*",
     "@xyo-network/payload": "*",
     "axios": "^1.1.3",
     "lodash": "^4.17.21",
@@ -82,5 +83,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.38.10"
+  "version": "2.38.12"
 }

package/src/hooks/useFetchPayloads.tsx

@@ -1,16 +1,16 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { XyoApiError } from '@xyo-network/api'
-import { useArchive } from '@xyo-network/react-archive'
-import { useArchivistApi } from '@xyo-network/react-archivist-api'
+import { XyoArchivistWrapper } from '@xyo-network/archivist'
+import { WrapperError, XyoError } from '@xyo-network/module'
+import { useArchivist } from '@xyo-network/react-archivist'
 import { useState } from 'react'
 
 import { NetworkXyoLocationHeatmapQuadkeyAnswerPayload } from '../types'
 import { useQuadKeyPayloadsToFeatures } from './useQuadKeyPayloadsToFeatures'
 
 const useFetchPayloads = (hashes?: string[]) => {
-  const { api: ArchivistApi } = useArchivistApi()
-  const { archive } = useArchive()
-  const [apiError, setApiError] = useState<XyoApiError>()
+  const { archivist } = useArchivist()
+
+  const [apiError, setApiError] = useState<XyoError>()
   const [payloads, setPayloads] = useState<NetworkXyoLocationHeatmapQuadkeyAnswerPayload[]>()
   const { features, multipleFeatureSets } = useQuadKeyPayloadsToFeatures(payloads)
   const [notFound, setNotFound] = useState(false)
@@ -19,36 +19,28 @@ const useFetchPayloads = (hashes?: string[]) => {
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      if (ArchivistApi && payloads === undefined && hashes?.length && !inFlight) {
+      if (archivist && payloads === undefined && hashes?.length && !inFlight) {
+        const archivistWrapper = new XyoArchivistWrapper(archivist)
         try {
           setInFlight(true)
-          const payloads = await Promise.allSettled(hashes.map((hash) => ArchivistApi.archive(archive).payload.hash(hash).get()))
-          if (payloads?.length) {
-            const validPayloads: NetworkXyoLocationHeatmapQuadkeyAnswerPayload[] = []
-            payloads.forEach((result) => {
-              if (result.status === 'fulfilled' && result.value && result.value[0]) {
-                validPayloads.push(result.value[0] as NetworkXyoLocationHeatmapQuadkeyAnswerPayload)
-              } else if (result.status === 'rejected') {
-                setApiError(result.reason)
-              }
-            })
-
-            if (validPayloads.length) {
-              setPayloads(validPayloads)
-            }
-
-            if (validPayloads.length === 0 && apiError === undefined) {
+          const payloads = await archivistWrapper.get(hashes)
+          if (mounted()) {
+            if (payloads.length === 0 && apiError === undefined) {
               setNotFound(true)
+              setPayloads([])
+            } else {
+              setPayloads(payloads as NetworkXyoLocationHeatmapQuadkeyAnswerPayload[])
             }
           }
         } catch (e) {
+          const error = e as WrapperError
           if (mounted()) {
-            setApiError(e as XyoApiError)
+            setApiError(error.errors.reduce((answer, error) => answer ?? error ?? null, null) ?? undefined)
           }
         }
       }
     },
-    [ArchivistApi, apiError, archive, hashes, inFlight, payloads],
+    [apiError, hashes, inFlight, payloads, archivist],
   )
 
   return { apiError, features, multipleFeatureSets, notFound }