fix: disable sharing action when upload is not possible

Closes #477
ipfs · May 30, 2018 · 8f2a719 · 8f2a719
1 parent b0d5d06
commit 8f2a719
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/add-on/src/popup/browser-action/operations.js b/add-on/src/popup/browser-action/operations.js
@@ -9,14 +9,15 @@ module.exports = function operations ({
   ipfsNodeType,
   isIpfsOnline,
   redirectEnabled,
+  uploadEnabled,
   onQuickUpload,
   onOpenWebUi,
   onOpenPrefs,
   onToggleRedirect
 }) {
   return html`
     <div class="fade-in pv1">
-      ${isIpfsOnline ? (
+      ${isIpfsOnline && uploadEnabled ? (
         navItem({
           text: browser.i18n.getMessage('panel_quickUpload'),
           bold: true,

diff --git a/add-on/src/popup/browser-action/store.js b/add-on/src/popup/browser-action/store.js
@@ -21,7 +21,8 @@ module.exports = (state, emitter) => {
     gatewayAddress: null,
     swarmPeers: null,
     gatewayVersion: null,
-    redirectEnabled: false
+    redirectEnabled: false,
+    uploadEnabled: false
   })
 
   let port
@@ -201,6 +202,8 @@ module.exports = (state, emitter) => {
       state.ipfsNodeType = status.ipfsNodeType
       state.ipfsApiUrl = options.ipfsApiUrl
       state.redirectEnabled = options.useCustomGateway
+      // Upload requires access to the background page (https://github.com/ipfs-shipyard/ipfs-companion/issues/477)
+      state.uploadEnabled = !!(await browser.runtime.getBackgroundPage())
       state.swarmPeers = status.peerCount === -1 ? 0 : status.peerCount
       state.isIpfsOnline = status.peerCount > -1
       state.gatewayVersion = status.gatewayVersion ? status.gatewayVersion : null

diff --git a/yarn.lock b/yarn.lock
@@ -5554,7 +5554,7 @@ level-js@^2.2.4:
     typedarray-to-buffer "~1.0.0"
     xtend "~2.1.2"
 
-"level-js@github:timkuijsten/level.js#idbunwrapper":
+level-js@timkuijsten/level.js#idbunwrapper:
   version "2.2.3"
   resolved "https://codeload.github.com/timkuijsten/level.js/tar.gz/18e03adab34c49523be7d3d58fafb0c632f61303"
   dependencies: