Beta bugs (#562)

* fixed bugs

* added logging for atlauncher

* draft: improving imports time

* more improvements

* more

* prettier, etc

* small changes

* emma suggested change

* rev

* removed atlauncher debug

theseus_gui/src/App.vue

@@ -177,6 +177,20 @@ document.querySelector('body').addEventListener('click', function (e) {
   }
 })
 
+document.querySelector('body').addEventListener('auxclick', function (e) {
+  // disables middle click -> new tab
+  if (e.button === 1) {
+    e.preventDefault()
+    // instead do a left click
+    const event = new MouseEvent('click', {
+      view: window,
+      bubbles: true,
+      cancelable: true,
+    })
+    e.target.dispatchEvent(event)
+  }
+})
+
 const accounts = ref(null)
 
 command_listener((e) => {

theseus_gui/src/assets/stylesheets/global.scss

@@ -128,3 +128,10 @@ input {
   background-color: var(--color-raised-bg);
   box-shadow: none !important;
 }
+
+img {
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}

theseus_gui/src/components/GridDisplay.vue

@@ -200,6 +200,25 @@ const filteredResults = computed(() => {
     return instanceMap.set('None', instances)
   }
 
+  // For 'name', we intuitively expect the sorting to apply to the name of the group first, not just the name of the instance
+  // ie: Category A should come before B, even if the first instance in B comes before the first instance in A
+  if (sortBy.value === 'Name') {
+    const sortedEntries = [...instanceMap.entries()].sort((a, b) => {
+      // None should always be first
+      if (a[0] === 'None' && b[0] !== 'None') {
+        return -1
+      }
+      if (a[0] !== 'None' && b[0] === 'None') {
+        return 1
+      }
+      return a[0].localeCompare(b[0])
+    })
+    instanceMap.clear()
+    sortedEntries.forEach((entry) => {
+      instanceMap.set(entry[0], entry[1])
+    })
+  }
+
   return instanceMap
 })
 </script>
@@ -265,7 +284,7 @@ const filteredResults = computed(() => {
       <Instance
         v-for="(instance, index) in instanceSection.value"
         ref="instanceComponents"
-        :key="instance.id"
+        :key="instance.path"
         :instance="instance"
         @contextmenu.prevent.stop="(event) => handleRightClick(event, instanceComponents[index])"
       />

theseus_gui/src/components/ui/IncompatibilityWarningModal.vue

@@ -165,5 +165,9 @@ td:first-child {
   flex-direction: column;
   gap: 1rem;
   padding: 1rem;
+
+  :deep(.animated-dropdown .options) {
+    max-height: 13.375rem;
+  }
 }
 </style>

theseus_gui/src/components/ui/ModInstallModal.vue

@@ -183,7 +183,7 @@ const createInstance = async () => {
   await router.push(`/instance/${encodeURIComponent(id)}/`)
 
   const instance = await get(id, true)
-  await installVersionDependencies(instance, versions.value)
+  await installVersionDependencies(instance, versions.value[0])
 
   mixpanel_track('InstanceCreate', {
     profile_name: name.value,
@@ -204,7 +204,7 @@ const createInstance = async () => {
     source: 'ProjectInstallModal',
   })
 
-  installModal.value.hide()
+  if (installModal.value) installModal.value.hide()
   creatingInstance.value = false
 }
 

theseus_gui/src/helpers/import.js

@@ -34,7 +34,9 @@ export async function get_importable_instances(launcherType, basePath) {
 /// eg: import_instance("profile-name-to-go-to", "MultiMC", "C:/MultiMC", "Instance 1")
 export async function import_instance(launcherType, basePath, instanceFolder) {
   // create a basic, empty instance (most properties will be filled in by the import process)
-  const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null)
+  // We do NOT watch the fs for changes to avoid duplicate events during installation
+  // fs watching will be enabled once the instance is imported
+  const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null, true)
 
   return await invoke('plugin:import|import_import_instance', {
     profilePath,

theseus_gui/src/helpers/metadata.js

@@ -9,17 +9,23 @@ export async function get_game_versions() {
 // Gets the fabric versions from daedalus
 // Returns Manifest
 export async function get_fabric_versions() {
-  return await invoke('plugin:metadata|metadata_get_fabric_versions')
+  const c = await invoke('plugin:metadata|metadata_get_fabric_versions')
+  console.log('Getting fabric versions', c)
+  return c
 }
 
 // Gets the forge versions from daedalus
 // Returns Manifest
 export async function get_forge_versions() {
-  return await invoke('plugin:metadata|metadata_get_forge_versions')
+  const c = await invoke('plugin:metadata|metadata_get_forge_versions')
+  console.log('Getting forge versions', c)
+  return c
 }
 
 // Gets the quilt versions from daedalus
 // Returns Manifest
 export async function get_quilt_versions() {
-  return await invoke('plugin:metadata|metadata_get_quilt_versions')
+  const c = await invoke('plugin:metadata|metadata_get_quilt_versions')
+  console.log('Getting quilt versions', c)
+  return c
 }

theseus_gui/src/helpers/profile.js

@@ -16,13 +16,14 @@ import { invoke } from '@tauri-apps/api/tauri'
     - icon is a path to an image file, which will be copied into the profile directory
 */
 
-export async function create(name, gameVersion, modloader, loaderVersion, icon) {
+export async function create(name, gameVersion, modloader, loaderVersion, icon, noWatch) {
   return await invoke('plugin:profile_create|profile_create', {
     name,
     gameVersion,
     modloader,
     loaderVersion,
     icon,
+    noWatch,
   })
 }
 

theseus_gui/src/pages/Browse.vue

@@ -237,22 +237,22 @@ async function refreshSearch() {
 
   let val = `${base}${url}`
 
-  const rawResults = await useFetch(val, 'search results', offline.value)
-  results.value = rawResults
+  let rawResults = await useFetch(val, 'search results', offline.value)
   if (!rawResults) {
-    results.value = {
+    rawResults = {
       hits: [],
       total_hits: 0,
       limit: 1,
     }
   }
   if (instanceContext.value) {
-    for (let val of results.value.hits) {
+    for (val of rawResults.hits) {
       val.installed = await check_installed(instanceContext.value.path, val.project_id).then(
         (x) => (val.installed = x)
       )
     }
   }
+  results.value = rawResults
 }
 
 async function onSearchChange(newPageNumber) {
@@ -262,7 +262,6 @@ async function onSearchChange(newPageNumber) {
     return
   }
   await refreshSearch()
-
   const obj = getSearchUrl((currentPage.value - 1) * maxResults.value, true)
 
   // Only replace in router if the query is different

theseus_gui/src/pages/Settings.vue

@@ -311,7 +311,16 @@ async function refreshDir() {
             customize your experience. Opting out will disable this data collection.
           </span>
         </label>
-        <Toggle id="opt-out-analytics" v-model="settings.opt_out_analytics" />
+        <Toggle
+          id="opt-out-analytics"
+          :model-value="settings.opt_out_analytics"
+          :checked="settings.opt_out_analytics"
+          @update:model-value="
+            (e) => {
+              settings.opt_out_analytics = e
+            }
+          "
+        />
       </div>
     </Card>
     <Card>
@@ -425,7 +434,7 @@ async function refreshDir() {
         <label for="fullscreen">
           <span class="label__title">Fullscreen</span>
           <span class="label__description">
-            Overwrites the option.txt file to start in full screen when launched.
+            Overwrites the options.txt file to start in full screen when launched.
           </span>
         </label>
         <Toggle

theseus_gui/src/pages/instance/Logs.vue

@@ -185,12 +185,21 @@ interval.value = setInterval(async () => {
   if (logs.value.length > 0) {
     logs.value[0] = await getLiveLog()
 
-    if (selectedLogIndex.value === 0 && !userScrolled.value) {
-      await nextTick()
-      isAutoScrolling.value = true
-      logContainer.value.scrollTop =
-        logContainer.value.scrollHeight - logContainer.value.offsetHeight
-      setTimeout(() => (isAutoScrolling.value = false), 50)
+    // Allow resetting of userScrolled if the user scrolls to the bottom
+    if (selectedLogIndex.value === 0) {
+      if (
+        logContainer.value.scrollTop + logContainer.value.offsetHeight >=
+        logContainer.value.scrollHeight - 10
+      )
+        userScrolled.value = false
+
+      if (!userScrolled.value) {
+        await nextTick()
+        isAutoScrolling.value = true
+        logContainer.value.scrollTop =
+          logContainer.value.scrollHeight - logContainer.value.offsetHeight
+        setTimeout(() => (isAutoScrolling.value = false), 50)
+      }
     }
   }
 }, 250)

theseus_gui/src/pages/instance/Options.vue

@@ -204,7 +204,9 @@
     <div class="adjacent-input">
       <label for="fullscreen">
         <span class="label__title">Fullscreen</span>
-        <span class="label__description"> Make the game start in full screen when launched. </span>
+        <span class="label__description">
+          Make the game start in full screen when launched (using options.txt).
+        </span>
       </label>
       <Checkbox id="fullscreen" v-model="fullscreenSetting" :disabled="!overrideWindowSettings" />
     </div>

theseus_gui/src/pages/project/Gallery.vue

@@ -50,6 +50,7 @@
             </Button>
             <a
               class="open btn icon-only"
+              target="_blank"
               :href="
                 expandedGalleryItem.url
                   ? expandedGalleryItem.url

theseus_gui/src/pages/project/Version.vue

@@ -83,12 +83,7 @@
         <Card v-if="displayDependencies.length > 0">
           <h2>Dependencies</h2>
           <div v-for="dependency in displayDependencies" :key="dependency.title">
-            <router-link
-              v-if="dependency.link"
-              class="btn dependency"
-              :to="dependency.link"
-              @click="testTest"
-            >
+            <router-link v-if="dependency.link" class="btn dependency" :to="dependency.link">
               <Avatar size="sm" :src="dependency.icon" />
               <div>
                 <span class="title"> {{ dependency.title }} </span> <br />