Fix/improve domains & websites

aleph-im · May 13, 2024 · 2941d4b · 2941d4b
1 parent 696136f
commit 2941d4b
Show file tree

Hide file tree

Showing 21 changed files with 19,632 additions and 8,124 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,13 +14,13 @@
     "@aleph-front/core": "^1.16.5",
     "@aleph-sdk/account": "^1.0.3",
     "@aleph-sdk/avalanche": "^1.0.3",
-    "@aleph-sdk/client": "^1.0.3",
+    "@aleph-sdk/client": "^1.0.4",
     "@aleph-sdk/core": "^1.0.3",
     "@aleph-sdk/ethereum": "^1.0.3",
     "@aleph-sdk/evm": "^1.0.3",
     "@aleph-sdk/message": "^1.0.3",
     "@aleph-sdk/solana": "^1.0.3",
-    "@aleph-sdk/superfluid": "^1.0.3",
+    "@aleph-sdk/superfluid": "^1.0.4",
     "@fortawesome/fontawesome-svg-core": "^6.3.0",
     "@hookform/resolvers": "^3.1.1",
     "@superfluid-finance/sdk-core": "^0.6.12",
@@ -32,6 +32,7 @@
     "eslint-config-next": "13.2.1",
     "ethers": "^5.7.2",
     "jszip": "^3.10.1",
+    "multiformats": "^13.1.0",
     "next": "^13.3.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",

diff --git a/src/components/pages/configure/NewDomainPage/cmp.tsx b/src/components/pages/configure/NewDomainPage/cmp.tsx
@@ -26,6 +26,7 @@ export default function NewDomain() {
     errors,
     handleSubmit,
     setTarget,
+    setRef,
   } = useNewDomainPage()
 
   const [tabId, setTabId] = useState('website')
@@ -35,6 +36,7 @@ export default function NewDomain() {
       : 'function'
 
   const onTabChange = (tabId: string) => {
+    setRef('')
     setTabId(tabId)
     if (['website', 'ipfs'].includes(tabId)) {
       setTarget(EntityDomainType.IPFS)

diff --git a/src/components/pages/dashboard/AllTabContent/cmp.tsx b/src/components/pages/dashboard/AllTabContent/cmp.tsx
@@ -42,14 +42,25 @@ export const AllTabContent = React.memo(({ data }: AllTabContentProps) => {
                     label: 'Name',
                     width: '100%',
                     sortable: true,
-                    render: (row) => row.name,
+                    render: (row) => row.name || row.id,
                   },
                   {
                     label: 'Size',
                     align: 'right',
                     sortable: true,
                     render: (row) =>
-                      humanReadableSize(row.size || row.volume?.size, 'MiB'),
+                      row.type !== EntityType.Website ? (
+                        humanReadableSize(row.size, 'MiB')
+                      ) : (
+                        <ButtonLink
+                          kind="functional"
+                          variant="none"
+                          size="sm"
+                          href={row.url ?? ''}
+                        >
+                          <Icon name="square-up-right" size="lg" />
+                        </ButtonLink>
+                      ),
                   },
                   {
                     label: 'Date',

diff --git a/src/components/pages/dashboard/ManageDomain/cmp.tsx b/src/components/pages/dashboard/ManageDomain/cmp.tsx
@@ -1,6 +1,11 @@
 import IconText from '@/components/common/IconText'
 import { Label, NoisyContainer } from '@aleph-front/core'
-import { EntityTypeName, EntityDomainType } from '@/helpers/constants'
+import {
+  EntityType,
+  EntityTypeName,
+  EntityDomainType,
+  EntityDomainTypeName,
+} from '@/helpers/constants'
 import { BulletItem, Button, Icon, Tag, TextGradient } from '@aleph-front/core'
 import { useManageDomain } from '@/hooks/pages/solutions/manage/useManageDomain'
 import { ellipseAddress, ellipseText, toPascalCase } from '@/helpers/utils'
@@ -235,12 +240,11 @@ export default function ManageDomain() {
               </>
             )}
 
-            {refEntity && (
+            {refEntity ? (
               <>
                 <Separator />
-
                 <TextGradient type="h7" as="h2" color="main0">
-                  Linked {domain.target}
+                  Linked {EntityDomainTypeName[domain.target]}
                 </TextGradient>
 
                 <div tw="my-5">
@@ -253,28 +257,46 @@ export default function ManageDomain() {
                 <div tw="my-5">
                   <div className="tp-info text-main0">NAME</div>
                   <div>
-                    <Text>
-                      {(refEntity?.metadata?.name as string) || refEntity.id}
-                    </Text>
+                    <Text>{refEntity.id}</Text>
                   </div>
                 </div>
-
                 <div tw="my-5">
                   <div className="tp-info text-main0">EXPLORER</div>
                   <div>
                     <a
                       className="tp-body1 fs-16"
-                      href={refEntity.url}
+                      href={
+                        refEntity.type !== EntityType.Website
+                          ? refEntity.url
+                          : refEntity.volume?.url
+                      }
                       target="_blank"
                       referrerPolicy="no-referrer"
                     >
                       <IconText iconName="square-up-right">
-                        <Text>{ellipseText(refEntity.url, 80)}</Text>
+                        <Text>
+                          {ellipseText(
+                            refEntity.type !== EntityType.Website
+                              ? refEntity.url
+                              : refEntity.volume?.url || '',
+                            80,
+                          )}
+                        </Text>
                       </IconText>
                     </a>
                   </div>
                 </div>
               </>
+            ) : (
+              <>
+                <Separator />
+                <TextGradient type="h7" as="h2" color="main0">
+                  Linked Resource
+                </TextGradient>
+                <Text>
+                  The target resource is missing or has been deleted.{' '}
+                </Text>
+              </>
             )}
           </NoisyContainer>
 

diff --git a/src/components/pages/dashboard/ManageFunction/cmp.tsx b/src/components/pages/dashboard/ManageFunction/cmp.tsx
@@ -11,7 +11,7 @@ import { RotatingLines } from 'react-loader-spinner'
 import { useTheme } from 'styled-components'
 
 export default function ManageFunction() {
-  const { func, handleCopyHash, handleDelete, copyAndNotify } =
+  const { func, handleCopyHash, handleDelete, handleDownload, copyAndNotify } =
     useManageFunction()
 
   const theme = useTheme()
@@ -57,7 +57,7 @@ export default function ManageFunction() {
               </Label>
             </div>
             <div>
-              {/* <Button
+              <Button
                 size="md"
                 variant="tertiary"
                 color="main0"
@@ -67,7 +67,7 @@ export default function ManageFunction() {
                 onClick={handleDownload}
               >
                 Download
-              </Button> */}
+              </Button>
               <Button
                 kind="functional"
                 variant="warning"