@xyo-network/react-archivist 2.45.0-rc.19 → 2.45.0-rc.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,19 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useArchivistGet = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const react_shared_1 = require("@xylabs/react-shared");
6
- const react_shared_2 = require("@xyo-network/react-shared");
7
- const useArchivistStates_1 = require("./useArchivistStates");
8
- const useArchivistGet = (hashes) => {
9
- const [savedHashes, setSavedHashes] = (0, react_shared_2.useDataState)(hashes);
10
- setSavedHashes(hashes);
11
- const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = (0, useArchivistStates_1.useArchivistStates)();
6
+ const react_1 = require("react");
7
+ const useArchivist_1 = require("./useArchivist");
8
+ const useArchivistGet = (hashes, archivist) => {
9
+ const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined;
10
+ const passedArchivist = typeof archivist === 'object' ? archivist : undefined;
11
+ const [payloads, setPayloads] = (0, react_1.useState)();
12
+ const [foundArchivist, foundArchivistError] = (0, useArchivist_1.useArchivist)(requestedArchivistNameOrAddress);
13
+ const [error, setError] = (0, react_1.useState)();
14
+ const [refresh, setRefresh] = (0, react_1.useState)(0);
15
+ const archivistToUse = passedArchivist !== null && passedArchivist !== void 0 ? passedArchivist : foundArchivist;
16
+ const onRefresh = (0, react_1.useCallback)(() => {
17
+ setRefresh(refresh + 1);
18
+ }, []);
12
19
  (0, react_shared_1.useAsyncEffect)(
13
20
  // eslint-disable-next-line react-hooks/exhaustive-deps
14
21
  (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
15
22
  var _a;
16
23
  try {
17
- if (archivist && savedHashes) {
18
- const result = (_a = (yield archivist.get(savedHashes !== null && savedHashes !== void 0 ? savedHashes : []))) !== null && _a !== void 0 ? _a : [];
24
+ if (archivistToUse && hashes) {
25
+ const result = (_a = (yield archivistToUse.get(hashes !== null && hashes !== void 0 ? hashes : []))) !== null && _a !== void 0 ? _a : [];
19
26
  if (mounted()) {
20
27
  setError(undefined);
21
28
  setPayloads(result);
@@ -25,8 +32,8 @@ const useArchivistGet = (hashes) => {
25
32
  catch (ex) {
26
33
  setError(ex);
27
34
  }
28
- }), [archivist, savedHashes, refreshCount, setError, setPayloads]);
29
- return [payloads, error, refresh];
35
+ }), [archivistToUse, hashes, refresh, setError, setPayloads]);
36
+ return [payloads, error !== null && error !== void 0 ? error : foundArchivistError, onRefresh];
30
37
  };
31
38
  exports.useArchivistGet = useArchivistGet;
32
39
  //# sourceMappingURL=useArchivistGet.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,4DAAwD;AAExD,6DAA0E;AAEnE,MAAM,eAAe,GAAG,CAAoC,MAAiB,EAAoC,EAAE;IACxH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,2BAAY,EAAC,MAAM,CAAC,CAAA;IAC1D,cAAc,CAAC,MAAM,CAAC,CAAA;IAEtB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAA,uCAAkB,GAAK,CAAA;IAE5G,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,MAAM,GAAG,MAAA,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAA;gBAC7D,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,CAAA,EACD,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC9D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA;AAxBY,QAAA,eAAe,mBAwB3B"}
1
+ {"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAGrD,iCAA6C;AAE7C,iDAA6C;AAGtC,MAAM,eAAe,GAAG,CAC7B,MAAiB,EACjB,SAA8B,EACI,EAAE;IACpC,MAAM,+BAA+B,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7F,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAO,CAAA;IAC/C,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,GAAG,IAAA,2BAAY,EAAC,+BAA+B,CAAC,CAAA;IAC3F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAA;IAEzC,MAAM,cAAc,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAA;IAExD,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACjC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IACzB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;;QAChB,IAAI;YACF,IAAI,cAAc,IAAI,MAAM,EAAE;gBAC5B,MAAM,MAAM,GAAG,MAAC,CAAC,MAAM,cAAc,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CAAS,mCAAI,EAAE,CAAA;gBACtE,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,CAAA,EACD,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CACzD,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,mBAAmB,EAAE,SAAS,CAAC,CAAA;AAC5D,CAAC,CAAA;AAnCY,QAAA,eAAe,mBAmC3B"}
package/dist/docs.json CHANGED
@@ -26,7 +26,7 @@
26
26
  "fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
27
27
  "line": 20,
28
28
  "character": 2,
29
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Details/Details.tsx#L20"
29
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Details/Details.tsx#L20"
30
30
  }
31
31
  ],
