From ec86cbf9b63ef02bd292d437398892bd288cf54c Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Tue, 7 Oct 2025 19:55:40 +1300
Subject: [PATCH] Update UI on instance fetch

---
 src/components/DataTable.vue     |  2 +-
 src/components/Location.vue      | 14 +++++++++++++-
 src/components/LocationWorld.vue | 12 ++++++++++++
 src/stores/instance.js           |  6 +++++-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/components/DataTable.vue b/src/components/DataTable.vue
index 275c19fe..5c45e7d8 100644
--- a/src/components/DataTable.vue
+++ b/src/components/DataTable.vue
@@ -95,7 +95,7 @@
 
             const mergedPaginationProps = computed(() => ({
                 layout: 'sizes, prev, pager, next, total',
-                pageSizes: [20, 50, 100, 200],
+                pageSizes: [10, 15, 20, 25, 50, 100],
                 small: true,
                 ...paginationProps.value
             }));
diff --git a/src/components/Location.vue b/src/components/Location.vue
index 57a92eb5..d275751c 100644
--- a/src/components/Location.vue
+++ b/src/components/Location.vue
@@ -22,7 +22,8 @@
 
 <script setup>
     import { Loading, Lock, WarnTriangleFilled } from '@element-plus/icons-vue';
-    import { ref, watchEffect } from 'vue';
+    import { ref, watchEffect, watch } from 'vue';
+    import { storeToRefs } from 'pinia';
     import { getGroupName, getWorldName, parseLocation } from '../shared/utils';
     import { useGroupStore, useInstanceStore, useSearchStore, useWorldStore } from '../stores';
     import { useI18n } from 'vue-i18n';
@@ -33,6 +34,7 @@
     const { showPreviousInstancesInfoDialog } = useInstanceStore();
     const { verifyShortName } = useSearchStore();
     const { cachedInstances } = useInstanceStore();
+    const { lastInstanceApplied } = storeToRefs(useInstanceStore());
 
     const props = defineProps({
         location: String,
@@ -63,6 +65,16 @@
         parse();
     });
 
+    watch(
+        () => lastInstanceApplied.value,
+        (instanceId) => {
+            if (instanceId === currentInstanceId()) {
+                parse();
+            }
+        },
+        { immediate: true }
+    );
+
     function currentInstanceId() {
         if (typeof props.traveling !== 'undefined' && props.location === 'traveling') {
             return props.traveling;
diff --git a/src/components/LocationWorld.vue b/src/components/LocationWorld.vue
index dd456ca4..db6c3fd4 100644
--- a/src/components/LocationWorld.vue
+++ b/src/components/LocationWorld.vue
@@ -16,11 +16,13 @@
 <script setup>
     import { Lock, Unlock, WarnTriangleFilled } from '@element-plus/icons-vue';
     import { ref, watch } from 'vue';
+    import { storeToRefs } from 'pinia';
     import { getGroupName, parseLocation } from '../shared/utils';
     import { useGroupStore, useLaunchStore, useInstanceStore } from '../stores';
     import { useI18n } from 'vue-i18n';
     const { t } = useI18n();
     const { cachedInstances } = useInstanceStore();
+    const { lastInstanceApplied } = storeToRefs(useInstanceStore());
 
     const launchStore = useLaunchStore();
     const groupStore = useGroupStore();
@@ -95,6 +97,16 @@
 
     watch(() => props.locationobject, parse, { immediate: true });
 
+    watch(
+        () => lastInstanceApplied.value,
+        (instanceId) => {
+            if (instanceId === location.value) {
+                parse();
+            }
+        },
+        { immediate: true }
+    );
+
     function showLaunchDialog() {
         launchStore.showLaunchDialog(location.value, shortName.value);
     }
diff --git a/src/stores/instance.js b/src/stores/instance.js
index 09e8bebc..e298240f 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import { computed, reactive, watch } from 'vue';
+import { computed, reactive, watch, ref } from 'vue';
 import { ElMessage } from 'element-plus';
 import { instanceRequest, userRequest, worldRequest } from '../api';
 import configRepository from '../service/config';
@@ -82,6 +82,8 @@ export const useInstanceStore = defineStore('Instance', () => {
 
     let cachedInstances = new Map();
 
+    const lastInstanceApplied = ref('');
+
     const currentInstanceWorld = computed({
         get: () => state.currentInstanceWorld,
         set: (value) => {
@@ -417,6 +419,7 @@ export const useInstanceStore = defineStore('Instance', () => {
                 groupInstance.instance = ref;
             }
         }
+        lastInstanceApplied.value = ref.id;
         return ref;
     }
 
@@ -1230,6 +1233,7 @@ export const useInstanceStore = defineStore('Instance', () => {
         state,
 
         cachedInstances,
+        lastInstanceApplied,
         currentInstanceWorld,
         currentInstanceLocation,
         queuedInstances,