fix: show Files after import on windows

this aims to fix issue from #1815
ipfs · Jun 24, 2021 · 12797b9 · 12797b9
1 parent 2a0268d
commit 12797b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/add-to-ipfs.js b/src/add-to-ipfs.js
@@ -69,6 +69,8 @@ function sendNotification (failures, successes, launchWebUI, path) {
   }
 
   fn({ title, body }, () => {
+    // force refresh for Files screen to pick up newly added items
+    // https://github.com/ipfs/ipfs-desktop/issues/1763
     launchWebUI(link, { forceRefresh: true })
   })
 }

diff --git a/src/webui/index.js b/src/webui/index.js
@@ -101,16 +101,15 @@ module.exports = async function (ctx) {
   url.hash = '/blank'
   url.searchParams.set('deviceId', ctx.countlyDeviceId)
 
-  ctx.launchWebUI = (path, { focus = true, forceRefresh = false } = {}) => {
-    if (forceRefresh) window.webContents.reload()
+  ctx.launchWebUI = async (path, { focus = true, forceRefresh = false } = {}) => {
     if (!path) {
       logger.info('[web ui] launching web ui')
     } else {
       logger.info(`[web ui] navigate to ${path}`)
-      window.webContents.send('updatedPage', path)
       url.hash = path
+      await window.loadURL(url.toString())
     }
-
+    if (forceRefresh) window.webContents.reload()
     if (focus) {
       window.show()
       window.focus()

diff --git a/src/webui/preload.js b/src/webui/preload.js
@@ -10,9 +10,11 @@ const urlParams = new URLSearchParams(window.location.search)
 
 function checkIfVisible () {
   if (document.hidden) {
+    if (window.location.hash === '#/blank') return // skip, already blank
     previousHash = window.location.hash
     window.location.hash = '/blank'
   } else {
+    if (previousHash === '#/blank') return // skip
     window.location.hash = previousHash
   }
 }
@@ -28,11 +30,6 @@ window.localStorage.setItem = function () {
 
 let previousHash = null
 
-ipcRenderer.on('updatedPage', (_, url) => {
-  previousHash = url
-  window.location.hash = url
-})
-
 document.addEventListener('visibilitychange', () => {
   checkIfVisible()
 })
@@ -41,6 +38,12 @@ document.addEventListener('DOMContentReady', () => {
   checkIfVisible()
 })
 
+// track hash changes, so checkIfVisible always has the right previousHash
+document.addEventListener('hashchange', () => {
+  if (window.location.hash === '#/blank') return // skip
+  previousHash = window.location.hash
+})
+
 window.ipfsDesktop = {
   countlyAppKey: COUNTLY_KEY,