Merge branch 'main' into feat-move-docker-config

src/components/collab/show/TxRow.tsx

@@ -65,6 +65,7 @@ export const TxRow = ({ tx, index, onAdd, onRemove }: TxRowProps) => {
             }
           }}
           onKeyDown={handleKeyDown}
+          onBlur={handleAdd}
         />
       </td>
       {onRemove && (

src/components/form/MintForm.jsx

@@ -29,6 +29,8 @@ export default function MintForm() {
           .show(`File too big: ${data.artifact.file.size / 1e6}mb`)
         return
       }
+      const URL = window.URL || window.webkitURL
+      data.artifact.reader = URL.createObjectURL(data.artifact.file)
     }
     useMintStore.setState({ ...data, isValid: true })
     navigate('preview')

src/components/media-types/pdf/index.tsx

@@ -26,6 +26,7 @@ export const PdfComponent = memo(function ({
   const [pageNumber, setPageNumber] = useState(1)
   const [renderedPageNumber, setRenderedPageNumber] = useState<number>()
   const [loading, setLoading] = useState(displayView)
+  const [showDocument, setShowDocument] = useState(true)
 
   const [height, setHeight] = useState<number>()
 
@@ -43,7 +44,7 @@ export const PdfComponent = memo(function ({
   }
 
   function onDocumentLoadError(e: Error) {
-    throw Error(e.message, { cause: 'PDF Error' })
+    console.error(`PDF Error: ${e.message}`)
   }
 
   function changePage(offset: number) {
@@ -70,6 +71,32 @@ export const PdfComponent = memo(function ({
     setRenderedPageNumber(pageNumber)
   }
 
+  function onPassword(callback, reason) {
+    function callbackProxy(password) {
+      // Cancel button handler
+      if (password === null) {
+        // password will be null if user clicks on cancel
+        setShowDocument(false)
+        return
+      }
+      callback(password)
+    }
+
+    switch (reason) {
+      case 1: {
+        const password = prompt('Enter the password to open this PDF file.')
+        callbackProxy(password)
+        break
+      }
+      case 2: {
+        const password = prompt('Invalid password. Please try again.')
+        callbackProxy(password)
+        break
+      }
+      default:
+    }
+  }
+
   const cover = (
     <>
       <ImageComponent
@@ -96,33 +123,45 @@ export const PdfComponent = memo(function ({
   // })
   // const loading = renderedPageNumber !== pageNumber
   if (!displayView) return cover
+
   return (
     <div ref={container} className={styles.container}>
-      <Document
-        file={file}
-        loading={cover}
-        onLoadSuccess={onDocumentLoadSuccess}
-        onLoadError={onDocumentLoadError}
-        title={`PDF object ${nft.token_id}`}
-        options={options}
-      >
-        {renderedPageNumber && renderedPageNumber !== pageNumber && (
+      {!showDocument ? (
+        <Button
+          onClick={() => {
+            setShowDocument(true)
+          }}
+        >
+          Reload PDF with password
+        </Button>
+      ) : (
+        <Document
+          file={file}
+          loading={cover}
+          onPassword={onPassword}
+          onLoadSuccess={onDocumentLoadSuccess}
+          onLoadError={onDocumentLoadError}
+          title={`PDF object ${nft.token_id}`}
+          options={options}
+        >
+          {renderedPageNumber && renderedPageNumber !== pageNumber && (
+            <Page
+              key={`${renderedPageNumber}`}
+              className={styles.previous_page}
+              pageNumber={renderedPageNumber}
+              height={height}
+            />
+          )}
           <Page
-            key={`${renderedPageNumber}`}
-            className={styles.previous_page}
-            pageNumber={renderedPageNumber}
+            key={pageNumber}
+            className={styles.page}
+            pageNumber={pageNumber}
+            onRenderSuccess={onRender}
             height={height}
           />
-        )}
-        <Page
-          key={pageNumber}
-          className={styles.page}
-          pageNumber={pageNumber}
-          onRenderSuccess={onRender}
-          height={height}
-        />
-      </Document>
-      {!loading && (
+        </Document>
+      )}
+      {!loading && showDocument && (
         <div className={styles.pdfNav}>
           <Button disabled={pageNumber <= 1} onClick={previousPage}>
             {'Prev «'}

src/components/preview/index.jsx

@@ -31,7 +31,7 @@ const Field = ({ title, value }) => {
     value && (
       <div className={styles.field}>
         <strong>{title}:</strong>
-        {value}
+        <p>{value}</p>
       </div>
     )
   )

src/data/ipfs.ts

@@ -224,7 +224,19 @@ export const prepareFile = async ({
 
   // upload thumbnail image
   let thumbnailUri = IPFS_DEFAULT_THUMBNAIL_URI
-  if (thumbnail) {
+  if (thumbnail && thumbnail.file?.type === 'image/gif') {
+    console.debug(
+      "GIF format detected, we will use the artifact's cid as the thumbnail to avoid uploading twice"
+    )
+    thumbnailUri = `${uri}`
+    if (thumbnail?.format) {
+      const format = JSON.parse(JSON.stringify(thumbnail.format))
+      format.uri = thumbnailUri
+      format.fileName = `thumbnail_${format.fileName}`
+      formats.push(format)
+      console.debug('thumbnail format', format)
+    }
+  } else if (thumbnail) {
     const thumbnailCid = await uploadFileToIPFSProxy({
       blob: new Blob([thumbnail.buffer]),
       path: `thumbnail_${

src/pages/config/Subjkt.tsx

@@ -266,11 +266,13 @@ export const Subjkt = () => {
               value={subjkt}
               onChange={setSubjkt}
               onBlur={(e) => {
-                setSubjkt(e.target.value.replace(/[^a-z0-9-._]/g, ''))
+                if(/[^A-Za-z0-9-._]/.test(e.target.value)) {
+                  show('Subjkt contains invalid characters. This field can only contain: letters (a-z A-Z), numbers (0-9), . (dot), - (dash), _ (underscore)')
+                }
               }}
-              placeholder="can contain letters (a-z), numbers (0-9), . (dot), - (dash), _ (underscore)"
+              placeholder="can contain letters (a-z A-Z), numbers (0-9), . (dot), - (dash), _ (underscore)"
               label="Username"
-              pattern="^[a-z0-9-._]*$"
+              pattern="^[A-Za-z0-9-._]*$"
             />
             <Input
               name="description"

src/pages/mint/fields.js

@@ -141,7 +141,7 @@ export const fields = [
     type: 'file',
     watch: true,
     rules: {
-      required: 'No file selected',
+      required: 'You did not select a valid file',
     },
   },
   {