Lowercase extension when uploading files and fix searching for images…

… with uppercase extensions (#386)
alineacms · Jun 19, 2024 · 7750a8b · 7750a8b
1 parent 6c9265f
commit 7750a8b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/dashboard/hook/UseUploads.ts b/src/dashboard/hook/UseUploads.ts
@@ -185,8 +185,9 @@ export function useUploads(onSelect?: (entry: EntryRow) => void) {
       })
     )
 
-    const extension = extname(upload.file.name)
-    const path = slugify(basename(upload.file.name, extension))
+    const extensionOriginal = extname(upload.file.name)
+    const extension = extensionOriginal.toLowerCase()
+    const path = slugify(basename(upload.file.name, extensionOriginal))
     const prev = await graph.preferPublished.maybeGet(Entry({parent: parentId}))
 
     const entryLocation = {
@@ -211,7 +212,7 @@ export function useUploads(onSelect?: (entry: EntryRow) => void) {
         : location
 
     const hash = await createFileHash(new Uint8Array(buffer))
-    const title = basename(upload.file.name, extension)
+    const title = basename(upload.file.name, extensionOriginal)
     const entry = await createEntryRow<Media.File>(config, {
       ...entryLocation,
       parent: parent?.entryId ?? null,

diff --git a/src/field/link/ImageLink.ts b/src/field/link/ImageLink.ts
@@ -51,9 +51,12 @@ export interface ImageField<Fields = undefined>
     ImageLink<Type.Infer<Fields>>
   > {}
 
-const imageCondition = Entry.type
-  .is('MediaFile')
-  .and(MediaFile.extension.isIn(imageExtensions))
+const imageCondition = Entry.type.is('MediaFile').and(
+  MediaFile.extension.isIn([
+    ...imageExtensions,
+    ...imageExtensions.map(e => e.toUpperCase()) //Fix for historic files with case-insensitive extensions
+  ])
+)
 
 function imagePicker<Fields>(
   multiple: boolean,