32
32
  "type": {
@@ -18396,13 +18396,13 @@
18396
18396
  "fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
18397
18397
  "line": 19,
18398
18398
  "character": 17,
18399
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
18399
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
18400
18400
  },
18401
18401
  {
18402
18402
  "fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
18403
18403
  "line": 23,
18404
18404
  "character": 13,
18405
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
18405
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
18406
18406
  }
18407
18407
  ],
18408
18408
  "extendedTypes": [
@@ -18415,7 +18415,7 @@
18415
18415
  ]
18416
18416
  },
18417
18417
  {
18418
- "id": 415,
18418
+ "id": 420,
18419
18419
  "name": "RefreshCallback",
18420
18420
  "kind": 4194304,
18421
18421
  "kindString": "Type alias",
@@ -18425,13 +18425,13 @@
18425
18425
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
18426
18426
  "line": 7,
18427
18427
  "character": 12,
18428
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
18428
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
18429
18429
  }
18430
18430
  ],
18431
18431
  "type": {
18432
18432
  "type": "reflection",
18433
18433
  "declaration": {
18434
- "id": 416,
18434
+ "id": 421,
18435
18435
  "name": "__type",
18436
18436
  "kind": 65536,
18437
18437
  "kindString": "Type literal",
@@ -18441,12 +18441,12 @@
18441
18441
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
18442
18442
  "line": 7,
18443
18443
  "character": 30,
18444
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
18444
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
18445
18445
  }
18446
18446
  ],
18447
18447
  "signatures": [
18448
18448
  {
18449
- "id": 417,
18449
+ "id": 422,
18450
18450
  "name": "__type",
18451
18451
  "kind": 4096,
18452
18452
  "kindString": "Call signature",
@@ -18471,7 +18471,7 @@
18471
18471
  "fileName": "packages/modules/packages/archivist/src/components/Card/Card.tsx",
18472
18472
  "line": 8,
18473
18473
  "character": 13,
18474
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Card/Card.tsx#L8"
18474
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Card/Card.tsx#L8"
18475
18475
  }
18476
18476
  ],
18477
18477
  "signatures": [
@@ -19749,7 +19749,7 @@
19749
19749
  "fileName": "packages/modules/packages/archivist/src/components/Card/CardContent.tsx",
19750
19750
  "line": 10,
19751
19751
  "character": 13,
19752
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Card/CardContent.tsx#L10"
19752
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Card/CardContent.tsx#L10"
19753
19753
  }
19754
19754
  ],
19755
19755
  "signatures": [
@@ -19953,7 +19953,7 @@
19953
19953
  "fileName": "packages/modules/packages/archivist/src/components/Card/CardHeader.tsx",
19954
19954
  "line": 5,
19955
19955
  "character": 13,
19956
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Card/CardHeader.tsx#L5"
19956
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Card/CardHeader.tsx#L5"
19957
19957
  }
19958
19958
  ],
19959
19959
  "signatures": [
@@ -20181,13 +20181,13 @@
20181
20181
  "fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
20182
20182
  "line": 19,
20183
20183
  "character": 17,
20184
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
20184
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
20185
20185
  },
20186
20186
  {
20187
20187
  "fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
20188
20188
  "line": 23,
20189
20189
  "character": 13,
20190
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
20190
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
20191
20191
  }
20192
20192
  ],
