refactor: remove UUID resolver

johannschopplich · Feb 3, 2025 · 8e1ff82 · 8e1ff82
1 parent 25fd513
commit 8e1ff82
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 42 deletions.
diff --git a/components/Kirby/UuidResolver.ts b/components/Kirby/UuidResolver.ts
diff --git a/pages/[...slug].vue b/pages/[...slug].vue
@@ -3,14 +3,11 @@
 
 import { getPageQuery } from '~/queries'
 
-const { locale } = useI18n()
+const { locale, localeCodes } = useI18n()
 const route = useRoute()
 
-// Use current slug or fall back to the homepage
-const pageUri = getNonLocalizedSlug(
-  route.params.slug,
-  useKirbyStaticData().languages,
-)
+// Extract the non-localized slug
+const pageUri = getNonLocalizedSlug(route.params.slug, localeCodes.value)
 
 const { data: pageData, error: pageError } = await useKql(
   getPageQuery(pageUri || 'home'),

diff --git a/queries/about.ts b/queries/about.ts
@@ -34,12 +34,6 @@ export const aboutQuery: KirbyQuerySchema = {
     email: true,
     phone: true,
     social: 'page.social.toStructure',
-    // Retrieve all images from the page to resolve a UUID from
-    // e.g. a structure field to a file object
-    // images: {
-    //   query: 'page.files.template("image")',
-    //   select: ['uuid', 'srcset', 'width', 'height', 'alt'],
-    // },
     ...sharedQuerySelects,
   },
 }
diff --git a/utils/locale.ts b/utils/locale.ts
@@ -16,7 +16,7 @@ export function getNonLocalizedSlug(
   if (Array.isArray(param)) {
     param = param.filter(Boolean)
 
-    // If the first item is a locale, remove it
+    // Remove locale prefix if present
     if (param.length > 0 && locales.includes(param[0])) {
       param = param.slice(1)
     }