release(v2.2.2): feat(folders): show inline folder stats & dates
This commit is contained in:
15
CHANGELOG.md
15
CHANGELOG.md
@@ -1,5 +1,18 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## Changes 11/29/2025 (v2.2.2)
|
||||||
|
|
||||||
|
release(v2.2.2): feat(folders): show inline folder stats & dates
|
||||||
|
|
||||||
|
- Extend FolderModel::countVisible() to track earliest and latest file mtimes
|
||||||
|
- Format folder created/modified timestamps via DATE_TIME_FORMAT on the backend
|
||||||
|
- Add a small folder stats cache in fileListView.js to reuse isEmpty.php responses
|
||||||
|
- Use shared fetchFolderStats() for both folder strip icons and inline folder rows
|
||||||
|
- Show per-folder item counts, total size, and created/modified dates in inline rows
|
||||||
|
- Make size parsing more robust by accepting multiple backend size keys (bytes/sizeBytes/size/totalBytes)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Changes 11/28/2025 (v2.2.1)
|
## Changes 11/28/2025 (v2.2.1)
|
||||||
|
|
||||||
release(v2.2.1): fix(storage-explorer): DOM-safe rendering + docs for disk usage
|
release(v2.2.1): fix(storage-explorer): DOM-safe rendering + docs for disk usage
|
||||||
@@ -9,6 +22,8 @@ release(v2.2.1): fix(storage-explorer): DOM-safe rendering + docs for disk usage
|
|||||||
- Keep deep-delete and pagination behavior unchanged while tightening up XSS/CodeQL concerns.
|
- Keep deep-delete and pagination behavior unchanged while tightening up XSS/CodeQL concerns.
|
||||||
- Update README feature list to mention disk usage summary and Pro storage explorer (ncdu-style) alongside user groups and client portals.
|
- Update README feature list to mention disk usage summary and Pro storage explorer (ncdu-style) alongside user groups and client portals.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Changes 11/28/2025 (v2.2.0)
|
## Changes 11/28/2025 (v2.2.0)
|
||||||
|
|
||||||
release(v2.2.0): add storage explorer + disk usage scanner
|
release(v2.2.0): add storage explorer + disk usage scanner
|
||||||
|
|||||||
@@ -295,6 +295,27 @@ try {
|
|||||||
// Global flag for advanced search mode.
|
// Global flag for advanced search mode.
|
||||||
window.advancedSearchEnabled = false;
|
window.advancedSearchEnabled = false;
|
||||||
|
|
||||||
|
// --- Folder stats cache (for isEmpty.php) ---
|
||||||
|
const _folderStatsCache = new Map();
|
||||||
|
|
||||||
|
function fetchFolderStats(folder) {
|
||||||
|
if (!folder) return Promise.resolve(null);
|
||||||
|
|
||||||
|
if (_folderStatsCache.has(folder)) {
|
||||||
|
return _folderStatsCache.get(folder);
|
||||||
|
}
|
||||||
|
|
||||||
|
const url = `/api/folder/isEmpty.php?folder=${encodeURIComponent(folder)}&t=${Date.now()}`;
|
||||||
|
const p = _fetchJSONWithTimeout(url, 2500)
|
||||||
|
.catch(() => ({ folders: 0, files: 0 }))
|
||||||
|
.finally(() => {
|
||||||
|
// keep the resolved value; the Promise itself stays in the map
|
||||||
|
});
|
||||||
|
|
||||||
|
_folderStatsCache.set(folder, p);
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
SECURITY: build file URLs only via the API (no /uploads)
|
SECURITY: build file URLs only via the API (no /uploads)
|
||||||
=========================================================== */
|
=========================================================== */
|
||||||
@@ -428,19 +449,19 @@ function attachStripIconAsync(hostEl, fullPath, size = 28) {
|
|||||||
// make sure this brand-new SVG is sized correctly
|
// make sure this brand-new SVG is sized correctly
|
||||||
try { syncFolderIconSizeToRowHeight(); } catch {}
|
try { syncFolderIconSizeToRowHeight(); } catch {}
|
||||||
|
|
||||||
const url = `/api/folder/isEmpty.php?folder=${encodeURIComponent(fullPath)}&t=${Date.now()}`;
|
fetchFolderStats(fullPath)
|
||||||
_fetchJSONWithTimeout(url, 2500)
|
.then(stats => {
|
||||||
.then(({ folders = 0, files = 0 }) => {
|
if (!stats) return;
|
||||||
|
const folders = Number.isFinite(stats.folders) ? stats.folders : 0;
|
||||||
|
const files = Number.isFinite(stats.files) ? stats.files : 0;
|
||||||
|
|
||||||
if ((folders + files) > 0 && iconSpan.dataset.kind !== 'paper') {
|
if ((folders + files) > 0 && iconSpan.dataset.kind !== 'paper') {
|
||||||
// 2) swap to "paper" icon
|
|
||||||
iconSpan.dataset.kind = 'paper';
|
iconSpan.dataset.kind = 'paper';
|
||||||
iconSpan.innerHTML = folderSVG('paper');
|
iconSpan.innerHTML = folderSVG('paper');
|
||||||
|
|
||||||
// re-apply sizing to this new SVG too
|
|
||||||
try { syncFolderIconSizeToRowHeight(); } catch {}
|
try { syncFolderIconSizeToRowHeight(); } catch {}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => { /* ignore */ });
|
.catch(() => {});
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -----------------------------
|
/* -----------------------------
|
||||||
@@ -1156,6 +1177,19 @@ function injectInlineFolderRows(fileListContent, folder, pageSubfolders) {
|
|||||||
);
|
);
|
||||||
if (actionsIdx < 0) actionsIdx = -1;
|
if (actionsIdx < 0) actionsIdx = -1;
|
||||||
|
|
||||||
|
// NEW: created / modified column indices (uploaded = created in your header)
|
||||||
|
let createdIdx = headerCells.findIndex(th =>
|
||||||
|
(th.dataset && (th.dataset.column === "uploaded" || th.dataset.column === "created")) ||
|
||||||
|
/\b(uploaded|created)\b/i.test((th.textContent || "").trim())
|
||||||
|
);
|
||||||
|
if (createdIdx < 0) createdIdx = -1;
|
||||||
|
|
||||||
|
let modifiedIdx = headerCells.findIndex(th =>
|
||||||
|
(th.dataset && th.dataset.column === "modified") ||
|
||||||
|
/\bmodified\b/i.test((th.textContent || "").trim())
|
||||||
|
);
|
||||||
|
if (modifiedIdx < 0) modifiedIdx = -1;
|
||||||
|
|
||||||
// Remove any previous folder rows
|
// Remove any previous folder rows
|
||||||
tbody.querySelectorAll("tr.folder-row").forEach(tr => tr.remove());
|
tbody.querySelectorAll("tr.folder-row").forEach(tr => tr.remove());
|
||||||
|
|
||||||
@@ -1356,19 +1390,32 @@ if (iconSpan) {
|
|||||||
iconSpan.style.marginTop = "0px"; // small down nudge
|
iconSpan.style.marginTop = "0px"; // small down nudge
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----- FOLDER STATS + OWNER + CAPS (keep your existing code below here) -----
|
// ----- FOLDER STATS + OWNER + CAPS -----
|
||||||
const sizeCellIndex = (sizeIdx >= 0 && sizeIdx < tr.cells.length) ? sizeIdx : -1;
|
const sizeCellIndex = (sizeIdx >= 0 && sizeIdx < tr.cells.length) ? sizeIdx : -1;
|
||||||
const nameCellIndex = (nameIdx >= 0 && nameIdx < tr.cells.length) ? nameIdx : -1;
|
const nameCellIndex = (nameIdx >= 0 && nameIdx < tr.cells.length) ? nameIdx : -1;
|
||||||
|
const createdCellIndex = (createdIdx >= 0 && createdIdx < tr.cells.length) ? createdIdx : -1;
|
||||||
|
const modifiedCellIndex = (modifiedIdx >= 0 && modifiedIdx < tr.cells.length) ? modifiedIdx : -1;
|
||||||
|
|
||||||
const url = `/api/folder/isEmpty.php?folder=${encodeURIComponent(sf.full)}&t=${Date.now()}`;
|
fetchFolderStats(sf.full).then(stats => {
|
||||||
_fetchJSONWithTimeout(url, 2500).then(stats => {
|
|
||||||
if (!stats) return;
|
if (!stats) return;
|
||||||
|
|
||||||
const foldersCount = Number.isFinite(stats.folders) ? stats.folders : 0;
|
const foldersCount = Number.isFinite(stats.folders) ? stats.folders : 0;
|
||||||
const filesCount = Number.isFinite(stats.files) ? stats.files : 0;
|
const filesCount = Number.isFinite(stats.files) ? stats.files : 0;
|
||||||
const bytes = Number.isFinite(stats.bytes)
|
// Try multiple possible size keys so backend + JS can drift a bit
|
||||||
? stats.bytes
|
let bytes = null;
|
||||||
: (Number.isFinite(stats.sizeBytes) ? stats.sizeBytes : null);
|
const sizeCandidates = [
|
||||||
|
stats.bytes,
|
||||||
|
stats.sizeBytes,
|
||||||
|
stats.size,
|
||||||
|
stats.totalBytes
|
||||||
|
];
|
||||||
|
for (const v of sizeCandidates) {
|
||||||
|
const n = Number(v);
|
||||||
|
if (Number.isFinite(n) && n >= 0) {
|
||||||
|
bytes = n;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let pieces = [];
|
let pieces = [];
|
||||||
if (foldersCount) pieces.push(`${foldersCount} folder${foldersCount === 1 ? "" : "s"}`);
|
if (foldersCount) pieces.push(`${foldersCount} folder${foldersCount === 1 ? "" : "s"}`);
|
||||||
@@ -1395,6 +1442,26 @@ if (iconSpan) {
|
|||||||
sizeCell.title = `${countLabel}${bytes != null && bytes >= 0 ? " • " + sizeLabel : ""}`;
|
sizeCell.title = `${countLabel}${bytes != null && bytes >= 0 ? " • " + sizeLabel : ""}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (createdCellIndex >= 0) {
|
||||||
|
const createdCell = tr.cells[createdCellIndex];
|
||||||
|
if (createdCell) {
|
||||||
|
const txt = (stats && typeof stats.earliest_uploaded === 'string')
|
||||||
|
? stats.earliest_uploaded
|
||||||
|
: '';
|
||||||
|
createdCell.textContent = txt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (modifiedCellIndex >= 0) {
|
||||||
|
const modCell = tr.cells[modifiedCellIndex];
|
||||||
|
if (modCell) {
|
||||||
|
const txt = (stats && typeof stats.latest_mtime === 'string')
|
||||||
|
? stats.latest_mtime
|
||||||
|
: '';
|
||||||
|
modCell.textContent = txt;
|
||||||
|
}
|
||||||
|
}
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
if (sizeCellIndex >= 0) {
|
if (sizeCellIndex >= 0) {
|
||||||
const sizeCell = tr.cells[sizeCellIndex];
|
const sizeCell = tr.cells[sizeCellIndex];
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class FolderModel
|
|||||||
* ============================================================ */
|
* ============================================================ */
|
||||||
|
|
||||||
public static function countVisible(string $folder, string $user, array $perms): array
|
public static function countVisible(string $folder, string $user, array $perms): array
|
||||||
{
|
{
|
||||||
$folder = ACL::normalizeFolder($folder);
|
$folder = ACL::normalizeFolder($folder);
|
||||||
|
|
||||||
// If the user can't view this folder at all, short-circuit (admin/read/read_own)
|
// If the user can't view this folder at all, short-circuit (admin/read/read_own)
|
||||||
@@ -63,6 +63,10 @@ class FolderModel
|
|||||||
$fileCount = 0;
|
$fileCount = 0;
|
||||||
$totalBytes = 0;
|
$totalBytes = 0;
|
||||||
|
|
||||||
|
// NEW: stats for created / modified
|
||||||
|
$earliestUploaded = null; // min mtime
|
||||||
|
$latestMtime = null; // max mtime
|
||||||
|
|
||||||
$MAX_SCAN = 4000;
|
$MAX_SCAN = 4000;
|
||||||
$scanned = 0;
|
$scanned = 0;
|
||||||
|
|
||||||
@@ -107,15 +111,36 @@ class FolderModel
|
|||||||
if (is_int($sz) && $sz > 0) {
|
if (is_int($sz) && $sz > 0) {
|
||||||
$totalBytes += $sz;
|
$totalBytes += $sz;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NEW: track earliest / latest mtime from visible files
|
||||||
|
$mt = @filemtime($abs);
|
||||||
|
if (is_int($mt) && $mt > 0) {
|
||||||
|
if ($earliestUploaded === null || $mt < $earliestUploaded) {
|
||||||
|
$earliestUploaded = $mt;
|
||||||
|
}
|
||||||
|
if ($latestMtime === null || $mt > $latestMtime) {
|
||||||
|
$latestMtime = $mt;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
$result = [
|
||||||
'folders' => $folderCount,
|
'folders' => $folderCount,
|
||||||
'files' => $fileCount,
|
'files' => $fileCount,
|
||||||
'bytes' => $totalBytes,
|
'bytes' => $totalBytes,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Only include when we actually saw at least one readable file
|
||||||
|
if ($earliestUploaded !== null) {
|
||||||
|
$result['earliest_uploaded'] = date(DATE_TIME_FORMAT, $earliestUploaded);
|
||||||
}
|
}
|
||||||
|
if ($latestMtime !== null) {
|
||||||
|
$result['latest_mtime'] = date(DATE_TIME_FORMAT, $latestMtime);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
/* Helpers (private) */
|
/* Helpers (private) */
|
||||||
private static function isSafeSegment(string $name): bool
|
private static function isSafeSegment(string $name): bool
|
||||||
|
|||||||
Reference in New Issue
Block a user