20193
20193
  "signatures": [
@@ -20263,7 +20263,7 @@
20263
20263
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivist.tsx",
20264
20264
  "line": 4,
20265
20265
  "character": 13,
20266
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivist.tsx#L4"
20266
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivist.tsx#L4"
20267
20267
  }
20268
20268
  ],
20269
20269
  "signatures": [
@@ -20352,7 +20352,7 @@
20352
20352
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistAll.tsx",
20353
20353
  "line": 6,
20354
20354
  "character": 13,
20355
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistAll.tsx#L6"
20355
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistAll.tsx#L6"
20356
20356
  }
20357
20357
  ],
20358
20358
  "signatures": [
@@ -20427,7 +20427,7 @@
20427
20427
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20428
20428
  "line": 14,
20429
20429
  "character": 26,
20430
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
20430
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
20431
20431
  }
20432
20432
  ],
20433
20433
  "signatures": [
@@ -20460,9 +20460,9 @@
20460
20460
  "sources": [
20461
20461
  {
20462
20462
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistGet.tsx",
20463
- "line": 7,
20463
+ "line": 9,
20464
20464
  "character": 13,
20465
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistGet.tsx#L7"
20465
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistGet.tsx#L9"
20466
20466
  }
20467
20467
  ],
20468
20468
  "signatures": [
@@ -20565,6 +20565,184 @@
20565
20565
  "name": "string"
20566
20566
  }
20567
20567
  }
