Fixes edit button not working on widgets (#400)

* Main fix

* fix artifact of bug in config file

* Version bump

README.md

@@ -1,6 +1,6 @@
 # ![Perfect Jewelers Orb](./renderer/public/images/jeweler.png) Exiled Exchange 2
 
-![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.7.0.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
+![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.7.1.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
 ![GitHub Tag](https://img.shields.io/github/v/tag/kvan7/exiled-exchange-2?style=plastic&label=latest%20version)
 ![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/kvan7/exiled-exchange-2/latest/dev?style=plastic)
 

docs/.vitepress/config.js

@@ -20,7 +20,7 @@ export default defineConfig({
   },
   themeConfig: {
     // logo: 'TODO', https://github.com/vuejs/vitepress/issues/1401
-    appVersion: '0.7.0',
+    appVersion: '0.7.1',
     github: {
       releasesUrl: 'https://github.com/Kvan7/Exiled-Exchange-2/releases'
     },

main/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "exiled-exchange-2",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "exiled-exchange-2",
-      "version": "0.7.0",
+      "version": "0.7.1",
       "dependencies": {
         "electron-overlay-window": "3.3.0",
         "uiohook-napi": "1.5.x"

main/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiled-exchange-2",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "private": true,
   "scripts": {
     "dev": "node build/script.mjs",

renderer/src/web/Config.ts

@@ -150,7 +150,7 @@ export interface Config {
 }
 
 export const defaultConfig = (): Config => ({
-  configVersion: 22,
+  configVersion: 23,
   overlayKey: "Shift + Space",
   overlayBackground: "rgba(129, 139, 149, 0.15)",
   overlayBackgroundClose: true,
@@ -500,18 +500,49 @@ function upgradeConfig(_config: Config): Config {
     config.configVersion = 21;
   }
 
+  const priceCheck = config.widgets.find(
+    (w) => w.wmType === "price-check",
+  ) as widget.PriceCheckWidget;
+  if (priceCheck.rememberCurrency === undefined) {
+    priceCheck.rememberCurrency = false;
+  }
+
+  for (const widget of config.widgets) {
+    if (widget.wmType === "stash-search") {
+      (widget as StashSearchWidget).enableHotkeys ??= true;
+    }
+  }
+
+  if (config.logKeys === undefined) {
+    config.logKeys = false;
+  }
+
   if (config.configVersion < 22) {
     // NOTE: v0.7.0
     config.widgets.find(
       (w) => w.wmType === "price-check",
     )!.autoFillEmptyRuneSockets = false;
 
+    config.widgets.find((w) => w.wmType === "price-check")!.tierNumbering =
+      "poe2";
+
+    config.tipsFrequency = TipsFrequency.Normal;
+
+    config.configVersion = 22;
+  }
+
+  if (config.configVersion < 23) {
     for (const widget of config.widgets) {
       for (let i = 0; i < widget.wmFlags.length; ++i) {
         if (widget.wmFlags[i] === "skip-menu") {
           widget.wmFlags[i] = "menu::skip";
         }
       }
+      if (widget.wmType === "settings") {
+        widget.wmFlags = widget.wmFlags.filter(
+          (flag: string) => !flag.startsWith("settings::"),
+        );
+      }
     }
 
     const itemSearch = config.widgets.find(
@@ -530,29 +561,7 @@ function upgradeConfig(_config: Config): Config {
       return 0;
     });
 
-    config.widgets.find((w) => w.wmType === "price-check")!.tierNumbering =
-      "poe2";
-
-    config.tipsFrequency = TipsFrequency.Normal;
-
-    config.configVersion = 22;
-  }
-
-  if (config.logKeys === undefined) {
-    config.logKeys = false;
-  }
-
-  const priceCheck = config.widgets.find(
-    (w) => w.wmType === "price-check",
-  ) as widget.PriceCheckWidget;
-  if (priceCheck.rememberCurrency === undefined) {
-    priceCheck.rememberCurrency = false;
-  }
-
-  for (const widget of config.widgets) {
-    if (widget.wmType === "stash-search") {
-      (widget as StashSearchWidget).enableHotkeys ??= true;
-    }
+    config.configVersion = 23;
   }
 
   return config as unknown as Config;

renderer/src/web/filter-generator/WidgetFilterGenerator.vue

@@ -138,7 +138,7 @@ if (props.config.wmFlags[0] === "uninitialized") {
 
 function openSettings() {
   const settings = wm.widgets.value.find((w) => w.wmType === "settings")!;
-  wm.setFlag(settings.wmId, `settings:widget:${props.config.wmId}`, true);
+  wm.setFlag(settings.wmId, `settings::widget=${props.config.wmId}`, true);
   wm.show(settings.wmId);
 }
 

renderer/src/web/settings/SettingsWindow.vue

@@ -229,10 +229,10 @@ export default defineComponent({
       () => props.config.wmFlags,
       (wmFlags) => {
         const flagStr = wmFlags.find((flag) =>
-          flag.startsWith("settings:widget:"),
+          flag.startsWith("settings::widget="),
         );
         if (flagStr) {
-          const _wmId = Number(flagStr.split(":")[2]);
+          const _wmId = Number(flagStr.split("=")[1]);
           const _widget = wm.widgets.value.find((w) => w.wmId === _wmId)!;
           selectedWmId.value = _wmId;
           selectedComponent.value = menuByType(_widget.wmType)[0][0];