Merge pull request #317 from KenEucker/develop

Small fixes

Author: KenEucker

functions/common/methods.ts

@@ -2056,11 +2056,14 @@ export const collectQueueIssuesFromStorage = (
   for (const key of unparsedKeys) {
     const tagnumber = parseTagnumberFromQueueKey(key) ?? 0
     const filename = key.split('/').pop() || key
+    // Unrecognized names cannot be converted by resize — only deleted.
     issues.push({
       category: 'non-webp',
       tagnumber,
       issue: `unrecognized queue file: ${filename}`,
       url: key,
+      key,
+      deletable: true,
     })
   }
 
@@ -2145,6 +2148,7 @@ export const collectQueueIssuesFromStorage = (
         player,
         type: image.type,
         url: image.url,
+        key: image.key,
         issue: `queue file is ${image.extension}, not webp`,
       })
       continue
@@ -2166,6 +2170,7 @@ export const collectQueueIssuesFromStorage = (
         player,
         type: image.type,
         url: image.url,
+        key: image.key,
         issue: `missing sized variant${missing.length > 1 ? 's' : ''}: ${missing.join(', ')}`,
       })
     }
@@ -2233,7 +2238,8 @@ export const getQueueUploaderKey = (tag: Tag): string | undefined => {
 }
 
 export const isFixableQueueIssue = (issue: QueueIssue): boolean =>
-  issue.category === 'non-webp' || issue.category === 'missing-variants'
+  (issue.category === 'non-webp' || issue.category === 'missing-variants') &&
+  issue.deletable !== true
 
 export const isDeletableQueueIssue = (issue: QueueIssue): boolean =>
   issue.category === 'wrong-round' && issue.deletable === true && !!issue.key?.length

functions/queue-fix.mts

@@ -32,7 +32,7 @@
  *
  * ─── Issue categories (from collectQueueIssuesFromStorage) ───
  *
- * - non-webp: file in queue/ is not .webp (or unparsed name).
+ * - non-webp: file in queue/ is not .webp (fixable via resize), or unrecognized name (deletable only).
  * - missing-variants: primary .webp exists but _medium/_small siblings missing in queue/.
  * - wrong-round: filename round ≠ expected (found=current or current+1, mystery=current+1). Deletable.
  * - duplicate-uploader: same player has files spanning rounds without a normal found+mystery pair.

src/router/index.ts

@@ -1,7 +1,5 @@
 import About from '@/views/About.vue'
-import Admin from '@/views/Admin.vue'
 import Approve from '@/views/Approve.vue'
-import Rejections from '@/views/Rejections.vue'
 import BikeTags from '@/views/BikeTags.vue'
 import Dashboard from '@/views/Dashboard.vue'
 import Delete from '@/views/Delete.vue'
@@ -20,6 +18,8 @@ import Play from '@/views/Play.vue'
 import Player from '@/views/Player.vue'
 import Players from '@/views/Players.vue'
 import Profile from '@/views/Profile.vue'
+import QueueFix from '@/views/QueueFix.vue'
+import Rejections from '@/views/Rejections.vue'
 import Round from '@/views/Round.vue'
 import Worldwide from '@/views/Worldwide.vue'
 import { authGuard } from '@auth0/auth0-vue'
