From 4d9741c42476543f4e3e16f0e7a29b3586875b13 Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Thu, 26 Dec 2024 22:59:15 -0700
Subject: [PATCH] fix search flashing, reorder filters on mods

---
 .github/workflows/theseus-release.yml         | 10 ++++-----
 .../src/pages/search/[searchProjectType].vue  | 22 ++++++++++++++-----
 packages/ui/src/utils/search.ts               | 15 ++++++++-----
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/theseus-release.yml b/.github/workflows/theseus-release.yml
index 3e66e9dd8..4cc9a98cd 100644
--- a/.github/workflows/theseus-release.yml
+++ b/.github/workflows/theseus-release.yml
@@ -53,11 +53,11 @@ jobs:
             !target/release/bundle/*/*.app.tar.gz
             !target/release/bundle/*/*.app.tar.gz.sig
 
-            !target/release/bundle/*/*.AppImage
-            !target/release/bundle/*/*.AppImage.tar.gz
-            !target/release/bundle/*/*.AppImage.tar.gz.sig
-            !target/release/bundle/*/*.deb
-            !target/release/bundle/*/*.rpm
+            !target/release/bundle/appimage/*.AppImage
+            !target/release/bundle/appimage/*.AppImage.tar.gz
+            !target/release/bundle/appimage/*.AppImage.tar.gz.sig
+            !target/release/bundle/deb/*.deb
+            !target/release/bundle/rpm/*.rpm
 
             !target/release/bundle/msi/*.msi
             !target/release/bundle/msi/*.msi.zip
diff --git a/apps/frontend/src/pages/search/[searchProjectType].vue b/apps/frontend/src/pages/search/[searchProjectType].vue
index f0f4206ed..39a12ed85 100644
--- a/apps/frontend/src/pages/search/[searchProjectType].vue
+++ b/apps/frontend/src/pages/search/[searchProjectType].vue
@@ -42,7 +42,11 @@
           Install content to server
         </h1>
       </template>
-      <NavTabs v-if="!server" :links="selectableProjectTypes" class="hidden md:flex" />
+      <NavTabs
+        v-if="!server && !flags.projectTypesPrimaryNav"
+        :links="selectableProjectTypes"
+        class="hidden md:flex"
+      />
     </section>
     <aside
       :class="{
@@ -338,11 +342,17 @@ const tags = useTags();
 const flags = useFeatureFlags();
 const auth = await useAuth();
 
-const projectType = computed(() =>
-  tags.value.projectTypes.find(
+const projectType = ref();
+function setProjectType() {
+  projectType.value = tags.value.projectTypes.find(
     (x) => x.id === route.path.replaceAll(/^\/|s\/?$/g, ""), // Removes prefix `/` and suffixes `s` and `s/`
-  ),
-);
+  );
+}
+setProjectType();
+router.afterEach(() => {
+  setProjectType();
+});
+
 const projectTypes = computed(() => [projectType.value.id]);
 
 const server = ref();
@@ -516,7 +526,7 @@ const {
     const config = useRuntimeConfig();
     const base = import.meta.server ? config.apiBaseUrl : config.public.apiBaseUrl;
 
-    return `${base}/search${requestParams.value}`;
+    return `${base}search${requestParams.value}`;
   },
   {
     transform: (hits) => {
diff --git a/packages/ui/src/utils/search.ts b/packages/ui/src/utils/search.ts
index 3959673e2..3168bf3c5 100644
--- a/packages/ui/src/utils/search.ts
+++ b/packages/ui/src/utils/search.ts
@@ -32,6 +32,7 @@ export type FilterType = {
   }[]
   searchable: boolean
   allows_custom_options?: 'and' | 'or'
+  ordering?: number
 } & (
   | {
       display: 'all' | 'scrollable' | 'none'
@@ -215,6 +216,7 @@ export function useSearch(
           query_value: gameVersion.version,
           method: 'or',
         })),
+        ordering: projectTypes.value.includes('mod') ? 2 : undefined,
       },
       {
         id: 'mod_loader',
@@ -243,6 +245,7 @@ export function useSearch(
               value: `categories:${loader.name}`,
             }
           }),
+        ordering: projectTypes.value.includes('mod') ? 1 : undefined,
       },
       {
         id: 'modpack_loader',
@@ -375,11 +378,13 @@ export function useSearch(
       },
     ]
 
-    return filterTypes.filter((filterType) =>
-      filterType.supported_project_types.some((projectType) =>
-        projectTypes.value.includes(projectType),
-      ),
-    )
+    return filterTypes
+      .filter((filterType) =>
+        filterType.supported_project_types.some((projectType) =>
+          projectTypes.value.includes(projectType),
+        ),
+      )
+      .sort((a, b) => (b.ordering ?? 0) - (a.ordering ?? 0))
   })
 
   const facets = computed(() => {