@xyo-network/react-api 2.41.33 → 2.41.34

package/package.json

@@ -10,24 +10,24 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xylabs/react-button": "^2.15.8",
-    "@xylabs/react-common": "^2.15.8",
-    "@xylabs/react-dialogs": "^2.15.8",
-    "@xylabs/react-flexbox": "^2.15.8",
-    "@xylabs/react-shared": "^2.15.8",
-    "@xyo-network/api": "^2.43.7",
-    "@xyo-network/api-models": "^2.43.7",
-    "@xyo-network/archivist-wrapper": "^2.43.7",
-    "@xyo-network/boundwitness-model": "^2.43.7",
-    "@xyo-network/diviner": "^2.43.7",
-    "@xyo-network/huri": "^2.43.7",
-    "@xyo-network/module": "^2.43.7",
-    "@xyo-network/network": "^2.43.7",
-    "@xyo-network/payload-builder": "^2.43.7",
-    "@xyo-network/payload-model": "^2.43.7",
-    "@xyo-network/react-archivist": "^2.41.33",
-    "@xyo-network/react-network": "^2.41.33",
-    "@xyo-network/react-shared": "^2.41.33",
+    "@xylabs/react-button": "^2.15.9",
+    "@xylabs/react-common": "^2.15.9",
+    "@xylabs/react-dialogs": "^2.15.9",
+    "@xylabs/react-flexbox": "^2.15.9",
+    "@xylabs/react-shared": "^2.15.9",
+    "@xyo-network/api": "^2.43.9",
+    "@xyo-network/api-models": "^2.43.9",
+    "@xyo-network/archivist-wrapper": "^2.43.9",
+    "@xyo-network/boundwitness-model": "^2.43.9",
+    "@xyo-network/diviner": "^2.43.9",
+    "@xyo-network/huri": "^2.43.9",
+    "@xyo-network/module": "^2.43.9",
+    "@xyo-network/network": "^2.43.9",
+    "@xyo-network/payload-builder": "^2.43.9",
+    "@xyo-network/payload-model": "^2.43.9",
+    "@xyo-network/react-archivist": "^2.41.34",
+    "@xyo-network/react-network": "^2.41.34",
+    "@xyo-network/react-shared": "^2.41.34",
     "lodash": "^4.17.21",
     "react-json-view": "^1.21.3"
   },
@@ -35,12 +35,13 @@
     "@mui/icons-material": "^5.11.0",
     "@mui/material": "^5.11.5",
     "@mui/styles": "^5.11.2",
-    "@xylabs/ts-scripts-yarn3": "2.12.0",
-    "@xyo-network/react-storybook": "^2.41.33",
+    "@xylabs/ts-scripts-yarn3": "2.12.21",
+    "@xyo-network/react-storybook": "^2.41.34",
+    "@xyo-network/utils": "^2.43.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-icons": "^4.7.1",
-    "react-router-dom": "^6.6.2",
+    "react-router-dom": "^6.7.0",
     "rollbar": "^2.26.1"
   },
   "peerDependencies": {
@@ -100,5 +101,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.41.33"
+  "version": "2.41.34"
 }

package/src/components/ApiHistory/ApiHistory.stories.tsx

@@ -3,10 +3,8 @@ import { Typography } from '@mui/material'
 import { ComponentMeta, ComponentStory } from '@storybook/react'
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoArchive } from '@xyo-network/api'
-import { useAuthState } from '@xyo-network/react-auth'
-import { AuthServiceWrapper } from '@xyo-network/react-auth-service'
 import { authDecorator, WrappedAuthComponent } from '@xyo-network/react-storybook'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 
 import { ApiProvider, useApi } from '../../contexts'
 import { ApiHistory } from './ApiHistory'