@@ -59,10 +59,10 @@ const protectedRoutes: Array<RouteRecordRaw> = isAuthenticationEnabled()
         component: GameSettings,
       },
       {
-        path: '/admin',
-        name: 'Admin',
+        path: '/queue-fix',
+        name: 'Queue Fix',
         beforeEnter: authGuard,
-        component: Admin,
+        component: QueueFix,
       },
       {
         path: '/delete',

src/views/BikeTags.vue

@@ -17,8 +17,8 @@
 </template>
 
 <script setup name="BikeTagsView">
-import Searchable from '@/components/Searchable.vue'
 import BikeTag from '@/components/BikeTag.vue'
+import Searchable from '@/components/Searchable.vue'
 import { useBikeTagStore } from '@/store/index'
 
 const store = useBikeTagStore()
@@ -59,7 +59,7 @@ const tagSearch = (tags, searchString) => {
 
   const sortedResults = tags
     .filter((tag) => tagToScore.get(tag) > 0)
-    .toSorted((a, b) => tagToScore.get(a) - tagToScore.get(b))
+    .toSorted((a, b) => tagToScore.get(b) - tagToScore.get(a))
   return foundByNumber.concat(sortedResults)
 }
 </script>

src/views/Dashboard.vue

@@ -89,16 +89,26 @@
         Game Settings
       </router-link>
 
-      <router-link v-if="isBikeTagAdmin" to="/admin" class="action-button">
+      <router-link v-if="isBikeTagAdmin" to="/queue-fix" class="action-button">
         <span class="icon">
-          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6z" />
+         <svg
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="currentColor"
+            aria-hidden="true"
+          >
+            <path d="M18 2H7a3 3 0 0 0-3 3v1h2V5a1 1 0 0 1 1-1h11a1 1 0 0 1 1 1v11h2V5a3 3 0 0 0-3-3Z" />
+
+            <path d="M16 5H5a3 3 0 0 0-3 3v1h2V8a1 1 0 0 1 1-1h11a1 1 0 0 1 1 1v11h2V8a3 3 0 0 0-3-3Z" />
+
             <path
-              d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 1 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 1 1-4 0v-.09a1.65 1.65 0 0 0-1-1.51 1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 1 1-2.83-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 1 1 0-4h.09a1.65 1.65 0 0 0 1.51-1 1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 1 1 2.83-2.83l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 1 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 1 1 2.83 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9c.26.604.852.997 1.51 1H21a2 2 0 1 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"
+              fill-rule="evenodd"
+              d="M3 8h11a3 3 0 0 1 3 3v8a3 3 0 0 1-3 3H3a3 3 0 0 1-3-3v-8a3 3 0 0 1 3-3Zm2.5 3a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm-3.5 8 3.5-3.5 2.5 2.5 2-2 5 5H3a1 1 0 0 1-1-1v-1Z"
+              clip-rule="evenodd"
             />
           </svg>
         </span>
-        BikeTag Admin
+        Queue Fix
       </router-link>
     </div>
   </div>

src/views/Player.vue

@@ -151,7 +151,7 @@ const playerTagSearch = (tags, searchString) => {
 
   const sortedResults = tags
     .filter((tag) => tagToScore.get(tag) > 0)
-    .toSorted((a, b) => tagToScore.get(a) - tagToScore.get(b))
+    .toSorted((a, b) => tagToScore.get(b) - tagToScore.get(a))
   return foundByNumber.concat(sortedResults)
 }
 

src/views/Admin.vue src/views/QueueFix.vuesrc/views/Admin.vue renamed to src/views/QueueFix.vue

@@ -4,14 +4,15 @@
     <img class="spinner" src="@/assets/images/SpinningBikeV1.svg" alt="Loading..." />
   </loading>
 
-  <div class="admin-page container">
-    <img class="admin-icon" src="/images/biketag-ambassador.svg" alt="Admin Icon" />
-    <h1>BikeTag Admin</h1>
+  <div class="queue-fix-page container">
+    <img class="queue-fix-icon" src="/images/biketag-ambassador.svg" alt="Queue Fix Icon" />
+    <h1>Queue Fix</h1>
     <p>
       Scan the queue for image conversion problems, missing sized variants, wrong-round entries,
       orphaned found images that never made it to main, and duplicate uploader splits. Use Fix Queue
-      Images to re-run webp conversion and variant generation for fixable issues. Wrong-round files
-      can be deleted individually or in bulk. Orphaned found images can be moved into main/.
+      Images (or Fix image on an issue) to re-run webp conversion and variant generation for fixable
+      issues. Unrecognized and wrong-round files can be deleted. Orphaned found images can be moved
+      into main/.
     </p>
 
     <div class="actions">
@@ -173,6 +174,14 @@
             >
               Move blocked — player mismatch
             </span>
+            <button
+              v-else-if="isFixableIssue(issue)"
+              type="button"
+              class="issue-action issue-action--fix"
+              @click="fixQueue"
+            >
+              Fix image
+            </button>
             <button
               v-if="issue.deletable"
               type="button"
@@ -193,7 +202,7 @@
   </div>
 </template>
 
-<script setup name="AdminView">
+<script setup name="QueueFixView">
 import { useBikeTagStore } from '@/store/index'
 import { getS3ImageSized } from '@/common/methods'
 import { computed, inject, onMounted, ref } from 'vue'
@@ -249,6 +258,13 @@ function filenameRoundFromKey(key) {
   return match ? Number(match[1]) : undefined
 }
 
+function isFixableIssue(issue) {
+  return (
+    (issue.category === 'non-webp' || issue.category === 'missing-variants') &&
+    issue.deletable !== true
+  )
+}
+
 function applyScanResult(result) {
   scanned.value = true
   issues.value = result.issues ?? []
@@ -424,7 +440,7 @@ onMounted(async () => {
 </script>
 
 <style scoped lang="scss">
-.admin-page {
+.queue-fix-page {
   background-color: #fff;
   color: #000;
   padding: 2rem;
@@ -447,7 +463,7 @@ onMounted(async () => {
     margin-bottom: 2rem;
   }
 
-  .admin-icon {
+  .queue-fix-icon {
     width: 72px;
     margin-bottom: 1rem;
   }
@@ -567,6 +583,10 @@ onMounted(async () => {
         background: #e8f5e9;
       }
 
+      &--fix {
+        background: #fff8e1;
+      }
+
       &--blocked {
         display: inline-block;
         margin-top: 0.5rem;