20568
+ },
20569
+ {
20570
+ "id": 415,
20571
+ "name": "archivist",
20572
+ "kind": 32768,
20573
+ "kindString": "Parameter",
20574
+ "flags": {
20575
+ "isOptional": true
20576
+ },
20577
+ "type": {
20578
+ "type": "union",
20579
+ "types": [
20580
+ {
20581
+ "type": "intrinsic",
20582
+ "name": "string"
20583
+ },
20584
+ {
20585
+ "type": "reference",
20586
+ "typeArguments": [
20587
+ {
20588
+ "type": "intersection",
20589
+ "types": [
20590
+ {
20591
+ "type": "reference",
20592
+ "name": "SchemaFields",
20593
+ "qualifiedName": "SchemaFields",
20594
+ "package": "@xyo-network/payload-model"
20595
+ },
20596
+ {
20597
+ "type": "reference",
20598
+ "name": "PayloadFields",
20599
+ "qualifiedName": "PayloadFields",
20600
+ "package": "@xyo-network/payload-model"
20601
+ },
20602
+ {
20603
+ "type": "reflection",
20604
+ "declaration": {
20605
+ "id": 416,
20606
+ "name": "__type",
20607
+ "kind": 65536,
20608
+ "kindString": "Type literal",
20609
+ "flags": {},
20610
+ "sources": [
20611
+ {
20612
+ "fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
20613
+ "line": 18,
20614
+ "character": 17
20615
+ }
20616
+ ]
20617
+ }
20618
+ }
20619
+ ]
20620
+ },
20621
+ {
20622
+ "type": "intersection",
20623
+ "types": [
20624
+ {
20625
+ "type": "reference",
20626
+ "name": "SchemaFields",
20627
+ "qualifiedName": "SchemaFields",
20628
+ "package": "@xyo-network/payload-model"
20629
+ },
20630
+ {
20631
+ "type": "reference",
20632
+ "name": "PayloadFields",
20633
+ "qualifiedName": "PayloadFields",
20634
+ "package": "@xyo-network/payload-model"
20635
+ },
20636
+ {
20637
+ "type": "reference",
20638
+ "name": "XyoBoundWitnessFields",
20639
+ "qualifiedName": "XyoBoundWitnessFields",
20640
+ "package": "@xyo-network/boundwitness-model"
20641
+ },
20642
+ {
20643
+ "type": "reflection",
20644
+ "declaration": {
20645
+ "id": 417,
20646
+ "name": "__type",
20647
+ "kind": 65536,
20648
+ "kindString": "Type literal",
20649
+ "flags": {},
20650
+ "sources": [
20651
+ {
20652
+ "fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
20653
+ "line": 16,
20654
+ "character": 221
20655
+ }
20656
+ ]
20657
+ }
20658
+ }
20659
+ ]
20660
+ },
20661
+ {
20662
+ "type": "intersection",
20663
+ "types": [
20664
+ {
20665
+ "type": "reference",
20666
+ "name": "SchemaFields",
20667
+ "qualifiedName": "SchemaFields",
20668
+ "package": "@xyo-network/payload-model"
20669
+ },
20670
+ {
20671
+ "type": "reference",
20672
+ "name": "PayloadFields",
20673
+ "qualifiedName": "PayloadFields",
20674
+ "package": "@xyo-network/payload-model"
20675
+ },
20676
+ {
20677
+ "type": "reflection",
20678
+ "declaration": {
20679
+ "id": 418,
20680
+ "name": "__type",
20681
+ "kind": 65536,
20682
+ "kindString": "Type literal",
20683
+ "flags": {},
20684
+ "sources": [
20685
+ {
20686
+ "fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
20687
+ "line": 18,
20688
+ "character": 17
20689
+ }
20690
+ ]
20691
+ }
20692
+ }
20693
+ ]
20694
+ },
20695
+ {
20696
+ "type": "intersection",
20697
+ "types": [
20698
+ {
20699
+ "type": "reference",
20700
+ "name": "SchemaFields",
20701
+ "qualifiedName": "SchemaFields",
20702
+ "package": "@xyo-network/payload-model"
20703
+ },
20704
+ {
20705
+ "type": "reference",
20706
+ "name": "PayloadFields",
20707
+ "qualifiedName": "PayloadFields",
20708
+ "package": "@xyo-network/payload-model"
20709
+ },
20710
+ {
20711
+ "type": "reflection",
20712
+ "declaration": {
20713
+ "id": 419,
20714
+ "name": "__type",
20715
+ "kind": 65536,
20716
+ "kindString": "Type literal",
20717
+ "flags": {},
20718
+ "sources": [
20719
+ {
20720
+ "fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
20721
+ "line": 18,
20722
+ "character": 17
20723
+ }
20724
+ ]
20725
+ }
20726
+ }
20727
+ ]
20728
+ },
20729
+ {
20730
+ "type": "reference",
20731
+ "name": "PayloadFindFilter",
20732
+ "qualifiedName": "PayloadFindFilter",
20733
+ "package": "@xyo-network/payload-model"
20734
+ },
20735
+ {
20736
+ "type": "intrinsic",
20737
+ "name": "string"
20738
+ }
20739
+ ],
20740
+ "name": "Archivist",
20741
+ "qualifiedName": "Archivist",
20742
+ "package": "@xyo-network/archivist-interface"
20743
+ }
20744
+ ]
20745
+ }
20568
20746
  }
20569
20747
  ],
20570
20748
  "type": {
@@ -20594,7 +20772,7 @@
20594
20772
  "type": "optional",
20595
20773
  "elementType": {
20596
20774
  "type": "reference",
20597
- "id": 415,
20775
+ "id": 420,
20598
20776
  "name": "RefreshCallback"
20599
20777
  }
20600
20778
  }
@@ -20604,7 +20782,7 @@
20604
20782
  ]
20605
20783
  },
20606
20784
  {
20607
- "id": 418,
20785
+ "id": 423,
20608
20786
  "name": "useArchivistStates",
20609
20787
  "kind": 64,
20610
20788
  "kindString": "Function",
@@ -20614,19 +20792,19 @@
20614
20792
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20615
20793
  "line": 9,
20616
20794
  "character": 13,
20617
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L9"
20795
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L9"
20618
20796
  }
20619
20797
  ],
