Tag connect & disconnect fix (#360)

* fix: tag connect/disconnect

* fix: lint

* fix: oidc typo fix

components/GameEditor/Metadata.vue

@@ -30,7 +30,11 @@
         </div>
 
         <div class="grid grid-cols-1 lg:grid-cols-3 gap-4 pt-8">
-          <SelectorMultiItem v-model="currentTags" :items="tags" />
+          <SelectorMultiItem
+            v-model="currentTags"
+            :items="tags"
+            :create="createTag"
+          />
           <div class="flex flex-col">
             <label
               for="releaseDate"
@@ -493,8 +497,9 @@ if (!game.value)
 const currentTags = ref<{ [key: string]: boolean }>(
   Object.fromEntries(game.value.tags.map((e) => [e.id, true])),
 );
-const tags = (await $dropFetch("/api/v1/admin/tags")).map(
-  (e) => ({ name: e.name, param: e.id }) satisfies StoreSortOption,
+const rawTags = await $dropFetch("/api/v1/admin/tags");
+const tags = ref(
+  rawTags.map((e) => ({ name: e.name, param: e.id }) satisfies StoreSortOption),
 );
 
 watch(
@@ -505,7 +510,11 @@ watch(
       params: {
         id: game.value.id,
       },
-      body: { tags: Object.keys(v) },
+      body: {
+        tags: Object.entries(v)
+          .filter((v) => v[1])
+          .map((v) => v[0]),
+      },
       failTitle: "Failed to update game tags",
     });
   },
@@ -816,4 +825,15 @@ async function updateImageCarousel() {
     );
   }
 }
+
+async function createTag(value: string): Promise<string> {
+  const tag = await $dropFetch(`/api/v1/admin/tags`, {
+    method: "POST",
+    body: {
+      name: value,
+    },
+  });
+  tags.value.push({ name: tag.name, param: tag.id });
+  return tag.id;
+}
 </script>

components/Selector/MultiItem.vue

@@ -34,7 +34,7 @@
         <ComboboxInput
           class="block w-full rounded-md bg-zinc-900 py-1.5 pr-12 pl-3 text-base text-zinc-100 outline-1 -outline-offset-1 outline-zinc-700 placeholder:text-zinc-500 focus:outline-2 focus:-outline-offset-2 focus:outline-blue-600 sm:text-sm/6"
           :display-value="(item) => (item as StoreSortOption)?.name"
-          placeholder="Start typing..."
+          :placeholder="$t('common.components.multiitem.placeholder')"
           @change="search = $event.target.value"
           @blur="search = ''"
         />
@@ -68,7 +68,51 @@
               </span>
             </li>
           </ComboboxOption>
+          <ComboboxOption
+            v-if="$props.create"
+            v-slot="{ active }"
+            :value="CREATE_PREFIX + search"
+            as="template"
+          >
+            <li
+              :class="[
+                'relative cursor-default py-2 pr-9 pl-3 select-none',
+                active
+                  ? 'bg-blue-600 text-white outline-hidden'
+                  : 'text-zinc-100',
+              ]"
+            >
+              <span class="block truncate">
+                {{ $t("common.components.multiitem.new", [search]) }}
+              </span>
+            </li>
+          </ComboboxOption>
         </ComboboxOptions>
+
+        <div
+          v-if="createLoading"
+          class="absolute inset-0 bg-zinc-950 flex items-center justify-center"
+        >
+          <div role="status">
+            <svg
+              aria-hidden="true"
+              class="size-8 text-transparent animate-spin fill-white"
+              viewBox="0 0 100 101"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                fill="currentColor"
+              />
+              <path
+                d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                fill="currentFill"
+              />
+            </svg>
+            <span class="sr-only">{{ $t("common.srLoading") }}</span>
+          </div>
+        </div>
       </div>
     </Combobox>
   </div>
@@ -85,6 +129,7 @@ import {
 } from "@headlessui/vue";
 const props = defineProps<{
   items: Array<StoreSortOption>;
+  create?: (value: string) => Promise<string>;
 }>();
 
 const model = defineModel<{ [key: string]: boolean }>();
@@ -102,7 +147,37 @@ const enabledItems = computed(() =>
   props.items.filter((e) => model.value?.[e.param]),
 );
 
