@xyo-network/react-map 2.38.10 → 2.38.12

package/dist/cjs/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/cjs/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/cjs/hooks/useFetchPayloads.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useFetchPayloads = void 0;
 const tslib_1 = require("tslib");
 const react_shared_1 = require("@xylabs/react-shared");
-const react_archive_1 = require("@xyo-network/react-archive");
-const react_archivist_api_1 = require("@xyo-network/react-archivist-api");
+const archivist_1 = require("@xyo-network/archivist");
+const react_archivist_1 = require("@xyo-network/react-archivist");
 const react_1 = require("react");
 const useQuadKeyPayloadsToFeatures_1 = require("./useQuadKeyPayloadsToFeatures");
 const useFetchPayloads = (hashes) => {
-    const { api: ArchivistApi } = (0, react_archivist_api_1.useArchivistApi)();
-    const { archive } = (0, react_archive_1.useArchive)();
+    const { archivist } = (0, react_archivist_1.useArchivist)();
     const [apiError, setApiError] = (0, react_1.useState)();
     const [payloads, setPayloads] = (0, react_1.useState)();
     const { features, multipleFeatureSets } = (0, useQuadKeyPayloadsToFeatures_1.useQuadKeyPayloadsToFeatures)(payloads);
@@ -18,35 +17,30 @@ const useFetchPayloads = (hashes) => {
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        if (ArchivistApi && payloads === undefined && (hashes === null || hashes === void 0 ? void 0 : hashes.length) && !inFlight) {
+        var _a;
+        if (archivist && payloads === undefined && (hashes === null || hashes === void 0 ? void 0 : hashes.length) && !inFlight) {
+            const archivistWrapper = new archivist_1.XyoArchivistWrapper(archivist);
             try {
                 setInFlight(true);
-                const payloads = yield Promise.allSettled(hashes.map((hash) => ArchivistApi.archive(archive).payload.hash(hash).get()));
-                if (payloads === null || payloads === void 0 ? void 0 : 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 = yield 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((_a = error.errors.reduce((answer, error) => { var _a; return (_a = answer !== null && answer !== void 0 ? answer : error) !== null && _a !== void 0 ? _a : null; }, null)) !== null && _a !== void 0 ? _a : undefined);
                 }
             }
         }
-    }), [ArchivistApi, apiError, archive, hashes, inFlight, payloads]);
+    }), [apiError, hashes, inFlight, payloads, archivist]);
     return { apiError, features, multipleFeatureSets, notFound };
 };
 exports.useFetchPayloads = useFetchPayloads;

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

@@ -1 +1 @@
-{"version":3,"file":"useFetchPayloads.js","sourceRoot":"","sources":["../../../src/hooks/useFetchPayloads.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,8DAAuD;AACvD,0EAAkE;AAClE,iCAAgC;AAGhC,iFAA6E;AAE7E,MAAM,gBAAgB,GAAG,CAAC,MAAiB,EAAE,EAAE;IAC7C,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,IAAA,qCAAe,GAAE,CAAA;IAC/C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,0BAAU,GAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IACvD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAmD,CAAA;IAC3F,MAAM,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2DAA4B,EAAC,QAAQ,CAAC,CAAA;IAChF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAE/C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI,YAAY,IAAI,QAAQ,KAAK,SAAS,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,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,aAAR,QAAQ,uBAAR,QAAQ,CAAE,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,CAAA,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;AAEQ,4CAAgB"}
+{"version":3,"file":"useFetchPayloads.js","sourceRoot":"","sources":["../../../src/hooks/useFetchPayloads.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AACrD,sDAA4D;AAE5D,kEAA2D;AAC3D,iCAAgC;AAGhC,iFAA6E;AAE7E,MAAM,gBAAgB,GAAG,CAAC,MAAiB,EAAE,EAAE;IAC7C,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,8BAAY,GAAE,CAAA;IAEpC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAY,CAAA;IACpD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAmD,CAAA;IAC3F,MAAM,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2DAA4B,EAAC,QAAQ,CAAC,CAAA;IAChF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAE/C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;;QAChB,IAAI,SAAS,IAAI,QAAQ,KAAK,SAAS,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,IAAI,CAAC,QAAQ,EAAE;YACtE,MAAM,gBAAgB,GAAG,IAAI,+BAAmB,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,MAAA,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,WAAC,OAAA,MAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,KAAK,mCAAI,IAAI,CAAA,EAAA,EAAE,IAAI,CAAC,mCAAI,SAAS,CAAC,CAAA;iBAChG;aACF;SACF;IACH,CAAC,CAAA,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;AAEQ,4CAAgB"}