feat: remote pin error feedback (#1760)

* feat: remote pin error feedback Co-authored-by: Marcin Rataj <[email protected]>
ipfs · Apr 12, 2021 · e88f163 · e88f163
1 parent c1784e0
commit e88f163
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/public/locales/en/notify.json b/public/locales/en/notify.json
@@ -4,6 +4,7 @@
   "ipfsInvalidApiAddress": "The provided IPFS API address is invalid.",
   "ipfsConnectSuccess": "Successfully connected to the IPFS API address",
   "ipfsConnectFail": "Unable to connect to the provided IPFS API address",
+  "ipfsPinFail": "Unable to set pinning. Try again, or see the browser console for more info.",
   "ipfsIsBack": "Normal IPFS service has resumed. Enjoy!",
   "folderExists": "An item with that name already exists. Please choose another.",
   "filesFetchFailed": "Failed to get those files. Please check the path and try again.",

diff --git a/src/bundles/notify.js b/src/bundles/notify.js
@@ -70,7 +70,7 @@ const notify = {
       }
     }
 
-    if (action.type === 'IPFS_CONNECT_FAILED') {
+    if (action.type === 'IPFS_CONNECT_FAILED' || action.type === 'IPFS_PIN_FAILED') {
       return {
         ...state,
         show: true,
@@ -118,6 +118,9 @@ const notify = {
       if (eventId === 'IPFS_API_ADDRESS_INVALID') {
         return 'ipfsInvalidApiAddress'
       }
+      if (eventId === 'IPFS_PIN_FAILED') {
+        return 'ipfsPinFail'
+      }
 
       if (eventId === 'FILES_EVENT_FAILED') {
         const type = code ? code.replace(/^(ERR_)/, '') : ''

diff --git a/src/bundles/pinning.js b/src/bundles/pinning.js
@@ -176,17 +176,17 @@ const pinningBundle = {
     }
   }), {}),
 
-  doSetPinning: (pin, services = []) => async ({ getIpfs, store, dispatch }) => {
+  doSetPinning: (pin, services = [], wasLocallyPinned, previousRemotePins = []) => async ({ getIpfs, store, dispatch }) => {
     const ipfs = getIpfs()
     const { cid, name } = pin
 
     const pinLocally = services.includes('local')
-    try {
-      pinLocally ? await ipfs.pin.add(cid) : await ipfs.pin.rm(cid)
-    } catch (e) {
-      // its ok if unpinning failed because object is not pinned
-      if (e.message !== 'not pinned or pinned indirectly') {
+    if (wasLocallyPinned !== pinLocally) {
+      try {
+        pinLocally ? await ipfs.pin.add(cid) : await ipfs.pin.rm(cid)
+      } catch (e) {
         console.error(`unexpected local pin error for ${cid} (${name})`, e)
+        dispatch({ type: 'IPFS_PIN_FAILED' })
       }
     }
 
@@ -195,6 +195,9 @@ const pinningBundle = {
 
     store.selectPinningServices().filter(s => s.online).forEach(async service => {
       const shouldPin = services.includes(service.name)
+      const wasPinned = previousRemotePins.includes(service.name)
+      if (wasPinned === shouldPin) return
+
       try {
         const id = `${service.name}:${pin.cid}`
         if (shouldPin) {
@@ -209,6 +212,7 @@ const pinningBundle = {
       } catch (e) {
         // log error and continue with other services
         console.error(`unexpected pin.remote error for ${cid}@${service.name}`, e)
+        dispatch({ type: 'IPFS_PIN_FAILED' })
       }
     })
 

diff --git a/src/components/notify/Toast.js b/src/components/notify/Toast.js
@@ -5,11 +5,11 @@ const Toast = ({ error, children, onDismiss }) => {
   const bg = error ? 'bg-yellow' : 'bg-green'
   return (
     <div className='fixed bottom-0 tc pb2 z-max' style={{ left: '50% ', transform: 'translateX(-50%)' }}>
-      <div className={`dib f5 lh-copy avenir pl2 pl4-ns pv2 white br2 ${bg}`}>
+      <div className={`flex items-center f5 lh-copy avenir pl2 pl4-ns pv2 white br2 ${bg}`}>
         {children}
         <CancelIcon
-          className='dib fill-current-color ph3 glow o-80 pointer'
-          style={{ height: '28px', transform: 'scale(1.5)', verticalAlign: 'bottom' }}
+          className='fill-current-color ph3 glow o-80 pointer'
+          style={{ height: '28px', transform: 'scale(1.5)' }}
           onClick={onDismiss} />
       </div>
     </div>

diff --git a/src/files/modals/pinning-modal/PinningModal.js b/src/files/modals/pinning-modal/PinningModal.js
@@ -81,7 +81,7 @@ export const PinningModal = ({ t, tReady, onCancel, onPinningSet, file, pinningS
 
       <ModalActions>
         <Button className='ma2 tc' bg='bg-gray' onClick={onCancel}>{t('app:actions.cancel')}</Button>
-        <Button className='ma2 tc' bg='bg-teal' onClick={() => onPinningSet(file, selectedServices)}>{t('app:actions.apply')}</Button>
+        <Button className='ma2 tc' bg='bg-teal' onClick={() => onPinningSet(file, selectedServices, file.pinned, selectedRemoteServices)}>{t('app:actions.apply')}</Button>
       </ModalActions>
     </Modal>
   )