Merge branch 'feat/root-tile-folder-behavior'
@@ -69,8 +69,9 @@
69
69
- createMoveNode(folderPath, label) - Builds an expandable/selectable folder node for the Move To tree.
70
70
- loadMoveChildren(containerEl, dirPath) - Lazy-loads subfolders for a tree node via /api/files/list.
71
71
- isInlinePreviewableBlob(blob, name) - Determines if a blob can be previewed inline by MIME/extension.
72
- makeFileItem(item) - Builds a .file-item element; wires desktop click-select + dblclick open, mobile tap-open with long-press sidebar actions, and blocks default mobile contextmenu on long-press.
72
- makeFileItem(item) - Builds a .file-item element; roots in Home now use folder-like interaction (single-click focus, double-click open), roots are non-draggable, and mobile long-press contextmenu suppression remains.
73
73
- attachMobileLongPress(el, item) - Adds mobile long-press detection on file/folder tiles to open the item sidebar without desktop side effects.
74
- openSidebar(item) - Renders item details/actions in sidebar; root folders include used/remaining storage stats when focused from Home.
74
75
75
76
## public/drag-move.js
76
77
- makeDraggable(el, item) - Attaches pointerdown to a .file-item; starts drag after threshold movement. Depends on: api(), canWrite(), navigateTo(), STATE, closeSidebar(), toast() from app.js.
@@ -69,8 +69,9 @@69
- createMoveNode(folderPath, label) - Builds an expandable/selectable folder node for the Move To tree.69
- createMoveNode(folderPath, label) - Builds an expandable/selectable folder node for the Move To tree.70
- loadMoveChildren(containerEl, dirPath) - Lazy-loads subfolders for a tree node via /api/files/list.70
- loadMoveChildren(containerEl, dirPath) - Lazy-loads subfolders for a tree node via /api/files/list.71
- isInlinePreviewableBlob(blob, name) - Determines if a blob can be previewed inline by MIME/extension.71
- isInlinePreviewableBlob(blob, name) - Determines if a blob can be previewed inline by MIME/extension.72
- makeFileItem(item) - Builds a .file-item element; wires desktop click-select + dblclick open, mobile tap-open with long-press sidebar actions, and blocks default mobile contextmenu on long-press.72
- makeFileItem(item) - Builds a .file-item element; roots in Home now use folder-like interaction (single-click focus, double-click open), roots are non-draggable, and mobile long-press contextmenu suppression remains.73
- attachMobileLongPress(el, item) - Adds mobile long-press detection on file/folder tiles to open the item sidebar without desktop side effects.73
- attachMobileLongPress(el, item) - Adds mobile long-press detection on file/folder tiles to open the item sidebar without desktop side effects.74
- openSidebar(item) - Renders item details/actions in sidebar; root folders include used/remaining storage stats when focused from Home.74
75
75
## public/drag-move.js76
## public/drag-move.js76
- makeDraggable(el, item) - Attaches pointerdown to a .file-item; starts drag after threshold movement. Depends on: api(), canWrite(), navigateTo(), STATE, closeSidebar(), toast() from app.js.77
- makeDraggable(el, item) - Attaches pointerdown to a .file-item; starts drag after threshold movement. Depends on: api(), canWrite(), navigateTo(), STATE, closeSidebar(), toast() from app.js.@@ -43,5 +43,9 @@
43
43
44
44
## `test/page.load.test.js`
45
45
- `page load smoke test`
46
- `requests / and boots the client without runtime errors`
47
- `keeps sidebar folded on initial mobile boot`
48
- `suppresses default context menu on mobile file long-press`
49
- `in Home, root tiles single-click focus and double-click open`
46
50
47
51
---
@@ -43,5 +43,9 @@43
43
44
## `test/page.load.test.js`44
## `test/page.load.test.js`45
- `page load smoke test`45
- `page load smoke test`46
- `requests / and boots the client without runtime errors`47
- `keeps sidebar folded on initial mobile boot`48
- `suppresses default context menu on mobile file long-press`49
- `in Home, root tiles single-click focus and double-click open`46
50
47
---51
---@@ -921,7 +921,7 @@ function makeFileItem (item)
921
921
name.textContent = item.name;
922
922
el.appendChild(name);
923
923
924
makeDraggable(el, item);
924
if (!item._root) makeDraggable(el, item);
925
925
attachMobileLongPress(el, item);
926
926
927
927
el.addEventListener('contextmenu', (e) =>
@@ -935,13 +935,6 @@ function makeFileItem (item)
935
935
el.addEventListener('click', (e) =>
936
936
{
937
937
e.stopPropagation();
938
if (item._root)
939
{
940
// Clicking a root tile goes straight in
941
navigateTo(item.path, item._root);
942
return;
943
}
944
945
938
if (isMobileViewport())
946
939
{
947
940
if (el.dataset.longPressTriggered === '1')
@@ -952,7 +945,7 @@ function makeFileItem (item)
952
945
953
946
if (item.isDir)
954
947
{
955
navigateTo(item.path, STATE.currentRoot);
948
navigateTo(item.path, item._root || STATE.currentRoot);
956
949
} else
957
950
{
958
951
downloadOrView(item, icon.querySelector('svg'));
@@ -969,7 +962,7 @@ function makeFileItem (item)
969
962
e.stopPropagation();
970
963
if (item.isDir)
971
964
{
972
navigateTo(item.path, STATE.currentRoot);
965
navigateTo(item.path, item._root || STATE.currentRoot);
973
966
} else
974
967
{
975
968
downloadOrView(item, icon.querySelector('svg'));
@@ -1084,10 +1077,25 @@ async function openSidebar (item)
1084
1077
actions.appendChild(btnDl);
1085
1078
} else
1086
1079
{
1087
dl.innerHTML = `<dt>Type</dt><dd>Folder</dd>`;
1080
dl.innerHTML = `<dt>Type</dt><dd>${item._root ? 'Root folder' : 'Folder'}</dd>`;
1081
1082
if (item._root)
1083
{
1084
const space = await api('GET', `/files/space?dir=${encodeURIComponent(item.path)}`).catch(() => null);
1085
if (space)
1086
{
1087
const used = formatBytes(space.usedBytes);
1088
const free = space.freeBytes == null ? 'unknown' : formatBytes(space.freeBytes);
1089
dl.innerHTML += `
1090
<dt>Used</dt><dd>${used}</dd>
1091
<dt>Remaining</dt><dd>${free}</dd>
1092
`;
1093
}
1094
}
1095
1088
1096
const btnOpen = document.createElement('button');
1089
1097
btnOpen.textContent = 'Open folder';
1090
btnOpen.addEventListener('click', () => navigateTo(item.path, STATE.currentRoot));
1098
btnOpen.addEventListener('click', () => navigateTo(item.path, item._root || STATE.currentRoot));
1091
1099
actions.appendChild(btnOpen);
1092
1100
}
1093
1101
@@ -921,7 +921,7 @@ function makeFileItem (item)921
name.textContent = item.name;921
name.textContent = item.name;922
el.appendChild(name);922
el.appendChild(name);923
923
924
makeDraggable(el, item);924
if (!item._root) makeDraggable(el, item);925
attachMobileLongPress(el, item);925
attachMobileLongPress(el, item);926
926
927
el.addEventListener('contextmenu', (e) =>927
el.addEventListener('contextmenu', (e) =>@@ -935,13 +935,6 @@ function makeFileItem (item)935
el.addEventListener('click', (e) =>935
el.addEventListener('click', (e) =>936
{936
{937
e.stopPropagation();937
e.stopPropagation();938
if (item._root)939
{940
// Clicking a root tile goes straight in941
navigateTo(item.path, item._root);942
return;943
}944
945
if (isMobileViewport())938
if (isMobileViewport())946
{939
{947
if (el.dataset.longPressTriggered === '1')940
if (el.dataset.longPressTriggered === '1')@@ -952,7 +945,7 @@ function makeFileItem (item)952
945
953
if (item.isDir)946
if (item.isDir)954
{947
{955
navigateTo(item.path, STATE.currentRoot);948
navigateTo(item.path, item._root || STATE.currentRoot);956
} else949
} else957
{950
{958
downloadOrView(item, icon.querySelector('svg'));951
downloadOrView(item, icon.querySelector('svg'));@@ -969,7 +962,7 @@ function makeFileItem (item)969
e.stopPropagation();962
e.stopPropagation();970
if (item.isDir)963
if (item.isDir)971
{964
{972
navigateTo(item.path, STATE.currentRoot);965
navigateTo(item.path, item._root || STATE.currentRoot);973
} else966
} else974
{967
{975
downloadOrView(item, icon.querySelector('svg'));968
downloadOrView(item, icon.querySelector('svg'));@@ -1084,10 +1077,25 @@ async function openSidebar (item)1084
actions.appendChild(btnDl);1077
actions.appendChild(btnDl);1085
} else1078
} else1086
{1079
{1087
dl.innerHTML = `<dt>Type</dt><dd>Folder</dd>`;1080
dl.innerHTML = `<dt>Type</dt><dd>${item._root ? 'Root folder' : 'Folder'}</dd>`;1081
1082
if (item._root)1083
{1084
const space = await api('GET', `/files/space?dir=${encodeURIComponent(item.path)}`).catch(() => null);1085
if (space)1086
{1087
const used = formatBytes(space.usedBytes);1088
const free = space.freeBytes == null ? 'unknown' : formatBytes(space.freeBytes);1089
dl.innerHTML += `1090
<dt>Used</dt><dd>${used}</dd>1091
<dt>Remaining</dt><dd>${free}</dd>1092
`;1093
}1094
}1095
1088
const btnOpen = document.createElement('button');1096
const btnOpen = document.createElement('button');1089
btnOpen.textContent = 'Open folder';1097
btnOpen.textContent = 'Open folder';1090
btnOpen.addEventListener('click', () => navigateTo(item.path, STATE.currentRoot));1098
btnOpen.addEventListener('click', () => navigateTo(item.path, item._root || STATE.currentRoot));1091
actions.appendChild(btnOpen);1099
actions.appendChild(btnOpen);1092
}1100
}1093
1101
@@ -12,6 +12,28 @@ describe('page load smoke test', () =>
12
12
let baseUrl;
13
13
let JSDOM;
14
14
let VirtualConsole;
15
let rootsFixture;
16
let listFixture;
17
let spaceFixture;
18
19
beforeEach(() =>
20
{
21
rootsFixture = [{ label: 'Root', path: '/data' }];
22
listFixture = {
23
'/data': [
24
{
25
name: 'readme.txt',
26
path: '/data/readme.txt',
27
isDir: false,
28
size: 12,
29
mtime: Date.now(),
30
},
31
],
32
};
33
spaceFixture = {
34
'/data': { usedBytes: 0, freeBytes: 1024 * 1024 },
35
};
36
});
15
37
16
38
beforeAll(async () =>
17
39
{
@@ -26,19 +48,18 @@ describe('page load smoke test', () =>
26
48
app.get('/api/auth/server-key', (req, res) => res.json({ publicKey: null }));
27
49
app.get('/api/auth/setup-needed', (req, res) => res.json({ needed: false }));
28
50
app.get('/api/auth/me', (req, res) => res.json({ username: 'tester', isAdmin: false, permissions: {} }));
29
app.get('/api/files/roots', (req, res) => res.json({ roots: [{ label: 'Root', path: '/data' }] }));
30
app.get('/api/files/list', (req, res) => res.json({
31
items: [
32
{
33
name: 'readme.txt',
34
path: '/data/readme.txt',
35
isDir: false,
36
size: 12,
37
mtime: Date.now(),
38
},
39
],
40
}));
41
app.get('/api/files/space', (req, res) => res.json({ usedBytes: 0, freeBytes: 1024 * 1024 }));
51
app.get('/api/files/roots', (req, res) => res.json({ roots: rootsFixture }));
52
app.get('/api/files/list', (req, res) =>
53
{
54
const dir = req.query.dir;
55
res.json({ items: listFixture[dir] || [] });
56
});
57
app.get('/api/files/space', (req, res) =>
58
{
59
const dir = req.query.dir;
60
const stats = spaceFixture[dir] || { usedBytes: 0, freeBytes: null };
61
res.json(stats);
62
});
42
63
app.post('/api/auth/logout', (req, res) => res.json({ ok: true }));
43
64
app.get('*', (req, res) => res.sendFile(path.join(publicDir, 'index.html')));
44
65
@@ -50,7 +71,7 @@ describe('page load smoke test', () =>
50
71
51
72
afterAll(() => server.close());
52
73
53
async function bootClient ({ mobile = false } = {})
74
async function bootClient ({ mobile = false, savedSession } = {})
54
75
{
55
76
const virtualConsole = new VirtualConsole();
56
77
const runtimeErrors = [];
@@ -78,13 +99,17 @@ describe('page load smoke test', () =>
78
99
window.matchMedia = () => ({ matches: mobile, addListener () { }, removeListener () { }, addEventListener () { }, removeEventListener () { } });
79
100
window.scrollTo = () => { };
80
101
81
const saved = {
102
const defaultSaved = {
82
103
token: 'saved-token',
83
104
dir: '/data',
84
105
rootPath: '/data',
85
106
lastOperationAt: Date.now(),
86
107
};
87
window.localStorage.setItem('filemanager.session.v1', JSON.stringify(saved));
108
const effectiveSaved = savedSession === undefined ? defaultSaved : savedSession;
109
if (effectiveSaved)
110
{
111
window.localStorage.setItem('filemanager.session.v1', JSON.stringify(effectiveSaved));
112
}
88
113
window.addEventListener('error', (event) => runtimeErrors.push(event.error || new Error(event.message)));
89
114
window.addEventListener('unhandledrejection', (event) => runtimeErrors.push(event.reason || new Error('Unhandled rejection')));
90
115
},
@@ -139,4 +164,55 @@ describe('page load smoke test', () =>
139
164
140
165
dom.window.close();
141
166
});
167
168
test('in Home, root tiles single-click focus and double-click open', async () =>
169
{
170
rootsFixture = [
171
{ label: 'Root A', path: '/data-a' },
172
{ label: 'Root B', path: '/data-b' },
173
];
174
listFixture = {
175
'/data-a': [
176
{
177
name: 'docs',
178
path: '/data-a/docs',
179
isDir: true,
180
size: 0,
181
mtime: Date.now(),
182
},
183
],
184
};
185
spaceFixture = {
186
'/data-a': { usedBytes: 2048, freeBytes: 4096 },
187
'/data-b': { usedBytes: 1024, freeBytes: 8192 },
188
};
189
190
const { dom, runtimeErrors } = await bootClient({
191
savedSession: {
192
token: 'saved-token',
193
dir: null,
194
rootPath: null,
195
lastOperationAt: Date.now(),
196
},
197
});
198
expect(runtimeErrors).toEqual([]);
199
200
const rootTile = dom.window.document.querySelector('.file-item[data-path="/data-a"]');
201
expect(rootTile).toBeTruthy();
202
203
rootTile.dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true }));
204
await new Promise(resolve => dom.window.setTimeout(resolve, 40));
205
206
expect(rootTile.classList.contains('selected')).toBe(true);
207
expect(dom.window.document.querySelector('.file-item[data-path="/data-b"]')).toBeTruthy();
208
expect(dom.window.document.getElementById('sidebar-meta').textContent).toContain('Used');
209
expect(dom.window.document.getElementById('sidebar-meta').textContent).toContain('Remaining');
210
211
rootTile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));
212
await new Promise(resolve => dom.window.setTimeout(resolve, 80));
213
214
expect(dom.window.document.querySelector('.file-item[data-path="/data-a/docs"]')).toBeTruthy();
215
216
dom.window.close();
217
});
142
218
});
@@ -12,6 +12,28 @@ describe('page load smoke test', () =>12
let baseUrl;12
let baseUrl;13
let JSDOM;13
let JSDOM;14
let VirtualConsole;14
let VirtualConsole;15
let rootsFixture;16
let listFixture;17
let spaceFixture;18
19
beforeEach(() =>20
{21
rootsFixture = [{ label: 'Root', path: '/data' }];22
listFixture = {23
'/data': [24
{25
name: 'readme.txt',26
path: '/data/readme.txt',27
isDir: false,28
size: 12,29
mtime: Date.now(),30
},31
],32
};33
spaceFixture = {34
'/data': { usedBytes: 0, freeBytes: 1024 * 1024 },35
};36
});15
37
16
beforeAll(async () =>38
beforeAll(async () =>17
{39
{@@ -26,19 +48,18 @@ describe('page load smoke test', () =>26
app.get('/api/auth/server-key', (req, res) => res.json({ publicKey: null }));48
app.get('/api/auth/server-key', (req, res) => res.json({ publicKey: null }));27
app.get('/api/auth/setup-needed', (req, res) => res.json({ needed: false }));49
app.get('/api/auth/setup-needed', (req, res) => res.json({ needed: false }));28
app.get('/api/auth/me', (req, res) => res.json({ username: 'tester', isAdmin: false, permissions: {} }));50
app.get('/api/auth/me', (req, res) => res.json({ username: 'tester', isAdmin: false, permissions: {} }));29
app.get('/api/files/roots', (req, res) => res.json({ roots: [{ label: 'Root', path: '/data' }] }));51
app.get('/api/files/roots', (req, res) => res.json({ roots: rootsFixture }));30
app.get('/api/files/list', (req, res) => res.json({52
app.get('/api/files/list', (req, res) =>31
items: [53
{32
{54
const dir = req.query.dir;33
name: 'readme.txt',55
res.json({ items: listFixture[dir] || [] });34
path: '/data/readme.txt',56
});35
isDir: false,57
app.get('/api/files/space', (req, res) =>36
size: 12,58
{37
mtime: Date.now(),59
const dir = req.query.dir;38
},60
const stats = spaceFixture[dir] || { usedBytes: 0, freeBytes: null };39
],61
res.json(stats);40
}));62
});41
app.get('/api/files/space', (req, res) => res.json({ usedBytes: 0, freeBytes: 1024 * 1024 }));42
app.post('/api/auth/logout', (req, res) => res.json({ ok: true }));63
app.post('/api/auth/logout', (req, res) => res.json({ ok: true }));43
app.get('*', (req, res) => res.sendFile(path.join(publicDir, 'index.html')));64
app.get('*', (req, res) => res.sendFile(path.join(publicDir, 'index.html')));44
65
@@ -50,7 +71,7 @@ describe('page load smoke test', () =>50
71
51
afterAll(() => server.close());72
afterAll(() => server.close());52
73
53
async function bootClient ({ mobile = false } = {})74
async function bootClient ({ mobile = false, savedSession } = {})54
{75
{55
const virtualConsole = new VirtualConsole();76
const virtualConsole = new VirtualConsole();56
const runtimeErrors = [];77
const runtimeErrors = [];@@ -78,13 +99,17 @@ describe('page load smoke test', () =>78
window.matchMedia = () => ({ matches: mobile, addListener () { }, removeListener () { }, addEventListener () { }, removeEventListener () { } });99
window.matchMedia = () => ({ matches: mobile, addListener () { }, removeListener () { }, addEventListener () { }, removeEventListener () { } });79
window.scrollTo = () => { };100
window.scrollTo = () => { };80
101
81
const saved = {102
const defaultSaved = {82
token: 'saved-token',103
token: 'saved-token',83
dir: '/data',104
dir: '/data',84
rootPath: '/data',105
rootPath: '/data',85
lastOperationAt: Date.now(),106
lastOperationAt: Date.now(),86
};107
};87
window.localStorage.setItem('filemanager.session.v1', JSON.stringify(saved));108
const effectiveSaved = savedSession === undefined ? defaultSaved : savedSession;109
if (effectiveSaved)110
{111
window.localStorage.setItem('filemanager.session.v1', JSON.stringify(effectiveSaved));112
}88
window.addEventListener('error', (event) => runtimeErrors.push(event.error || new Error(event.message)));113
window.addEventListener('error', (event) => runtimeErrors.push(event.error || new Error(event.message)));89
window.addEventListener('unhandledrejection', (event) => runtimeErrors.push(event.reason || new Error('Unhandled rejection')));114
window.addEventListener('unhandledrejection', (event) => runtimeErrors.push(event.reason || new Error('Unhandled rejection')));90
},115
},@@ -139,4 +164,55 @@ describe('page load smoke test', () =>139
164
140
dom.window.close();165
dom.window.close();141
});166
});167
168
test('in Home, root tiles single-click focus and double-click open', async () =>169
{170
rootsFixture = [171
{ label: 'Root A', path: '/data-a' },172
{ label: 'Root B', path: '/data-b' },173
];174
listFixture = {175
'/data-a': [176
{177
name: 'docs',178
path: '/data-a/docs',179
isDir: true,180
size: 0,181
mtime: Date.now(),182
},183
],184
};185
spaceFixture = {186
'/data-a': { usedBytes: 2048, freeBytes: 4096 },187
'/data-b': { usedBytes: 1024, freeBytes: 8192 },188
};189
190
const { dom, runtimeErrors } = await bootClient({191
savedSession: {192
token: 'saved-token',193
dir: null,194
rootPath: null,195
lastOperationAt: Date.now(),196
},197
});198
expect(runtimeErrors).toEqual([]);199
200
const rootTile = dom.window.document.querySelector('.file-item[data-path="/data-a"]');201
expect(rootTile).toBeTruthy();202
203
rootTile.dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true }));204
await new Promise(resolve => dom.window.setTimeout(resolve, 40));205
206
expect(rootTile.classList.contains('selected')).toBe(true);207
expect(dom.window.document.querySelector('.file-item[data-path="/data-b"]')).toBeTruthy();208
expect(dom.window.document.getElementById('sidebar-meta').textContent).toContain('Used');209
expect(dom.window.document.getElementById('sidebar-meta').textContent).toContain('Remaining');210
211
rootTile.dispatchEvent(new dom.window.MouseEvent('dblclick', { bubbles: true }));212
await new Promise(resolve => dom.window.setTimeout(resolve, 80));213
214
expect(dom.window.document.querySelector('.file-item[data-path="/data-a/docs"]')).toBeTruthy();215
216
dom.window.close();217
});142
});218
});