From 66c2cb25aada8daa2cb1cbae8eafffaa72b972c3 Mon Sep 17 00:00:00 2001
From: tripp <86533397+trippjoe@users.noreply.github.com>
Date: Sun, 3 Dec 2023 17:27:42 -0500
Subject: [PATCH 1/3] better UX for changing the active game version

---
 .../settings/versions/OfficialVersions.svelte |  6 ++++--
 .../versions/UnofficialVersions.svelte        |  4 ++--
 .../settings/versions/VersionList.svelte      | 20 +------------------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/routes/settings/versions/OfficialVersions.svelte b/src/routes/settings/versions/OfficialVersions.svelte
index d83c7ef0..87b2befc 100644
--- a/src/routes/settings/versions/OfficialVersions.svelte
+++ b/src/routes/settings/versions/OfficialVersions.svelte
@@ -14,6 +14,7 @@
   import { UpdateStore } from "$lib/stores/AppStore";
   import { saveActiveVersionChange } from "$lib/rpc/config";
   import { _ } from "svelte-i18n";
+  import { toastStore } from "$lib/stores/ToastStore";
 
   let versionsLoaded = false;
   let releases: ReleaseInfo[] = [];
@@ -102,7 +103,7 @@
     versionsLoaded = true;
   }
 
-  async function saveOfficialVersionChange(evt) {
+  async function saveOfficialVersionChange() {
     const success = await saveActiveVersionChange(
       "official",
       $VersionStore.selectedVersions.official,
@@ -112,10 +113,11 @@
       $VersionStore.activeVersionName = $VersionStore.selectedVersions.official;
       $VersionStore.selectedVersions.unofficial = null;
       $VersionStore.selectedVersions.devel = null;
+      toastStore.makeToast("Saved game version!", "info");
     }
   }
 
-  async function openOfficialVersionFolder(evt) {
+  async function openOfficialVersionFolder() {
     openVersionFolder("official");
   }
 
diff --git a/src/routes/settings/versions/UnofficialVersions.svelte b/src/routes/settings/versions/UnofficialVersions.svelte
index 820a8dcc..755cf894 100644
--- a/src/routes/settings/versions/UnofficialVersions.svelte
+++ b/src/routes/settings/versions/UnofficialVersions.svelte
@@ -53,7 +53,7 @@
     versionsLoaded = true;
   }
 
-  async function onSaveVersionChange(evt: any) {
+  async function onSaveVersionChange() {
     const success = await saveActiveVersionChange(
       "unofficial",
       $VersionStore.selectedVersions.unofficial,
@@ -67,7 +67,7 @@
     }
   }
 
-  async function onOpenVersionFolder(evt: any) {
+  async function onOpenVersionFolder() {
     openVersionFolder("unofficial");
   }
 
diff --git a/src/routes/settings/versions/VersionList.svelte b/src/routes/settings/versions/VersionList.svelte
index 69957691..68d865df 100644
--- a/src/routes/settings/versions/VersionList.svelte
+++ b/src/routes/settings/versions/VersionList.svelte
@@ -2,10 +2,8 @@
   import type { VersionFolders } from "$lib/rpc/versions";
   import {
     VersionStore,
-    type VersionStoreIFace,
   } from "$lib/stores/VersionStore";
   import type { ReleaseInfo } from "$lib/utils/github";
-  import IconSave from "~icons/mdi/content-save";
   import IconRefresh from "~icons/mdi/refresh";
   import IconFolderOpen from "~icons/mdi/folder-open";
   import IconGitHub from "~icons/mdi/github";
@@ -40,15 +38,6 @@
     "inline-block text-sm font-normal text-center disabled:cursor-not-allowed p-4 border-b-2 border-transparent text-gray-400 hover:text-orange-300 hover:border-orange-500 dark:hover:text-orange-300 dark:text-orange-400";
 
   const dispatch = createEventDispatcher();
-
-  function changesPending(versionStore: VersionStoreIFace): boolean {
-    return (
-      versionStore.selectedVersions[releaseType] !== null &&
-      versionStore.selectedVersions[releaseType] !== "" &&
-      versionStore.selectedVersions[releaseType] !==
-        versionStore.activeVersionName
-    );
-  }
 </script>
 
 <TabItem
@@ -69,14 +58,6 @@
         </p>
       </div>
       <div class="flex">
-        {#if changesPending($VersionStore)}
-          <Button
-            class="!p-2 mr-2 rounded-md dark:bg-green-500 hover:dark:bg-green-600 text-slate-900"
-            on:click={() => dispatch("versionChange")}
-          >
-            <IconSave aria-label={$_("settings_versions_icon_save_altText")} />
-          </Button>
-        {/if}
         <Button
           class="!p-2 mr-2 rounded-md dark:bg-orange-500 hover:dark:bg-orange-600 text-slate-900"
           on:click={() => dispatch("refreshVersions")}
@@ -121,6 +102,7 @@
                 <Radio
                   class="disabled:cursor-not-allowed p-0"
                   bind:group={$VersionStore.selectedVersions[releaseType]}
+                  on:change={() => dispatch("versionChange")}
                   value={release.version}
                   disabled={!release.isDownloaded}
                   name={`${releaseType}-release`}

From daa4a97f77c9377387e302d77f7f96d3eaaf1499 Mon Sep 17 00:00:00 2001
From: tripp <86533397+trippjoe@users.noreply.github.com>
Date: Sun, 3 Dec 2023 18:32:25 -0500
Subject: [PATCH 2/3] set the active game version on download/redownload

---
 src/routes/settings/versions/OfficialVersions.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/routes/settings/versions/OfficialVersions.svelte b/src/routes/settings/versions/OfficialVersions.svelte
index 87b2befc..351655c3 100644
--- a/src/routes/settings/versions/OfficialVersions.svelte
+++ b/src/routes/settings/versions/OfficialVersions.svelte
@@ -147,6 +147,8 @@
       }
     }
     releases = releases;
+    $VersionStore.selectedVersions.official = event.detail.version;
+    await saveOfficialVersionChange()
   }
 
   async function onRemoveVersion(event: any) {

From 33775ee9a83b179f90a4f95c5bc743723478faf4 Mon Sep 17 00:00:00 2001
From: tripp <86533397+trippjoe@users.noreply.github.com>
Date: Sun, 3 Dec 2023 18:44:42 -0500
Subject: [PATCH 3/3] linting

---
 src/routes/settings/versions/OfficialVersions.svelte | 2 +-
 src/routes/settings/versions/VersionList.svelte      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/routes/settings/versions/OfficialVersions.svelte b/src/routes/settings/versions/OfficialVersions.svelte
index 351655c3..cd074725 100644
--- a/src/routes/settings/versions/OfficialVersions.svelte
+++ b/src/routes/settings/versions/OfficialVersions.svelte
@@ -148,7 +148,7 @@
     }
     releases = releases;
     $VersionStore.selectedVersions.official = event.detail.version;
-    await saveOfficialVersionChange()
+    await saveOfficialVersionChange();
   }
 
   async function onRemoveVersion(event: any) {
diff --git a/src/routes/settings/versions/VersionList.svelte b/src/routes/settings/versions/VersionList.svelte
index 68d865df..37ceb38a 100644
--- a/src/routes/settings/versions/VersionList.svelte
+++ b/src/routes/settings/versions/VersionList.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
   import type { VersionFolders } from "$lib/rpc/versions";
-  import {
-    VersionStore,
-  } from "$lib/stores/VersionStore";
+  import { VersionStore } from "$lib/stores/VersionStore";
   import type { ReleaseInfo } from "$lib/utils/github";
   import IconRefresh from "~icons/mdi/refresh";
   import IconFolderOpen from "~icons/mdi/folder-open";