Support root asset folder

Part of #230
sveltia · Nov 22, 2024 · 03431d3 · 03431d3
1 parent 69604cc
commit 03431d3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/lib/components/assets/list/primary-sidebar.svelte b/src/lib/components/assets/list/primary-sidebar.svelte
@@ -30,7 +30,7 @@
       <!-- Can’t upload assets if collection assets are saved at entry-relative paths -->
       {@const uploadDisabled = entryRelative}
       {@const selected =
-        (!internalPath && !$selectedAssetFolder) ||
+        (internalPath === undefined && !$selectedAssetFolder) ||
         internalPath === $selectedAssetFolder?.internalPath}
       <Option
         {selected}
@@ -45,7 +45,7 @@
             return;
           }
 
-          if (!internalPath || selected) {
+          if (internalPath === undefined || selected) {
             /** @type {DataTransfer} */ (event.dataTransfer).dropEffect = 'none';
           } else {
             /** @type {DataTransfer} */ (event.dataTransfer).dropEffect = 'move';

diff --git a/src/lib/services/assets/index.js b/src/lib/services/assets/index.js
@@ -262,9 +262,11 @@ export const getAssetFoldersByPath = (path, { matchSubFolders = false } = {}) =>
       // Compare that the enclosing directory is exactly the same as the internal path, and ignore
       // any subdirectories, unless the `matchSubFolders` option is specified. The internal path can
       // contain template tags like `{{slug}}` so that we have to take it into account.
-      return !!getPathInfo(path).dirname?.match(
-        `^${internalPath.replace(/{{.+?}}/g, '.+?')}${matchSubFolders ? '\\b' : '$'}`,
+      const regex = new RegExp(
+        `^${internalPath.replace(/{{.+?}}/g, '.+?')}${internalPath && matchSubFolders ? '\\b' : '$'}`,
       );
+
+      return !!(getPathInfo(path).dirname ?? '').match(regex);
     })
     .sort((a, b) => b.internalPath?.localeCompare(a.internalPath ?? '') ?? 0);
 };
@@ -329,7 +331,11 @@ export const getAssetByPath = (savedPath, { entry, collection } = {}) => {
       return getAsset(_collection);
     });
 
-    return assets.flat(1).filter(Boolean)[0] ?? undefined;
+    return (
+      assets.flat(1).filter(Boolean)[0] ??
+      // Fall back to exact match at the root folder
+      get(allAssets).find((asset) => asset.path === savedPath)
+    );
   }
 
   const exactMatch = get(allAssets).find((asset) => asset.path === stripSlashes(savedPath));
@@ -350,7 +356,7 @@ export const getAssetByPath = (savedPath, { entry, collection } = {}) => {
       publicPath.match(`^${folder.publicPath.replace(/{{.+?}}/g, '.+?')}\\b`),
     ) ?? {};
 
-  if (!internalPath) {
+  if (internalPath === undefined) {
     return undefined;
   }
 

diff --git a/src/lib/services/config.js b/src/lib/services/config.js
@@ -117,7 +117,7 @@ const validate = (config) => {
     throw new Error(get(_)('config.error.oauth_no_app_id'));
   }
 
-  if (!config.media_folder) {
+  if (typeof config.media_folder !== 'string') {
     throw new Error(get(_)('config.error.no_media_folder'));
   }
 };

diff --git a/src/lib/services/contents/draft/save.js b/src/lib/services/contents/draft/save.js
@@ -603,18 +603,22 @@ export const saveEntry = async ({ skipCI = undefined } = {}) => {
             const file = files[locale][keyPath];
             const sha = await getHash(file);
             const dupFile = savingAssets.find((f) => f.sha === sha);
+            const useSubFolder = !!publicAssetFolder && publicAssetFolder !== '/';
 
             // Check if the file has already been added for other field or locale
             if (dupFile) {
-              content[keyPath] = publicAssetFolder
+              content[keyPath] = useSubFolder
                 ? `${publicAssetFolder}/${dupFile.name}`
                 : dupFile.name;
 
               continue;
             }
 
             const assetName = renameIfNeeded(file.name.normalize(), assetNamesInSameFolder);
-            const assetPath = `${internalAssetFolder}/${assetName}`;
+
+            const assetPath = internalAssetFolder
+              ? `${internalAssetFolder}/${assetName}`
+              : assetName;
 
             assetNamesInSameFolder.push(assetName);
             changes.push({ action: 'create', path: assetPath, data: file });
@@ -629,7 +633,7 @@ export const saveEntry = async ({ skipCI = undefined } = {}) => {
               kind: getAssetKind(assetName),
             });
 
-            content[keyPath] = publicAssetFolder ? `${publicAssetFolder}/${assetName}` : assetName;
+            content[keyPath] = useSubFolder ? `${publicAssetFolder}/${assetName}` : assetName;
           }
         }