From 9abd2d9cc10ae4a2049599ccc141025aba91a543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Sun, 6 Oct 2024 08:35:53 +0200
Subject: [PATCH 1/2] feat(workspaces): Migrate workspaces from JSON to the new
 storage after sync engine has been registered.

---
 src/ZenWorkspaces.mjs        | 1 +
 src/ZenWorkspacesStorage.mjs | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs
index b54ea7b..ae3838d 100644
--- a/src/ZenWorkspaces.mjs
+++ b/src/ZenWorkspaces.mjs
@@ -22,6 +22,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if(!Weave.Service.engineManager.get("workspaces")) {
       Weave.Service.engineManager.register(ZenWorkspacesEngine);
     }
+    await ZenWorkspacesStorage.migrateWorkspacesFromJSON();
     await this.initializeWorkspaces();
     console.info('ZenWorkspaces: ZenWorkspaces initialized');
 
diff --git a/src/ZenWorkspacesStorage.mjs b/src/ZenWorkspacesStorage.mjs
index c26e57b..2dcbd93 100644
--- a/src/ZenWorkspacesStorage.mjs
+++ b/src/ZenWorkspacesStorage.mjs
@@ -29,18 +29,16 @@ var ZenWorkspacesStorage = {
         )
       `);
     });
-
-    await this._migrateWorkspacesFromJSON();
   },
 
-  async _migrateWorkspacesFromJSON() {
+  async migrateWorkspacesFromJSON() {
     const oldWorkspacesPath = PathUtils.join(PathUtils.profileDir, 'zen-workspaces', 'Workspaces.json');
     if (await IOUtils.exists(oldWorkspacesPath)) {
       console.info('ZenWorkspacesStorage: Migrating workspaces from JSON...');
       const oldWorkspaces = await IOUtils.readJSON(oldWorkspacesPath);
       if (oldWorkspaces.workspaces) {
         for (const workspace of oldWorkspaces.workspaces) {
-          await this.saveWorkspace(workspace, false); // Disable immediate notification
+          await this.saveWorkspace(workspace);
         }
       }
       await IOUtils.remove(oldWorkspacesPath);

From 82e3309310f5a68bff5f9832f2c4942c0b24f352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mauro=20=F0=9F=A4=99?=
 <91018726+mauro-balades@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:08:41 +0200
Subject: [PATCH 2/2] Update ZenWorkspaces.mjs

---
 src/ZenWorkspaces.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs
index ae3838d..6dbf538 100644
--- a/src/ZenWorkspaces.mjs
+++ b/src/ZenWorkspaces.mjs
@@ -21,8 +21,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     await ZenWorkspacesStorage.init();
     if(!Weave.Service.engineManager.get("workspaces")) {
       Weave.Service.engineManager.register(ZenWorkspacesEngine);
+      await ZenWorkspacesStorage.migrateWorkspacesFromJSON();
     }
-    await ZenWorkspacesStorage.migrateWorkspacesFromJSON();
     await this.initializeWorkspaces();
     console.info('ZenWorkspaces: ZenWorkspaces initialized');