mbkbucket 2.0.0 → 2.1.1

package/public/bucketadmin.js

@@ -12,13 +12,16 @@ let currentApiPrefix = '';
 const bucketAppName = document.getElementById('bucketAppData')?.dataset.appName || '';
 const selectedBucket = new URLSearchParams(window.location.search).get('bucket') || '';
 let activeBucket = selectedBucket;
-const isRootApp = String(bucketAppName || '').toLowerCase() === 'portal';
-const rootLabel = isRootApp ? 'root' : (bucketAppName || 'app');
+const app = String(bucketAppName || '').toLowerCase();
+const isRootApp = app === 'portal' || app === 'mbkbucket';const rootLabel = isRootApp ? 'root' : (bucketAppName || 'app');
 let currentQuickFilter = 'all';
 let virtualRenderLimit = 0;
 const VIRTUAL_RENDER_THRESHOLD = 500;
 const VIRTUAL_RENDER_BATCH = 250;
 let lastRenderContext = null;
+const MEDIA_EXTENSIONS = new Set(['jpg', 'jpeg', 'png', 'gif', 'webp', 'svg', 'bmp', 'ico', 'mp4', 'webm', 'ogg', 'avi', 'mov', 'mp3', 'wav', 'flac', 'aac', 'm4a']);
+const DOC_EXTENSIONS = new Set(['pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'md', 'csv']);
+const CODE_EXTENSIONS = new Set(['js', 'ts', 'html', 'htm', 'css', 'php', 'py', 'java', 'cpp', 'c', 'h', 'cs', 'rb', 'go', 'rs', 'sql', 'sh', 'bat', 'ps1', 'yaml', 'yml', 'toml', 'ini', 'conf', 'json', 'xml', 'log']);
 
 function withBucketUrl(url) {
     if (!activeBucket) return url;
@@ -72,6 +75,20 @@ function escapeAttr(value = '') {
     return escapeHtml(value);
 }
 
+function getBaseName(path = '') {
+    const value = String(path || '');
+    const lastSlashIndex = value.lastIndexOf('/');
+    return lastSlashIndex === -1 ? value : value.substring(lastSlashIndex + 1);
+}
+
+function dataAttr(name, value = '') {
+    return `data-${name}="${escapeAttr(value)}"`;
+}
+
+function mutedDash() {
+    return '<span class="muted-cell-value">&mdash;</span>';
+}
+
 function syncStateUrl(page = currentPage, prefix = currentPrefix, search = currentSearch) {
     try {
         const parts = [];
@@ -100,14 +117,10 @@ function getActiveBucketLabel() {
 }
 
 function matchesQuickFilter(fileName = '', filter = currentQuickFilter) {
-    const ext = String(fileName).split('.').pop().toLowerCase();
-    const media = new Set(['jpg', 'jpeg', 'png', 'gif', 'webp', 'svg', 'bmp', 'ico', 'mp4', 'webm', 'ogg', 'avi', 'mov', 'mp3', 'wav', 'flac', 'aac', 'm4a']);
-    const docs = new Set(['pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'md', 'csv']);
-    const code = new Set(['js', 'ts', 'html', 'htm', 'css', 'php', 'py', 'java', 'cpp', 'c', 'h', 'cs', 'rb', 'go', 'rs', 'sql', 'sh', 'bat', 'ps1', 'yaml', 'yml', 'toml', 'ini', 'conf', 'json', 'xml', 'log']);
-
-    if (filter === 'media') return media.has(ext);
-    if (filter === 'docs') return docs.has(ext);
-    if (filter === 'code') return code.has(ext);
+    const ext = getBaseName(fileName).split('.').pop().toLowerCase();
+    if (filter === 'media') return MEDIA_EXTENSIONS.has(ext);
+    if (filter === 'docs') return DOC_EXTENSIONS.has(ext);
+    if (filter === 'code') return CODE_EXTENSIONS.has(ext);
     return true;
 }
 
@@ -155,9 +168,9 @@ function showAlert(message, type = 'success') {
     `;
 
     toast.innerHTML = `
-        <i class="fas ${isSuccess ? 'fa-check-circle' : 'fa-exclamation-circle'}" style="font-size: 1.25rem;"></i>
-        <div style="flex: 1;">${message}</div>
-        <button onclick="this.parentElement.remove()" class="toast-close-btn">&times;</button>
+        <i class="fas ${isSuccess ? 'fa-check-circle' : 'fa-exclamation-circle'} toast-icon"></i>
+        <div class="toast-message">${message}</div>
+        <button type="button" data-action="close-toast" class="toast-close-btn">&times;</button>
     `;
 
     container.appendChild(toast);
@@ -259,7 +272,7 @@ async function loadFiles(page = 1, prefix = '', search = '', sort = currentSort,
             <i class="fas fa-folder-open"></i>
             <h4>No files found</h4>
                         <p>Bucket <strong>${escapeHtml(getActiveBucketLabel())}</strong> is empty. Upload some files to get started!</p>
-            <button class="btn btn-lg" onclick="document.getElementById('fileInput').click()">
+            <button class="btn btn-lg" data-action="upload-files">
               <i class="fas fa-plus"></i> Upload Your First File
             </button>
           </div>
@@ -284,13 +297,16 @@ async function loadFiles(page = 1, prefix = '', search = '', sort = currentSort,
             paginationContainer.style.display = 'block';
         }
     } catch (error) {
+        console.error("app: ", app);
+        console.error("isRootApp: ", isRootApp, "rootLabel: ", rootLabel);
+        console.error("bucketAppName : ", bucketAppName);
         console.error('Error loading files:', error);
         container.innerHTML = `
         <div class="empty-state">
-          <i class="fas fa-exclamation-triangle" style="color: var(--danger-color-ml);"></i>
+          <i class="fas fa-exclamation-triangle empty-state-error-icon"></i>
           <h4>Error Loading Files</h4>
                     <p>Bucket <strong>${escapeHtml(getActiveBucketLabel())}</strong>: ${escapeHtml(error.message)}</p>
-          <button class="btn btn-primary" onclick="loadFiles(${page}, '${prefix}')">
+          <button class="btn btn-primary" data-action="retry-load" ${dataAttr('retry-page', page)} ${dataAttr('retry-prefix', prefix)}>
             <i class="fas fa-redo"></i> Retry
           </button>
         </div>
@@ -319,8 +335,8 @@ function toggleSort(field) {
                 valA = new Date(a.LastModified || 0).getTime();
                 valB = new Date(b.LastModified || 0).getTime();
             } else {
-                valA = (a.Key || '').split('/').pop().toLowerCase();
-                valB = (b.Key || '').split('/').pop().toLowerCase();
+                valA = getBaseName(a.Key).toLowerCase();
+                valB = getBaseName(b.Key).toLowerCase();
             }
 
             if (valA < valB) return currentOrder === 'asc' ? -1 : 1;
@@ -360,7 +376,6 @@ function setQuickFilter(filter = 'all') {
 // Extract unique folders at current level
 function extractFoldersAtCurrentLevel(files, prefix) {
     const folderSet = new Set();
-    const prefixDepth = prefix ? prefix.split('/').filter(p => p).length : 0;
 
     files.forEach(file => {
         const key = file.Key;
@@ -447,6 +462,9 @@ function extractMatchingFolders(files, search) {
 // Render files table
 function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
     lastRenderContext = { files, folders, prefix, apiPrefix };
+    const normalizedPrefix = String(prefix || '').replace(/\/+$/, '');
+    const basePrefix = apiPrefix || prefix;
+    const relativeBaseOffset = basePrefix ? basePrefix.length + (basePrefix.endsWith('/') ? 0 : 1) : 0;
 
     // Determine which files/folders to show based on view mode
     let displayFiles = [];
@@ -466,7 +484,7 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
                 // Skip folder marker objects (keys ending with /)
                 if (f.Key.endsWith('/')) return false;
                 
-                const fileName = f.Key.split('/').pop();
+                const fileName = getBaseName(f.Key);
                 return fileName.toLowerCase().includes(searchLower);
             });
 
@@ -485,8 +503,7 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
             // Skip folder marker objects (keys ending with /)
             if (file.Key.endsWith('/')) return false;
             
-            const basePrefix = apiPrefix || prefix;
-            const relativePath = basePrefix ? file.Key.substring(basePrefix.length + (basePrefix.endsWith('/') ? 0 : 1)) : file.Key;
+            const relativePath = basePrefix ? file.Key.substring(relativeBaseOffset) : file.Key;
             // File is at current level if it has no '/' in relative path
             return !relativePath.includes('/');
         });
@@ -495,7 +512,7 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
 
     // Apply quick file-type filter after mode/path filtering.
     displayFiles = displayFiles.filter((f) => {
-        const name = String(f?.Key || '').split('/').pop();
+        const name = getBaseName(f?.Key);
         return matchesQuickFilter(name, currentQuickFilter);
     });
 
@@ -505,13 +522,15 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
     // (In flat mode, the prefix acts as a base filter, but we see recursive files under it)
     if (prefix) {
         const parts = prefix.split('/').filter(p => p);
-        let breadcrumbHTML = `
+        const safeRootLabel = escapeHtml(rootLabel);
+        const safeRootTitle = escapeAttr(rootLabel);
+        const breadcrumbParts = [`
         <div class="breadcrumb-nav">
           <div class="breadcrumb-item">
             <i class="fas fa-home"></i>
-            <span class="breadcrumb-link" onclick="loadFiles(1, '')" title="Go to ${rootLabel}">${rootLabel}</span>
+            <button type="button" class="breadcrumb-link" ${dataAttr('nav-prefix', '')} title="Go to ${safeRootTitle}">${safeRootLabel}</button>
           </div>
-      `;
+      `];
 
         let currentPath = '';
         parts.forEach((part, index) => {
@@ -519,51 +538,57 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
             const isLast = index === parts.length - 1;
 
             if (isLast) {
-                breadcrumbHTML += `
+                const safePart = escapeHtml(part);
+                breadcrumbParts.push(`
             <span class="breadcrumb-separator"><i class="fas fa-chevron-right"></i></span>
             <div class="breadcrumb-item">
-              <span class="breadcrumb-current">${part}</span>
+              <span class="breadcrumb-current">${safePart}</span>
             </div>
-          `;
+          `);
             } else {
                 const pathCopy = currentPath;
-                breadcrumbHTML += `
+                const safePart = escapeHtml(part);
+                const safePathTitle = escapeAttr(pathCopy);
+                breadcrumbParts.push(`
             <span class="breadcrumb-separator"><i class="fas fa-chevron-right"></i></span>
             <div class="breadcrumb-item">
-              <span class="breadcrumb-link" onclick="loadFiles(1, '${pathCopy}')" title="Go to ${pathCopy}">${part}</span>
+              <button type="button" class="breadcrumb-link" ${dataAttr('nav-prefix', pathCopy)} title="Go to ${safePathTitle}">${safePart}</button>
             </div>
-          `;
+          `);
             }
         });
 
-        breadcrumbHTML += `</div>`;
-        breadcrumb = breadcrumbHTML;
+        breadcrumbParts.push(`</div>`);
+        breadcrumb = breadcrumbParts.join('');
     }
 
     // Generate folder rows (only used in folder mode)
         const folderRows = displayFolders.map(folderPath => {
         // Handle folder paths which typically end in a slash (e.g., "folder/subfolder/")
                 const rawFolderPath = String(folderPath || '');
-                const cleanPath = rawFolderPath.replace(/\/+$/, ''); 
-                const folderKeyForDelete = `${cleanPath}/`;
-        const folderName = cleanPath.split('/').pop();
+                const cleanPath = rawFolderPath.replace(/\/+$/, '');
+                const folderPathForAction = normalizedPrefix && cleanPath && !cleanPath.startsWith(`${normalizedPrefix}/`)
+                    ? `${normalizedPrefix}/${cleanPath}`
+                    : cleanPath;
+                const folderKeyForDelete = `${folderPathForAction}/`;
+        const folderName = getBaseName(cleanPath);
                 const safeFolderName = escapeHtml(folderName);
-                const safeFolderPathAttr = escapeAttr(rawFolderPath);
+                const safeFolderPathAttr = escapeAttr(`${folderPathForAction}/`);
                 const safeFolderDeleteKeyAttr = escapeAttr(folderKeyForDelete);
         
         return `
                 <tr class="folder-row" data-folder-path="${safeFolderPathAttr}" title="Open folder: ${safeFolderName}">
-          <td style="text-align:center;">
+          <td class="table-cell-center">
             <!-- no selection for folders -->
           </td>
-          <td style="padding-left: 1.5rem;">
-            <div style="display: flex; align-items: center;">
+          <td class="file-name-cell">
+            <div class="file-row-main">
               <div class="file-icon">
                 <i class="fas fa-folder"></i>
               </div>
               <div class="file-info">
-                <div class="file-name" style="font-weight: 700;">
-                                    <i class="fas fa-folder" style="margin-right: 0.5rem; color: #f59e0b;"></i>${safeFolderName}/
+                <div class="file-name folder-name">
+                                    <i class="fas fa-folder folder-leading-icon"></i>${safeFolderName}/
                 </div>
               </div>              
                             <button type="button" class="btn btn-danger btn-sm delete-btn dtm" data-key="${safeFolderDeleteKeyAttr}" data-is-folder="true" title="Delete folder">
@@ -572,12 +597,12 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
             </div>
           </td>
           <td>
-            <span style="color: var(--gray-color-ml);">\u2014</span>
+            ${mutedDash()}
           </td>
-          <td style="text-align: center;">
-            <span style="color: var(--gray-color-ml);">\u2014</span>
+          <td class="table-cell-center">
+            ${mutedDash()}
           </td>
-          <td style="text-align: center;">
+          <td class="table-cell-center">
             <div class="btn-group" role="group">
                             <button type="button" class="btn btn-danger btn-sm delete-btn" data-key="${safeFolderDeleteKeyAttr}" data-is-folder="true" title="Delete folder">
                 <i class="fas fa-trash"></i>
@@ -620,21 +645,23 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
                 const safeFilename = escapeHtml(filename);
                 const safeTruncatedName = escapeHtml(truncatedName);
                 const safeFolderPath = escapeHtml(folderPath);
+                const viewButtonClass = isFileViewable ? 'btn btn-primary btn-sm view-btn' : 'btn btn-primary btn-sm view-btn is-disabled';
+                const viewButtonDisabled = isFileViewable ? '' : 'disabled';
 
         // If in flat mode, we might want to show the folder path more prominently
         const pathDisplay = (currentViewMode === 'flat' && folderPath && folderPath !== prefix + (prefix ? '/' : ''))
             ? `<div class="file-path-display">
-                         <i class="fas fa-folder" style="margin-right:4px; opacity:0.5;"></i> ${safeFolderPath}
+                         <i class="fas fa-folder path-display-icon"></i> ${safeFolderPath}
            </div>`
             : '';
 
         return `
         <tr class="file-row">
-          <td style="text-align:center;">
+          <td class="table-cell-center">
                         <input type="checkbox" class="selectFileCheckbox" data-key="${safeKeyAttr}" aria-label="Select ${safeKeyAttr}" />
           </td>
-          <td style="padding-left: 1.5rem;">
-            <div style="display: flex; align-items: center;">
+          <td class="file-name-cell">
+            <div class="file-row-main">
               <div class="file-icon ${typeCategory}">
                 <i class="${iconClass}"></i>
               </div>
@@ -645,18 +672,18 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
             </div>
           </td>
           <td>
-            ${file.Size ? `<span class="file-size">${formatFileSize(file.Size)}</span>` : '<span style="color: var(--gray-color-ml);">N/A</span>'}
+            ${file.Size ? `<span class="file-size">${formatFileSize(file.Size)}</span>` : '<span class="muted-cell-value">N/A</span>'}
           </td>
           <td>
-            ${file.LastModified ? `<span style="color: var(--gray-color-ml);">${formatDate(file.LastModified)}</span>` : '<span style="color: var(--gray-color-ml);">N/A</span>'}
+            ${file.LastModified ? `<span class="muted-cell-value">${formatDate(file.LastModified)}</span>` : '<span class="muted-cell-value">N/A</span>'}
           </td>
-          <td style="text-align: center;">
+          <td class="table-cell-center">
             <div class="btn-group" role="group">
-                            <button type="button" class="btn btn-primary btn-sm view-btn" data-key="${safeKeyAttr}" data-filename="${safeKeyAttr}"
-                data-key-enc="${encodedKey}" title="${isFileViewable ? 'View file in browser' : 'File type not supported for viewing'}" ${!isFileViewable ? 'disabled style="opacity:0.5"' : ''}>
+                            <button type="button" class="${viewButtonClass}" data-key="${safeKeyAttr}" data-filename="${safeKeyAttr}"
+                data-key-enc="${encodedKey}" title="${isFileViewable ? 'View file in browser' : 'File type not supported for viewing'}" ${viewButtonDisabled}>
                 <i class="fas fa-eye"></i>
               </button>
-              <button type="button" class="btn btn-info btn-sm copy-btn" data-key-enc="${encodedKey}" title="Copy Link" style="color:white;">
+              <button type="button" class="btn btn-info btn-sm copy-btn" data-key-enc="${encodedKey}" title="Copy Link">
                 <i class="fas fa-link"></i>
               </button>
                             <a href="${getDownloadUrl(encodedKey)}" class="btn btn-success btn-sm"
@@ -679,7 +706,7 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
                 ${breadcrumb}
         <div class="empty-state">
           <div class="empty-state-illustration">
-            <i class="fas fa-folder-open" style="font-size: 4rem; color: #cbd5e0;"></i>
+            <i class="fas fa-folder-open empty-state-folder-icon"></i>
             <i class="fas fa-search empty-state-search-icon"></i>
           </div>
           <h4>No files found</h4>
@@ -687,13 +714,13 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
                         ${prefix ? `This folder <strong>${escapeHtml(prefix)}</strong> is currently empty in bucket <strong>${escapeHtml(getActiveBucketLabel())}</strong>.` : `Bucket <strong>${escapeHtml(getActiveBucketLabel())}</strong> is empty. Start by uploading files or creating a new folder.`}
           </p>
           <div class="empty-state-actions">
-            <button class="btn btn-primary" onclick="window.scrollTo({top: 0, behavior: 'smooth'}); document.getElementById('fileInput').click()">
+            <button class="btn btn-primary" data-action="upload-files">
               <i class="fas fa-cloud-upload-alt"></i> Upload Files
             </button>
-            <button class="btn btn-outline-secondary" onclick="createFolder()">
+            <button class="btn btn-outline-secondary" data-action="create-folder">
               <i class="fas fa-folder-plus"></i> New Folder
             </button>
-                        ${prefix ? `<button class="btn btn-light" onclick="loadFiles(1, '')">
+                        ${prefix ? `<button class="btn btn-light" data-action="go-root">
                             <i class="fas fa-home"></i> Go to ${rootLabel}
             </button>` : ''}
           </div>
@@ -714,7 +741,7 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
                 ? `<div class="virtualized-info">
                         <span>Showing ${visibleFiles.length} of ${displayFiles.length} files in this view.</span>
                         <div class="virtualized-actions">
-                            ${visibleFiles.length < displayFiles.length ? '<button class="btn btn-sm btn-outline-secondary" onclick="expandVirtualRows()">Load more</button>' : ''}
+                            ${visibleFiles.length < displayFiles.length ? '<button class="btn btn-sm btn-outline-secondary" data-action="expand-virtual">Load more</button>' : ''}
                         </div>
                     </div>`
                 : '';
@@ -724,7 +751,7 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
       <div class="table-responsive">
         <div id="bulkActionsBar" class="bulk-actions-bar">
           <span id="bulkSelectedCount">0 selected</span>
-          <div style="float: right;">
+          <div class="bulk-actions-controls">
             <button class="btn btn-danger btn-sm" id="bulkDeleteBtn" disabled>
               <i class="fas fa-trash"></i> Delete Selected
             </button>
@@ -733,19 +760,19 @@ function renderFilesTable(files, folders = [], prefix = '', apiPrefix = '') {
         <table class="table table-hover mb-0">
           <thead>
             <tr>
-              <th style="width:48px; text-align:center;">
+              <th class="table-select-col">
                 <input type="checkbox" id="selectAllCheckbox" aria-label="Select all files" />
               </th>
-              <th style="padding-left: 1.5rem; cursor: pointer;" onclick="toggleSort('name')">
+              <th class="sortable-heading file-name-heading" data-sort-field="name">
                 <i class="fas fa-file-alt"></i> Name ${getSortIcon('name')}
               </th>
-              <th style="cursor: pointer;" onclick="toggleSort('size')">
+              <th class="sortable-heading" data-sort-field="size">
                 <i class="fas fa-weight"></i> Size ${getSortIcon('size')}
               </th> 
-              <th style="cursor: pointer;" onclick="toggleSort('date')">
+              <th class="sortable-heading" data-sort-field="date">
                 <i class="fas fa-calendar"></i> Last Modified ${getSortIcon('date')}
               </th>
-              <th style="text-align: center;">
+              <th class="table-cell-center">
                 <i class="fas fa-cogs"></i> Actions
               </th>
             </tr>
@@ -767,6 +794,17 @@ function renderPagination(data) {
     const { currentPage, totalPages, hasPrevPage, hasNextPage, mode } = data;
 
     let paginationHTML = '';
+    const pageLink = (page, label, extra = {}) => {
+        const attrs = [
+            dataAttr('page', page),
+            dataAttr('prefix', currentPrefix),
+            dataAttr('search', currentSearch),
+            dataAttr('sort', extra.sort || currentSort),
+            dataAttr('order', extra.order || currentOrder)
+        ];
+        if (extra.token) attrs.push(dataAttr('token', extra.token));
+        return `<a class="page-link" href="#" ${attrs.join(' ')}>${label}</a>`;
+    };
 
     if (mode === 'optimized') {
         // Optimized Mode: Token-based pagination (Next only, limited Prev)
@@ -789,13 +827,9 @@ function renderPagination(data) {
 
       // Next button
       if (hasNextPage) {
-          // Quote the token correctly
-          const tokenStr = currentNextToken ? currentNextToken.replace(/'/g, "\\'") : "";
           paginationHTML += `
           <li class="page-item">
-            <a class="page-link" href="#" onclick="event.preventDefault(); loadFiles(${currentPage + 1}, '${currentPrefix}', '${currentSearch}', '${currentSort}', '${currentOrder}', '${tokenStr}')">
-              Next <i class="fas fa-chevron-right"></i>
-            </a>
+            ${pageLink(currentPage + 1, 'Next <i class="fas fa-chevron-right"></i>', { token: currentNextToken || '' })}
           </li>
         `;
       } else {
@@ -815,9 +849,7 @@ function renderPagination(data) {
         if (hasPrevPage) {
             paginationHTML += `
             <li class="page-item">
-              <a class="page-link" href="#" onclick="event.preventDefault(); loadFiles(${currentPage - 1}, '${currentPrefix}', '${currentSearch}')">
-                <i class="fas fa-chevron-left"></i> Previous
-              </a>
+              ${pageLink(currentPage - 1, '<i class="fas fa-chevron-left"></i> Previous')}
             </li>
           `;
         } else {
@@ -843,7 +875,7 @@ function renderPagination(data) {
         if (startPage > 1) {
              paginationHTML += `
             <li class="page-item">
-                <a class="page-link" href="#" onclick="event.preventDefault(); loadFiles(1, '${currentPrefix}', '${currentSearch}')">1</a>
+                ${pageLink(1, '1')}
             </li>`;
             if (startPage > 2) {
                  paginationHTML += `<li class="page-item disabled"><span class="page-link">...</span></li>`;
@@ -860,7 +892,7 @@ function renderPagination(data) {
             } else {
                 paginationHTML += `
               <li class="page-item">
-                <a class="page-link" href="#" onclick="event.preventDefault(); loadFiles(${i}, '${currentPrefix}', '${currentSearch}')">${i}</a>
+                ${pageLink(i, String(i))}
               </li>
             `;
             }
@@ -873,7 +905,7 @@ function renderPagination(data) {
             }
             paginationHTML += `
             <li class="page-item">
-                <a class="page-link" href="#" onclick="event.preventDefault(); loadFiles(${totalPages}, '${currentPrefix}', '${currentSearch}')">${totalPages}</a>
+                ${pageLink(totalPages, String(totalPages))}
             </li>`;
         }
 
@@ -881,9 +913,7 @@ function renderPagination(data) {
         if (hasNextPage) {
             paginationHTML += `
             <li class="page-item">
-              <a class="page-link" href="#" onclick="event.preventDefault(); loadFiles(${currentPage + 1}, '${currentPrefix}', '${currentSearch}')">
-                Next <i class="fas fa-chevron-right"></i>
-              </a>
+              ${pageLink(currentPage + 1, 'Next <i class="fas fa-chevron-right"></i>')}
             </li>
           `;
         } else {
@@ -976,7 +1006,7 @@ setTimeout(() => {
 // Upload queue, drag-and-drop and multi-file support
 const uploadQueue = []; // { id, file, status, progress, controller/xhr, uploadId }
 const xhrMap = new Map();
-const CHUNK_SIZE = 5 * 1024 * 1024; // 5MB chunk threshold
+const CHUNK_SIZE = 50 * 1024 * 1024; // 50MB chunk threshold
 
 function createId() { return Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 9); }
 
@@ -1030,9 +1060,9 @@ function renderUploadQueue() {
             <div class="form-text file-size upload-item-size-label">${formatFileSize(item.file.size)}</div>
           </div>
         </div>
-        <div style="min-width:220px;">
-          <div class="progress-container" style="height: 8px; margin-bottom: 6px;">
-            <div class="progress-bar" style="width: ${Math.round(item.progress)}%; height: 8px;"></div>
+        <div class="upload-progress-cell">
+          <div class="progress-container upload-progress-track">
+            <div class="progress-bar upload-progress-bar" style="width: ${Math.round(item.progress)}%;"></div>
           </div>
           <div class="upload-item-status-row">
             <small class="text-muted status">${statusText}</small>
@@ -1326,7 +1356,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
             this.disabled = true;
             this.setAttribute('aria-busy', 'true');
-            if (bucketSwitchStatusEl) bucketSwitchStatusEl.style.display = 'inline';
+            bucketSwitchStatusEl?.classList.remove('is-hidden');
 
             const qs = nextParams.toString();
             window.location.href = `/mbkbucket${qs ? `?${qs}` : ''}`;
@@ -1384,6 +1414,70 @@ document.addEventListener('DOMContentLoaded', function () {
 
     // Delegate view and delete button clicks to avoid inline JS with unescaped data
     document.addEventListener('click', function (e) {
+        const actionBtn = e.target.closest('[data-action]');
+        if (actionBtn) {
+            const action = actionBtn.dataset.action;
+            if (action === 'upload-files') {
+                window.scrollTo({ top: 0, behavior: 'smooth' });
+                document.getElementById('fileInput')?.click();
+            } else if (action === 'create-folder') {
+                createFolder();
+            } else if (action === 'create-file') {
+                createFile();
+            } else if (action === 'go-root') {
+                loadFiles(1, '');
+            } else if (action === 'expand-virtual') {
+                expandVirtualRows();
+            } else if (action === 'search') {
+                performSearch();
+            } else if (action === 'clear-search') {
+                clearSearch();
+            } else if (action === 'retry-load') {
+                loadFiles(parseInt(actionBtn.dataset.retryPage, 10) || 1, actionBtn.dataset.retryPrefix || '');
+            } else if (action === 'close-toast') {
+                actionBtn.closest('.toast-notification')?.remove();
+            }
+            return;
+        }
+
+        const quickFilterBtn = e.target.closest('[data-filter]');
+        if (quickFilterBtn) {
+            setQuickFilter(quickFilterBtn.dataset.filter || 'all');
+            return;
+        }
+
+        const viewModeBtn = e.target.closest('[data-view-mode]');
+        if (viewModeBtn) {
+            changeViewMode(viewModeBtn.dataset.viewMode);
+            return;
+        }
+
+        const navBtn = e.target.closest('[data-nav-prefix]');
+        if (navBtn) {
+            loadFiles(1, navBtn.dataset.navPrefix || '');
+            return;
+        }
+
+        const sortHeader = e.target.closest('[data-sort-field]');
+        if (sortHeader) {
+            toggleSort(sortHeader.dataset.sortField);
+            return;
+        }
+
+        const pageLink = e.target.closest('.page-link[data-page]');
+        if (pageLink) {
+            e.preventDefault();
+            loadFiles(
+                parseInt(pageLink.dataset.page, 10) || 1,
+                pageLink.dataset.prefix || '',
+                pageLink.dataset.search || '',
+                pageLink.dataset.sort || currentSort,
+                pageLink.dataset.order || currentOrder,
+                pageLink.dataset.token || ''
+            );
+            return;
+        }
+
         const folderRow = e.target.closest('.folder-row');
         if (folderRow && !e.target.closest('.delete-btn')) {
             const folderPath = folderRow.dataset.folderPath;
@@ -2005,4 +2099,4 @@ async function createFile() {
         };
     };
 
-})(window);
+})(window);

package/views/bucket.handlebars

@@ -9,7 +9,6 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=IBM+Plex+Sans:wght@400;500;600;700&display=swap" rel="stylesheet">
     <script src="/mbkauthe/main.js" defer></script>
-    <script src="https://portal.mbktech.org/Assets/Scripts/timeoutlogout.js" defer></script>
     <script src="https://portal.mbktech.org/Assets/Scripts/auto-ids.js" defer></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
     <link rel="icon" type="image/x-icon" href="/icon.svg">