20620
20798
  "signatures": [
20621
20799
  {
20622
- "id": 419,
20800
+ "id": 424,
20623
20801
  "name": "useArchivistStates",
20624
20802
  "kind": 4096,
20625
20803
  "kindString": "Call signature",
20626
20804
  "flags": {},
20627
20805
  "typeParameter": [
20628
20806
  {
20629
- "id": 422,
20807
+ "id": 427,
20630
20808
  "name": "T",
20631
20809
  "kind": 131072,
20632
20810
  "kindString": "Type parameter",
@@ -20649,7 +20827,7 @@
20649
20827
  {
20650
20828
  "type": "reflection",
20651
20829
  "declaration": {
20652
- "id": 420,
20830
+ "id": 425,
20653
20831
  "name": "__type",
20654
20832
  "kind": 65536,
20655
20833
  "kindString": "Type literal",
@@ -20683,7 +20861,7 @@
20683
20861
  {
20684
20862
  "type": "reflection",
20685
20863
  "declaration": {
20686
- "id": 421,
20864
+ "id": 426,
20687
20865
  "name": "__type",
20688
20866
  "kind": 65536,
20689
20867
  "kindString": "Type literal",
@@ -20704,14 +20882,14 @@
20704
20882
  "type": {
20705
20883
  "type": "reflection",
20706
20884
  "declaration": {
20707
- "id": 423,
20885
+ "id": 428,
20708
20886
  "name": "__type",
20709
20887
  "kind": 65536,
20710
20888
  "kindString": "Type literal",
20711
20889
  "flags": {},
20712
20890
  "children": [
20713
20891
  {
20714
- "id": 424,
20892
+ "id": 429,
20715
20893
  "name": "archivist",
20716
20894
  "kind": 1024,
20717
20895
  "kindString": "Property",
@@ -20721,7 +20899,7 @@
20721
20899
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20722
20900
  "line": 24,
20723
20901
  "character": 11,
20724
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20902
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20725
20903
  }
20726
20904
  ],
20727
20905
  "type": {
@@ -20741,7 +20919,7 @@
20741
20919
  }
20742
20920
  },
20743
20921
  {
20744
- "id": 425,
20922
+ "id": 430,
20745
20923
  "name": "error",
20746
20924
  "kind": 1024,
20747
20925
  "kindString": "Property",
@@ -20751,7 +20929,7 @@
20751
20929
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20752
20930
  "line": 24,
20753
20931
  "character": 22,
20754
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20932
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20755
20933
  }
20756
20934
  ],
20757
20935
  "type": {
@@ -20771,7 +20949,7 @@
20771
20949
  }
20772
20950
  },
20773
20951
  {
20774
- "id": 426,
20952
+ "id": 431,
20775
20953
  "name": "payloads",
20776
20954
  "kind": 1024,
20777
20955
  "kindString": "Property",
@@ -20781,7 +20959,7 @@
20781
20959
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20782
20960
  "line": 24,
20783
20961
  "character": 29,
20784
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20962
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20785
20963
  }
20786
20964
  ],
20787
20965
  "type": {
@@ -20795,7 +20973,7 @@
20795
20973
  "type": "array",
20796
20974
  "elementType": {
20797
20975
  "type": "reference",
20798
- "id": 422,
20976
+ "id": 427,
20799
20977
  "name": "T"
20800
20978
  }
20801
20979
  }
@@ -20803,7 +20981,7 @@
20803
20981
  }
20804
20982
  },
20805
20983
  {
20806
- "id": 427,
20984
+ "id": 432,
20807
20985
  "name": "refresh",
20808
20986
  "kind": 1024,
20809
20987
  "kindString": "Property",
@@ -20813,13 +20991,13 @@
20813
20991
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20814
20992
  "line": 24,
20815
20993
  "character": 39,
20816
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20994
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20817
20995
  }
20818
20996
  ],
20819
20997
  "type": {
20820
20998
  "type": "reflection",
20821
20999
  "declaration": {
20822
- "id": 428,
21000
+ "id": 433,
20823
21001
  "name": "__type",
20824
21002
  "kind": 65536,
20825
21003
  "kindString": "Type literal",
@@ -20829,12 +21007,12 @@
20829
21007
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20830
21008
  "line": 14,
20831
21009
  "character": 26,
20832
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
21010
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
20833
21011
  }
20834
21012
  ],
20835
21013
  "signatures": [
20836
21014
  {
20837
- "id": 429,
21015
+ "id": 434,
20838
21016
  "name": "__type",
20839
21017
  "kind": 4096,
20840
21018
  "kindString": "Call signature",
@@ -20850,7 +21028,7 @@
20850
21028
  "defaultValue": "refreshPayloads"
20851
21029
  },
20852
21030
  {
20853
- "id": 430,
21031
+ "id": 435,
20854
21032
  "name": "refreshCount",
20855
21033
  "kind": 1024,
20856
21034
  "kindString": "Property",
@@ -20860,7 +21038,7 @@
20860
21038
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20861
21039
  "line": 24,
20862
21040
  "character": 65,
20863
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
21041
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20864
21042
  }
20865
21043
  ],
20866
21044
  "type": {
@@ -20869,7 +21047,7 @@
20869
21047
  }
20870
21048
  },
20871
21049
  {
20872
- "id": 431,
21050
+ "id": 436,
20873
21051
  "name": "setError",
20874
21052
  "kind": 1024,
20875
21053
  "kindString": "Property",
@@ -20879,7 +21057,7 @@
20879
21057
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20880
21058
  "line": 24,
20881
21059
  "character": 79,
20882
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
21060
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20883
21061
  }
20884
21062
  ],
20885
21063
  "type": {
@@ -20915,7 +21093,7 @@
20915
21093
  }
20916
21094
  },
