mbkbucket 1.1.1 → 1.1.2

package/index.d.ts

@@ -73,6 +73,14 @@ export function deleteFiles(keys: string[], bucketName?: string): Promise<{
   deletedAt: string;
 }>;
 
+export function deleteFolder(prefix: string, bucketName?: string): Promise<{
+  results?: any[];
+  deletedCount: number;
+  errors?: any[];
+  deletedAt: string;
+  prefix?: string;
+}>;
+
 export function listfiles(
   prefix?: string,
   options?: {
@@ -186,6 +194,14 @@ declare module "mbkbucket/lib/s3" {
     errors: any[];
     deletedAt: string;
   }>;
+
+  export function deleteFolder(prefix: string, bucketName?: string): Promise<{
+    results?: any[];
+    deletedCount: number;
+    errors?: any[];
+    deletedAt: string;
+    prefix?: string;
+  }>;
   export function listfiles(
     prefix?: string,
     options?: {

package/index.js

@@ -44,6 +44,7 @@ server.engine("handlebars", engine({
     path.join(__dirname, "views"),
     path.join(__dirname, "views/partial"),
     path.join(__dirname, "node_modules/mbkauthe/views"),
+    path.join(__dirname, "../mbkauthe/views")
   ],
   cache: process.env.NODE_ENV === "production",
   helpers: {
@@ -132,13 +133,14 @@ server.set("view engine", "handlebars");
 server.set("views", [
   path.join(__dirname, "views"),
   path.join(__dirname, "node_modules/mbkauthe/views"),
+  path.join(__dirname, "../mbkauthe/views")
 ]);
 
 server.use(mbkauthe);
 server.use(generalLimiter);
 server.use(bucket);
 
-if (process.env.mbkbucket_testl === "dev") {
+if (process.env.mbkbucket_test === "dev") {
 
   console.log("[mbkbucket] Dev mode is enabled. Starting server in dev mode.");
 

package/lib/bucket.js

@@ -1,6 +1,6 @@
 import express from "express";
 import { validateSessionAndRole, renderPage, mbkautheVar } from "mbkauthe";
-import { listfiles, uploadFile, deleteFile, deleteFiles, downloadFile, getFileMetadata, fileExists, ensureKeyHasAppPrefix, ensurePrefix, getAppName, getBucketConfig } from "./s3.js"
+import { listfiles, uploadFile, deleteFile, deleteFiles, deleteFolder, downloadFile, getFileMetadata, fileExists, ensureKeyHasAppPrefix, ensurePrefix, getAppName, getBucketConfig } from "./s3.js";
 import multer from "multer";
 import path from "path";
 import fs from 'fs';
@@ -225,7 +225,7 @@ router.post('/mbkbucket/create-folder', validateSessionAndRole('SuperAdmin'), as
 
 router.post('/mbkbucket/delete', validateSessionAndRole('SuperAdmin'), async (req, res) => {
   try {
-    const { key, keys } = req.body;
+    const { key, keys, folder } = req.body;
 
     if (keys && Array.isArray(keys) && keys.length) {
       // Bulk delete
@@ -238,6 +238,12 @@ router.post('/mbkbucket/delete', validateSessionAndRole('SuperAdmin'), async (re
     let keyToDelete;
     try { keyToDelete = ensureKeyHasAppPrefix(key); } catch (e) { return res.status(400).json({ success: false, error: e.message }); }
 
+    // If caller indicates it's a folder (or key ends with '/'), delete all objects under the prefix
+    if (folder === true || String(keyToDelete).endsWith('/')) {
+      await deleteFolder(keyToDelete);
+      return res.json({ success: true, message: 'Folder deleted successfully' });
+    }
+
     await deleteFile(keyToDelete);
     res.json({ success: true, message: 'File deleted successfully' });
   } catch (error) {

package/lib/s3.js

@@ -359,6 +359,69 @@ export async function deleteFiles(keys, bucketName = 'r2') {
   }
 }
 
+// List files with enhanced pagination and filtering
+/**
+ * Delete all objects under a folder prefix (recursive).
+ * Accepts either a folder key (may include trailing slash) or a relative prefix.
+ * Normalizes the prefix to include the configured APP_NAME and ensures trailing slash.
+ */
+export async function deleteFolder(prefix, bucketName = 'r2') {
+  try {
+    if (!prefix) {
+      throw new Error('Prefix is required');
+    }
+
+    const cleaned = String(prefix).replace(/^\/+/, '').replace(/\/+$/g, '');
+    const effectivePrefix = ensurePrefix(cleaned) + '/';
+
+    const client = getBucketClient(bucketName);
+    const config = getBucketConfig(bucketName);
+    const bucket = config.BUCKET_NAME;
+
+    const keysToDelete = [];
+    let continuationToken = null;
+
+    // Paginate through all objects under the prefix
+    do {
+      const listCmd = new ListObjectsV2Command({
+        Bucket: bucket,
+        Prefix: effectivePrefix,
+        ContinuationToken: continuationToken,
+        MaxKeys: 1000
+      });
+      const resp = await client.send(listCmd);
+      const contents = resp.Contents || [];
+      for (const obj of contents) {
+        if (obj.Key) keysToDelete.push(obj.Key);
+      }
+      continuationToken = resp.IsTruncated ? resp.NextContinuationToken : null;
+    } while (continuationToken);
+
+    if (!keysToDelete.length) {
+      // Nothing found under this prefix; attempt to remove a zero-byte folder marker if present
+      const folderMarkerKey = effectivePrefix;
+      const exists = await fileExists(folderMarkerKey, bucketName);
+      if (exists) {
+        await deleteFile(folderMarkerKey, bucketName);
+        return { deletedCount: 1, deletedAt: new Date().toISOString(), prefix: effectivePrefix };
+      }
+      return { deletedCount: 0, deletedAt: new Date().toISOString(), prefix: effectivePrefix };
+    }
+
+    // Use the existing deleteFiles helper which handles batching and error aggregation
+    const result = await deleteFiles(keysToDelete, bucketName);
+
+    return {
+      ...result,
+      prefix: effectivePrefix,
+      deletedAt: new Date().toISOString()
+    };
+  } catch (error) {
+    console.error('Delete folder failed:', error);
+    throw new Error(`Delete folder failed: ${error.message}`);
+  }
+}
+
 // List files with enhanced pagination and filtering
 export async function listfiles(prefix = '', options = {}) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkbucket",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "S3 Bucket manager for mbktech.org apps",
   "author": "Muhammad Bin Khalid",
   "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",

package/views/bucketadmincontent.handlebars

@@ -1223,8 +1223,7 @@
 
     /* Metadata row: folder / size / modified shown as compact badges */
     .file-row td:nth-child(3),
-    .file-row td:nth-child(4),
-    .file-row td:nth-child(5) {
+    .file-row td:nth-child(4) {
       padding: 0rem 1rem !important;
       display: flex;
       align-items: center;
@@ -1234,20 +1233,13 @@
     }
 
     .file-row td:nth-child(3)::before {
-      content: "Folder:";
-      font-weight: 600;
-      color: var(--dark-color-ml);
-      margin-right: 0.35rem;
-    }
-
-    .file-row td:nth-child(4)::before {
       content: "Size:";
       font-weight: 600;
       color: var(--dark-color-ml);
       margin-right: 0.35rem;
     }
 
-    .file-row td:nth-child(5)::before {
+    .file-row td:nth-child(4)::before {
       content: "Modified:";
       font-weight: 600;
       color: var(--dark-color-ml);
@@ -1597,9 +1589,10 @@
         <form id="deleteForm" method="post" action="/mbkbucket/delete" style="display: inline;">
           <input type="hidden" name="key" id="deleteKey">
           <input type="hidden" name="prefix" value="{{prefix}}">
-          <button type="submit" class="btn btn-danger">
+          <input type="hidden" name="folder" id="deleteIsFolder" value="">
+          <button type="submit" class="btn btn-danger" id="deleteConfirmButton">
             <i class="fas fa-trash"></i>
-            Delete File
+            <span id="deleteConfirmLabel">Delete File</span>
           </button>
         </form>
       </div>
@@ -1879,7 +1872,7 @@
           <td style="text-align:center;">
             <!-- no selection for folders -->
           </td>
-          <td style="padding-left: 1.5rem;" colspan="2">
+          <td style="padding-left: 1.5rem;">
             <div style="display: flex; align-items: center;">
               <div class="file-icon">
                 <i class="fas fa-folder"></i>
@@ -1892,13 +1885,17 @@
             </div>
           </td>
           <td>
-            <span style="color: var(--gray-color-ml); font-style: italic;">Folder</span>
+            <span style="color: var(--gray-color-ml);">\u2014</span>
           </td>
-          <td>
+          <td style="text-align: center;">
             <span style="color: var(--gray-color-ml);">\u2014</span>
           </td>
           <td style="text-align: center;">
-            <span style="color: var(--gray-color-ml); font-style: italic;">Click to open</span>
+            <div class="btn-group" role="group">
+              <button type="button" class="btn btn-danger btn-sm delete-btn" data-key="${folderPath}/" data-is-folder="true" title="Delete folder">
+                <i class="fas fa-trash"></i>
+              </button>
+            </div>
           </td>
         </tr>
       `;
@@ -1922,9 +1919,6 @@
               </div>
             </div>
           </td>
-          <td>
-            <span class="folder-path" data-full-path="${file.Key}"></span>
-          </td>
           <td>
             ${file.Size ? `<span class="file-size">${formatFileSize(file.Size)}</span>` : '<span style="color: var(--gray-color-ml);">N/A</span>'}
           </td>
@@ -1994,12 +1988,9 @@
               <th style="padding-left: 1.5rem;">
                 <i class="fas fa-file-alt"></i> Name
               </th>
-              <th>
-                <i class="fas fa-folder"></i> Folder
-              </th>
               <th>
                 <i class="fas fa-weight"></i> Size
-              </th>
+              </th> 
               <th>
                 <i class="fas fa-calendar"></i> Last Modified
               </th>
@@ -2085,9 +2076,26 @@
     document.getElementById('paginationList').innerHTML = paginationHTML;
   }
 
-  function confirmDelete(key) {
+  function confirmDelete(key, isFolder = false) {
     document.getElementById('deleteKey').value = key;
+    document.getElementById('deleteIsFolder').value = isFolder ? 'true' : '';
     document.getElementById('deleteFileName').textContent = key;
+
+    // Update modal message and button label for folders
+    const modalHeading = document.querySelector('#deleteModal .modal-body h6');
+    const smallText = document.querySelector('#deleteModal .modal-body small');
+    const confirmLabel = document.getElementById('deleteConfirmLabel');
+
+    if (isFolder) {
+      if (modalHeading) modalHeading.textContent = 'Are you sure you want to delete this folder and all its contents?';
+      if (smallText) smallText.textContent = 'This action will remove the folder and all files within it and cannot be undone.';
+      if (confirmLabel) confirmLabel.textContent = 'Delete Folder';
+    } else {
+      if (modalHeading) modalHeading.textContent = 'Are you sure you want to delete this file?';
+      if (smallText) smallText.textContent = 'This action cannot be undone.';
+      if (confirmLabel) confirmLabel.textContent = 'Delete File';
+    }
+
     document.getElementById('deleteModal').classList.add('show');
     document.getElementById('deleteModal').style.display = 'flex';
   }
@@ -2102,6 +2110,7 @@
     e.preventDefault();
 
     const key = document.getElementById('deleteKey').value;
+    const isFolder = document.getElementById('deleteIsFolder').value === 'true';
 
     try {
       const response = await fetch('/mbkbucket/delete', {
@@ -2109,7 +2118,7 @@
         headers: {
           'Content-Type': 'application/json'
         },
-        body: JSON.stringify({ key })
+        body: JSON.stringify({ key, folder: isFolder })
       });
 
       const data = await response.json();
@@ -2382,21 +2391,14 @@
 
       const dbtn = e.target.closest('.delete-btn');
       if (dbtn) {
+        e.stopPropagation();
         const key = dbtn.dataset.key;
-        if (key) confirmDelete(key);
+        const isFolder = dbtn.dataset.isFolder === 'true';
+        if (key) confirmDelete(key, isFolder);
         return;
       }
 
-      // Handle folder path clicks
-      const folderPath = e.target.closest('.folder-path.clickable');
-      if (folderPath) {
-        const folder = folderPath.getAttribute('data-folder');
-        if (folder) {
-          // Load files with new prefix
-          loadFiles(1, folder);
-        }
-        return;
-      }
+
     });
   });
 
@@ -2622,27 +2624,7 @@
         fileNameElement.textContent = truncatedName;
         fileNameElement.title = filename; // Full name on hover
 
-        if (folderPathElement) {
-          const displayFolder = folder || '/';
-          folderPathElement.textContent = displayFolder;
-          folderPathElement.title = folder ? `Click to filter by folder: ${folder}` : 'Root folder'; // Full path on hover
-
-          // Make folder clickable if not root and add keyboard accessibility
-          if (folder) {
-            folderPathElement.classList.add('clickable');
-            folderPathElement.setAttribute('data-folder', folder);
-            folderPathElement.setAttribute('role', 'button');
-            folderPathElement.setAttribute('tabindex', '0');
-            // allow Enter/Space to trigger folder navigation
-            folderPathElement.onkeydown = function (e) { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); loadFiles(1, folder); } };
-          } else {
-            folderPathElement.classList.remove('clickable');
-            folderPathElement.removeAttribute('data-folder');
-            folderPathElement.removeAttribute('role');
-            folderPathElement.removeAttribute('tabindex');
-            folderPathElement.onkeydown = null;
-          }
-        }
+
 
         const iconClass = getFileIcon(filename);
         const typeCategory = getFileTypeCategory(filename);