+// I do not love how this works, but it's okay for now
+const CREATE_PREFIX = "CREATE";
+
+const createLoading = ref(false);
 function add(item: string) {
+  if (item.startsWith(CREATE_PREFIX)) {
+    if (!props.create) return;
+    const value = item.substring(CREATE_PREFIX.length);
+    createLoading.value = true;
+    props
+      .create(value)
+      .then(
+        (result) => {
+          add(result);
+        },
+        (err) => {
+          createModal(
+            ModalType.Notification,
+            {
+              title: "Failed to create value",
+              description: err,
+            },
+            (_, c) => c(),
+          );
+        },
+      )
+      .finally(() => {
+        createLoading.value = false;
+      });
+    return;
+  }
   search.value = "";
   model.value ??= {};
   model.value[item] = true;

i18n/locales/en_us.json

@@ -160,6 +160,12 @@
     "add": "Add",
     "cannotUndo": "This action cannot be undone.",
     "close": "Close",
+    "components": {
+      "multiitem": {
+        "new": "Create new: \"{0}\"",
+        "placeholder": "Start typing..."
+      }
+    },
     "create": "Create",
     "date": "Date",
     "delete": "Delete",

server/api/v1/admin/game/[id]/tags.patch.ts

@@ -16,10 +16,19 @@ export default defineEventHandler(async (h3) => {
 
   const game = await prisma.game.findUnique({
     where: { id },
-    select: { id: true },
+    select: { id: true, tags: { select: { id: true } } },
   });
   if (!game) throw createError({ statusCode: 404, message: "Game not found" });
 
+  const tagSet = new Set(game.tags.map((v) => v.id));
+  const toConnect = body.tags.filter((v) => !tagSet.has(v));
+
+  const bodyTagSet = new Set(body.tags);
+  const toDisconnect = tagSet
+    .values()
+    .filter((v) => !bodyTagSet.has(v))
+    .toArray();
+
   // SAFETY: Okay to disable due to check above
   // eslint-disable-next-line drop/no-prisma-delete
   await prisma.game.update({
@@ -28,7 +37,8 @@ export default defineEventHandler(async (h3) => {
     },
     data: {
       tags: {
-        connect: body.tags.map((e) => ({ id: e })),
+        connect: toConnect.map((e) => ({ id: e })),
+        disconnect: toDisconnect.map((e) => ({ id: e })),
       },
     },
   });

server/api/v1/store/index.get.ts

@@ -53,24 +53,34 @@ export default defineEventHandler(async (h3) => {
     : undefined;
   const platformFilter = filterPlatforms
     ? ({
-        versions: {
-          some: {
-            launches: {
+        OR: [
+          {
+            versions: {
               some: {
-                platform: {
-                  in: filterPlatforms,
-                },
-              },
-            },
-            setups: {
-              some: {
-                platform: {
-                  in: filterPlatforms,
+                setups: {
+                  some: {
+                    platform: {
+                      in: filterPlatforms,
+                    },
+                  },
                 },
               },
             },
           },
-        },
+          {
+            versions: {
+              some: {
+                launches: {
+                  some: {
+                    platform: {
+                      in: filterPlatforms,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
       } satisfies Prisma.GameWhereInput)
     : undefined;
 

server/internal/auth/oidc/index.ts

@@ -153,14 +153,14 @@ export class OIDCManager {
 
     this.JWKS = jose.createRemoteJWKSet(this.oidcConfiguration.jwks_uri);
     this.redirectUrl = new URL(
-      `${this.externalUrl.toString()}api/v1/auth/odic/callback`,
+      `${this.externalUrl.toString()}api/v1/auth/oidc/callback`,
     );
   }
 
   static async create() {
     if (!systemConfig.shouldOidcRequireHttps()) {
       console.warn(
-        "Disabling HTTPS requirement for ODIC provider, not recommened in production enviroments",
+        "Disabling HTTPS requirement for OIDC provider, not recommened in production enviroments",
       );
     }
 

server/internal/config/sys-conf.ts

@@ -12,7 +12,7 @@ class SystemConfig {
   );
   private dropVersion: string;
   private gitRef: string;
-  private odicRequireHttps;
+  private oidcRequireHttps;
 
   private checkForUpdates = getUpdateCheckConfig();
 
@@ -22,14 +22,14 @@ class SystemConfig {
     this.dropVersion = config.dropVersion;
     this.gitRef = config.gitRef;
 
-    const odicRequireHttps = process.env.OIDC_REQUIRE_HTTPS as
+    const oidcRequireHttps = process.env.OIDC_REQUIRE_HTTPS as
       | string
       | undefined;
 
     // default to true if not set
-    this.odicRequireHttps =
-      odicRequireHttps !== undefined &&
-      odicRequireHttps.toLocaleLowerCase() === "false"
+    this.oidcRequireHttps =
+      oidcRequireHttps !== undefined &&
+      oidcRequireHttps.toLocaleLowerCase() === "false"
         ? false
         : true;
   }
@@ -64,7 +64,7 @@ class SystemConfig {
 
   // if oidc should require https for endpoints
   shouldOidcRequireHttps() {
-    return this.odicRequireHttps;
+    return this.oidcRequireHttps;
   }
 }