20917
21095
  {
20918
- "id": 432,
21096
+ "id": 437,
20919
21097
  "name": "setPayloads",
20920
21098
  "kind": 1024,
20921
21099
  "kindString": "Property",
@@ -20925,7 +21103,7 @@
20925
21103
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20926
21104
  "line": 24,
20927
21105
  "character": 89,
20928
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
21106
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20929
21107
  }
20930
21108
  ],
20931
21109
  "type": {
@@ -20945,7 +21123,7 @@
20945
21123
  "type": "array",
20946
21124
  "elementType": {
20947
21125
  "type": "reference",
20948
- "id": 422,
21126
+ "id": 427,
20949
21127
  "name": "T"
20950
21128
  }
20951
21129
  }
@@ -20967,13 +21145,13 @@
20967
21145
  {
20968
21146
  "title": "Properties",
20969
21147
  "children": [
20970
- 424,
20971
- 425,
20972
- 426,
20973
- 427,
21148
+ 429,
20974
21149
  430,
20975
21150
  431,
20976
- 432
21151
+ 432,
21152
+ 435,
21153
+ 436,
21154
+ 437
20977
21155
  ]
20978
21156
  }
20979
21157
  ],
@@ -20982,7 +21160,7 @@
20982
21160
  "fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
20983
21161
  "line": 24,
20984
21162
  "character": 9,
20985
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
21163
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
20986
21164
  }
20987
21165
  ]
20988
21166
  }
@@ -21001,7 +21179,7 @@
21001
21179
  {
21002
21180
  "title": "Type Aliases",
21003
21181
  "children": [
21004
- 415
21182
+ 420
21005
21183
  ]
21006
21184
  },
21007
21185
  {
@@ -21014,7 +21192,7 @@
21014
21192
  400,
21015
21193
  404,
21016
21194
  409,
21017
- 418
21195
+ 423
21018
21196
  ]
21019
21197
  }
21020
21198
  ],
@@ -21023,7 +21201,7 @@
21023
21201
  "fileName": "packages/modules/packages/archivist/src/index.ts",
21024
21202
  "line": 1,
21025
21203
  "character": 0,
21026
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/46c7a9f244d/packages/modules/packages/archivist/src/index.ts#L1"
21204
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/28e81604cc1/packages/modules/packages/archivist/src/index.ts#L1"
21027
21205
  }
21028
21206
  ]
21029
21207
  }
@@ -1,16 +1,23 @@
1
1
  import { useAsyncEffect } from '@xylabs/react-shared';
