@xyo-network/react-payload 2.26.10 → 2.26.11

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

@@ -4,5 +4,5 @@ import { FetchHuriHashOptions } from './lib';
 /**
  * Resolve a hash or a huri regardless of network
  */
-declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined, boolean | undefined];
+declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined];
 export { useHuriHash };

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

@@ -1 +1 @@
-{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,GAAG,CAClB,UAA0B,EAC1B,OAAgB,EAChB,OAA8B,EACmD,EAAE;IACnF,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IAElC,0EAA0E;IAC1E,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAE3D,kDAAkD;IAClD,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEpH,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,EAAE,eAAe,CAAC,CAAA;AACjG,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,GAAG,CAClB,UAA0B,EAC1B,OAAgB,EAChB,OAA8B,EAC+D,EAAE;IAC/F,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IAElC,0EAA0E;IAC1E,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAE3D,kDAAkD;IAClD,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEpH,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,EAAE,eAAe,CAAC,CAAA;AACjG,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}

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

@@ -1,5 +1,5 @@
 import { XyoApiError } from '@xyo-network/api';
 import { XyoPayload } from '@xyo-network/payload';
 import { FetchHuriHashOptions } from './lib';
-declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined, boolean | undefined];
+declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined];
 export { useResolveHuri };

package/dist/esm/hooks/useResolveHuri.js

@@ -1,18 +1,23 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { Huri } from '@xyo-network/payload';
 import { useNetwork } from '@xyo-network/react-network';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { findHuriNetwork } from './lib';
 const useResolveHuri = (huriUri, dependentNotFound, options) => {
     const { network, networks, setNetwork } = useNetwork();
     const [huriPayload, setHuriPayload] = useState();
-    const [huriPayloadNotFound, setHuriPayloadNotFound] = useState(false);
+    const [huriPayloadNotFound, setHuriPayloadNotFound] = useState();
     const [huriNetworkNotFound, setHuriNetworkNotFound] = useState();
     const [huriApiError, setHuriApiError] = useState();
     const { changeActiveNetwork } = options ?? {};
+    useEffect(() => {
+        // Initially, sync local not found with dependent's status
+        setHuriPayloadNotFound(dependentNotFound);
+    }, [dependentNotFound]);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
+        // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
         if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
             const huriInstance = new Huri(huriUri);
             const foundHuriNetwork = findHuriNetwork(huriInstance, networks);
@@ -43,12 +48,6 @@ const useResolveHuri = (huriUri, dependentNotFound, options) => {
                 setHuriNetworkNotFound(true);
             }
         }
-        else {
-            // If the dependent is not found, then assume not found till proven otherwise
-            if (dependentNotFound) {
-                setHuriPayloadNotFound(true);
-            }
-        }
     }, [huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]);
     return [huriPayload, huriPayloadNotFound, huriApiError, huriNetworkNotFound];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAE7D,MAAM,cAAc,GAAG,CACrB,OAAgB,EAChB,iBAA2B,EAC3B,OAA8B,EACmD,EAAE;IACnF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrE,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,EAAE;YACrE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;4BAC3B,sBAAsB,CAAC,KAAK,CAAC,CAAA;yBAC9B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;iBAAM;gBACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;aAC7B;SACF;aAAM;YACL,6EAA6E;YAC7E,IAAI,iBAAiB,EAAE;gBACrB,sBAAsB,CAAC,IAAI,CAAC,CAAA;aAC7B;SACF;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CACjF,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;AAC9E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAE7D,MAAM,cAAc,GAAG,CACrB,OAAgB,EAChB,iBAA2B,EAC3B,OAA8B,EAC+D,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,SAAS,CAAC,GAAG,EAAE;QACb,0DAA0D;QAC1D,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;IAC3C,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,EAAE;YACrE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;4BAC3B,sBAAsB,CAAC,KAAK,CAAC,CAAA;yBAC9B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;iBAAM;gBACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;aAC7B;SACF;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CACjF,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;AAC9E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/package.json

@@ -21,13 +21,13 @@
     "@xyo-network/api": "^2.21.14",
     "@xyo-network/network": "^2.21.14",
     "@xyo-network/payload": "^2.21.14",
-    "@xyo-network/react-archive": "^2.26.10",
-    "@xyo-network/react-archivist-api": "^2.26.10",
-    "@xyo-network/react-auth-service": "^2.26.10",
-    "@xyo-network/react-network": "^2.26.10",
-    "@xyo-network/react-property": "^2.26.10",
-    "@xyo-network/react-schema": "^2.26.10",
-    "@xyo-network/react-shared": "^2.26.10",
+    "@xyo-network/react-archive": "^2.26.11",
+    "@xyo-network/react-archivist-api": "^2.26.11",
+    "@xyo-network/react-auth-service": "^2.26.11",
+    "@xyo-network/react-network": "^2.26.11",
+    "@xyo-network/react-property": "^2.26.11",
+    "@xyo-network/react-schema": "^2.26.11",
+    "@xyo-network/react-shared": "^2.26.11",
     "@xyo-network/utils": "^2.21.14",
     "luxon": "^2.4.0",
     "react": "^18.2.0",
@@ -94,6 +94,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.26.10",
+  "version": "2.26.11",
   "packageManager": "yarn@3.1.1"
 }

package/src/hooks/useHuriHash.stories.tsx