@@ -28,38 +26,27 @@ const StorybookEntry = {
 
 const DemoArchiveFetcher = () => {
   const [myArchives, setMyArchives] = useState<XyoArchive[]>([])
-  const { api, currentToken } = useApi()
-  const { state } = useAuthState()
+  const { api } = useApi()
   const [successfulCall, setSuccessfulCall] = useState(false)
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      if (state?.jwtToken && currentToken && state?.loggedInAccount) {
-        const archives = await api?.archives?.get()
-        if (archives && mounted()) {
-          setMyArchives(archives)
-          setSuccessfulCall(true)
-        }
+      const archives = await api?.archives?.get()
+      if (archives && mounted()) {
+        setMyArchives(archives)
+        setSuccessfulCall(true)
       }
     },
-    [api, state?.jwtToken, currentToken, state?.loggedInAccount, setSuccessfulCall],
+    [api?.archives],
   )
 
-  useEffect(() => {
-    if (!state?.loggedInAccount) {
-      setMyArchives([])
-      setSuccessfulCall(false)
-    }
-  }, [state?.loggedInAccount])
-
   return (
     <>
-      <AuthServiceWrapper />
-      <p>My Archives</p>
+      <p>Archives</p>
       {successfulCall && (
         <Typography color="success.main" variant="body1">
-          Successfully made authenticated request!!
+          Successfully made request
         </Typography>
       )}
       <ul>
@@ -74,8 +61,6 @@ const DemoArchiveFetcher = () => {
 }
 
 const Template: ComponentStory<WrappedAuthComponent> = () => {
-  const { state } = useAuthState()
-  const jwtToken = state?.jwtToken
   return (
     <ApiProvider
       errorHistoryMaxDepth={10}
@@ -83,7 +68,6 @@ const Template: ComponentStory<WrappedAuthComponent> = () => {
       failureHistoryMaxDepth={10}
       responseHistoryMaxDepth={10}
       apiDomain="https://beta.api.archivist.xyo.network"
-      jwtToken={jwtToken}
     >
       <DemoArchiveFetcher />
     </ApiProvider>

package/src/contexts/ArchivistApi/ArchivistApiProvider.stories.tsx

@@ -3,10 +3,8 @@ import { Typography } from '@mui/material'
 import { ComponentMeta, ComponentStory } from '@storybook/react'
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoArchive } from '@xyo-network/api'
-import { useAuthState } from '@xyo-network/react-auth'
-import { AuthServiceWrapper } from '@xyo-network/react-auth-service'
 import { authDecorator, WrappedAuthComponent } from '@xyo-network/react-storybook'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 
 import { ApiProvider } from './Provider'
 import { useApi } from './use'
@@ -28,38 +26,32 @@ const StorybookEntry = {
 
 const DemoArchiveFetcher = () => {
   const [myArchives, setMyArchives] = useState<XyoArchive[]>([])
-  const { api, currentToken, responseHistory } = useApi()
-  const { state } = useAuthState()
+  const { api, responseHistory } = useApi()
   const [successfulCall, setSuccessfulCall] = useState(false)
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      if (state?.jwtToken && currentToken && state?.loggedInAccount) {
+      try {
         const archives = await api?.archives?.get()
         if (archives && mounted()) {
           setMyArchives(archives)
           setSuccessfulCall(true)
         }
+      } catch (e) {
+        setMyArchives([])
+        setSuccessfulCall(false)
       }
     },
-    [api, state?.jwtToken, currentToken, state?.loggedInAccount, setSuccessfulCall],
+    [api],
   )
 
-  useEffect(() => {
-    if (!state?.loggedInAccount) {
-      setMyArchives([])
-      setSuccessfulCall(false)
-    }
-  }, [state?.loggedInAccount])
-
   return (
     <>
-      <AuthServiceWrapper />
-      <p>My Archives</p>
+      <p>Archives</p>
       {successfulCall && (
         <Typography color="success.main" variant="body1">
-          Successfully made authenticated request!!
+          Successfully made request!!
         </Typography>
       )}
       <ul>
@@ -78,8 +70,6 @@ const DemoArchiveFetcher = () => {
 }
 
 const Template: ComponentStory<WrappedAuthComponent> = () => {
-  const { state } = useAuthState()
-  const jwtToken = state?.jwtToken
   return (
     <ApiProvider
       errorHistoryMaxDepth={10}
@@ -87,7 +77,6 @@ const Template: ComponentStory<WrappedAuthComponent> = () => {
       failureHistoryMaxDepth={10}
       responseHistoryMaxDepth={10}
       apiDomain="https://beta.api.archivist.xyo.network"
-      jwtToken={jwtToken}
     >
       <DemoArchiveFetcher />
     </ApiProvider>