2
- import { useDataState } from '@xyo-network/react-shared';
3
- import { useArchivistStates } from './useArchivistStates';
4
- export const useArchivistGet = (hashes) => {
5
- const [savedHashes, setSavedHashes] = useDataState(hashes);
6
- setSavedHashes(hashes);
7
- const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates();
2
+ import { useCallback, useState } from 'react';
3
+ import { useArchivist } from './useArchivist';
4
+ export const useArchivistGet = (hashes, archivist) => {
5
+ const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined;
6
+ const passedArchivist = typeof archivist === 'object' ? archivist : undefined;
7
+ const [payloads, setPayloads] = useState();
8
+ const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress);
9
+ const [error, setError] = useState();
10
+ const [refresh, setRefresh] = useState(0);
11
+ const archivistToUse = passedArchivist ?? foundArchivist;
12
+ const onRefresh = useCallback(() => {
13
+ setRefresh(refresh + 1);
14
+ }, []);
8
15
  useAsyncEffect(
9
16
  // eslint-disable-next-line react-hooks/exhaustive-deps
10
17
  async (mounted) => {
11
18
  try {
12
- if (archivist && savedHashes) {
13
- const result = (await archivist.get(savedHashes ?? [])) ?? [];
19
+ if (archivistToUse && hashes) {
20
+ const result = (await archivistToUse.get(hashes ?? [])) ?? [];
14
21
  if (mounted()) {
15
22
  setError(undefined);
16
23
  setPayloads(result);
@@ -20,7 +27,7 @@ export const useArchivistGet = (hashes) => {
20
27
  catch (ex) {
21
28
  setError(ex);
22
29
  }
23
- }, [archivist, savedHashes, refreshCount, setError, setPayloads]);
24
- return [payloads, error, refresh];
30
+ }, [archivistToUse, hashes, refresh, setError, setPayloads]);
31
+ return [payloads, error ?? foundArchivistError, onRefresh];
25
32
  };
26
33
  //# sourceMappingURL=useArchivistGet.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAmB,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE1E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAoC,MAAiB,EAAoC,EAAE;IACxH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;IAC1D,cAAc,CAAC,MAAM,CAAC,CAAA;IAEtB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAK,CAAA;IAE5G,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7D,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC9D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}
1
+ {"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAiB,EACjB,SAA8B,EACI,EAAE;IACpC,MAAM,+BAA+B,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7F,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAO,CAAA;IAC/C,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAC3F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAEzC,MAAM,cAAc,GAAG,eAAe,IAAI,cAAc,CAAA;IAExD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IACzB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,cAAc,IAAI,MAAM,EAAE;gBAC5B,MAAM,MAAM,GAAI,CAAC,MAAM,cAAc,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAS,IAAI,EAAE,CAAA;gBACtE,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CACzD,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,mBAAmB,EAAE,SAAS,CAAC,CAAA;AAC5D,CAAC,CAAA"}
@@ -1,7 +1,8 @@
1
+ import { Archivist } from '@xyo-network/archivist';
1
2
  import { RefreshCallback } from './useArchivistStates';
2
3
  export declare const useArchivistGet: <T extends import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
3
4
  schema: string;
4
5
  } = import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
5
6
  schema: string;
6
- }>(hashes?: string[]) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
7
+ }>(hashes?: string[], archivist?: Archivist | string) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
7
8
  //# sourceMappingURL=useArchivistGet.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAsB,MAAM,sBAAsB,CAAA;AAE1E,eAAO,MAAM,eAAe;;;;YAAgD,MAAM,EAAE,+EAwBnF,CAAA"}
1
+ {"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAKlD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,eAAO,MAAM,eAAe;;;;YACjB,MAAM,EAAE,cACL,SAAS,GAAG,MAAM,+EAiC/B,CAAA"}
package/package.json CHANGED
@@ -15,9 +15,9 @@
15
15
  "@xylabs/react-crypto": "^2.16.8",
16
16
  "@xylabs/react-flexbox": "^2.16.8",
17
17
  "@xylabs/react-shared": "^2.16.8",