@@ -1,12 +1,13 @@
 /* eslint-disable import/no-internal-modules */
 import { Alert, Typography } from '@mui/material'
 import { ComponentStory, Meta } from '@storybook/react'
-import { FlexCol } from '@xylabs/react-flexbox'
+import { ButtonEx } from '@xylabs/react-button'
+import { FlexCol, FlexRow } from '@xylabs/react-flexbox'
 import { Huri } from '@xyo-network/payload'
 import { ArchivistApiProvider } from '@xyo-network/react-archivist-api'
 import { NetworkMemoryProvider } from '@xyo-network/react-network'
 import { XyoSchemaCache } from '@xyo-network/utils'
-import { lazy, Suspense } from 'react'
+import { lazy, Suspense, useState } from 'react'
 
 import { FetchHuriHashOptions } from './lib'
 import { useHuriHash } from './useHuriHash'
@@ -17,6 +18,7 @@ interface UseHuriHashComponentProps {
   huriOrHash: string | Huri
   huriUri?: string
   options?: FetchHuriHashOptions
+  reTestable?: boolean
 }
 
 const apiDomain = 'https://beta.api.archivist.xyo.network'
@@ -34,14 +36,25 @@ const Wrapper: React.FC<UseHuriHashComponentProps> = (props) => (
   </NetworkMemoryProvider>
 )
 
-const UseHuriHashComponent: React.FC<UseHuriHashComponentProps> = ({ huriOrHash, huriUri, options }) => {
-  const [payload, notFound, _, networkNotFound] = useHuriHash(huriOrHash, huriUri, options)
+const UseHuriHashComponent: React.FC<UseHuriHashComponentProps> = ({ huriOrHash, huriUri, options, reTestable }) => {
+  const [trigger, setTrigger] = useState<string | Huri>(huriOrHash)
+  const [payload, notFound, , networkNotFound] = useHuriHash(trigger, huriUri, options)
 
   return (
     <>
       <Typography variant="body1" fontWeight="bold">
         Fetches the payload for a huriOrHash.
       </Typography>
+      {reTestable ? (
+        <FlexRow columnGap={2}>
+          <ButtonEx variant="contained" onClick={() => setTrigger(hash)}>
+            Fetch Valid Hash
+          </ButtonEx>
+          <ButtonEx variant="contained" onClick={() => setTrigger('foo')}>
+            Hash Not Found
+          </ButtonEx>
+        </FlexRow>
+      ) : null}
       <FlexCol my={3}>
         {notFound ? <Alert severity="warning">Not Found</Alert> : null}
         {networkNotFound ? <Alert severity="warning">Network Not Found</Alert> : null}
@@ -72,7 +85,7 @@ const Default = Template.bind({})
 Default.args = { huriOrHash: hash }
 
 const NotFound = Template.bind({})
-NotFound.args = { huriOrHash: 'foo' }
+NotFound.args = { huriOrHash: 'foo', reTestable: true }
 
 const WithHuri = Template.bind({})
 WithHuri.args = { huriOrHash: new Huri(`${apiDomain}/${hash}`) }

package/src/hooks/useHuriHash.tsx

@@ -13,7 +13,7 @@ const useHuriHash = (
   huriOrHash?: string | Huri,
   huriUri?: string,
   options?: FetchHuriHashOptions
-): [XyoPayload | undefined, boolean, XyoApiError | undefined, boolean | undefined] => {
+): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined] => {
   const hash = useCallback((huriOrHash?: string | Huri) => {
     if (huriOrHash) {
       if (typeof huriOrHash === 'string') {

package/src/hooks/useResolveHuri.tsx

@@ -2,7 +2,7 @@ import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoApiError } from '@xyo-network/api'
 import { Huri, XyoPayload } from '@xyo-network/payload'
 import { useNetwork } from '@xyo-network/react-network'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import { FetchHuriHashOptions, findHuriNetwork } from './lib'
 
@@ -10,18 +10,24 @@ const useResolveHuri = (
   huriUri?: string,
   dependentNotFound?: boolean,
   options?: FetchHuriHashOptions
-): [XyoPayload | undefined, boolean, XyoApiError | undefined, boolean | undefined] => {
+): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined] => {
   const { network, networks, setNetwork } = useNetwork()
   const [huriPayload, setHuriPayload] = useState<XyoPayload>()
-  const [huriPayloadNotFound, setHuriPayloadNotFound] = useState(false)
+  const [huriPayloadNotFound, setHuriPayloadNotFound] = useState<boolean>()
   const [huriNetworkNotFound, setHuriNetworkNotFound] = useState<boolean>()
   const [huriApiError, setHuriApiError] = useState<XyoApiError>()
 
   const { changeActiveNetwork } = options ?? {}
 
+  useEffect(() => {
+    // Initially, sync local not found with dependent's status
+    setHuriPayloadNotFound(dependentNotFound)
+  }, [dependentNotFound])
+
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
+      // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
       if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
         const huriInstance = new Huri(huriUri)
 
@@ -51,11 +57,6 @@ const useResolveHuri = (
         } else {
           setHuriNetworkNotFound(true)
         }
-      } else {
-        // If the dependent is not found, then assume not found till proven otherwise
-        if (dependentNotFound) {
-          setHuriPayloadNotFound(true)
-        }
       }
     },
     [huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]