18
- "@xyo-network/react-module": "^2.45.0-rc.19",
19
- "@xyo-network/react-node": "^2.45.0-rc.19",
20
- "@xyo-network/react-shared": "^2.45.0-rc.19"
18
+ "@xyo-network/react-module": "^2.45.0-rc.20",
19
+ "@xyo-network/react-node": "^2.45.0-rc.20",
20
+ "@xyo-network/react-shared": "^2.45.0-rc.20"
21
21
  },
22
22
  "peerDependencies": {
23
23
  "@mui/icons-material": "^5",
@@ -38,7 +38,7 @@
38
38
  "@xyo-network/archivist-wrapper": "^2.51.4",
39
39
  "@xyo-network/module": "^2.51.4",
40
40
  "@xyo-network/payload-model": "^2.51.4",
41
- "@xyo-network/react-storybook": "^2.45.0-rc.19",
41
+ "@xyo-network/react-storybook": "^2.45.0-rc.20",
42
42
  "require-from-string": "^2.0.2",
43
43
  "typescript": "^4.9.5"
44
44
  },
@@ -84,6 +84,6 @@
84
84
  },
85
85
  "sideEffects": false,
86
86
  "types": "dist/types/index.d.ts",
87
- "version": "2.45.0-rc.19",
87
+ "version": "2.45.0-rc.20",
88
88
  "stableVersion": "2.44.1"
89
89
  }
@@ -1,21 +1,35 @@
1
1
  import { useAsyncEffect } from '@xylabs/react-shared'
2
+ import { Archivist } from '@xyo-network/archivist'
2
3
  import { XyoPayload } from '@xyo-network/payload-model'
3
- import { useDataState } from '@xyo-network/react-shared'
4
+ import { useCallback, useState } from 'react'
4
5
 
5
- import { RefreshCallback, useArchivistStates } from './useArchivistStates'
6
+ import { useArchivist } from './useArchivist'
7
+ import { RefreshCallback } from './useArchivistStates'
6
8
 
7
- export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: string[]): [T[]?, Error?, RefreshCallback?] => {
8
- const [savedHashes, setSavedHashes] = useDataState(hashes)
9
- setSavedHashes(hashes)
9
+ export const useArchivistGet = <T extends XyoPayload = XyoPayload>(
10
+ hashes?: string[],
11
+ archivist?: Archivist | string,
12
+ ): [T[]?, Error?, RefreshCallback?] => {
13
+ const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined
14
+ const passedArchivist = typeof archivist === 'object' ? archivist : undefined
15
+ const [payloads, setPayloads] = useState<T[]>()
16
+ const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress)
17
+ const [error, setError] = useState<Error>()
18
+ const [refresh, setRefresh] = useState(0)
10
19
 
11
- const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates<T>()
20
+ const archivistToUse = passedArchivist ?? foundArchivist
21
+
22
+ const onRefresh = useCallback(() => {
23
+ setRefresh(refresh + 1)
24
+ // eslint-disable-next-line react-hooks/exhaustive-deps
25
+ }, [])
12
26
 
13
27
  useAsyncEffect(
14
28
  // eslint-disable-next-line react-hooks/exhaustive-deps
15
29
  async (mounted) => {
16
30
  try {
17
- if (archivist && savedHashes) {
18
- const result = (await archivist.get(savedHashes ?? [])) ?? []
31
+ if (archivistToUse && hashes) {
32
+ const result = ((await archivistToUse.get(hashes ?? [])) as T[]) ?? []
19
33
  if (mounted()) {
20
34
  setError(undefined)
21
35
  setPayloads(result as T[])
@@ -25,7 +39,7 @@ export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: stri
25
39
  setError(ex as Error)
26
40
  }
27
41
  },
28
- [archivist, savedHashes, refreshCount, setError, setPayloads],
42
+ [archivistToUse, hashes, refresh, setError, setPayloads],
29
43
  )
30
- return [payloads, error, refresh]
44
+ return [payloads, error ?? foundArchivistError, onRefresh]
31
45
  }