Skip to content

Commit eee7611

Browse files
committed
Refactor conflict checking logic in upload utility
- Introduced `fetchConflictEntries` to streamline fetching server conflict entries based on action type (upload vs copy/move). - Updated `checkConflict` to utilize the new fetching logic and improved conflict mapping with `buildConflictMap`. - Enhanced unit tests for conflict checking to ensure correct behavior for both file and directory conflicts. - Updated dependencies in go.mod and go.sum for various packages to their latest versions. - Added security warning in authentication documentation regarding handling user-controlled input in hook scripts.
1 parent ba1da3d commit eee7611

9 files changed

Lines changed: 139 additions & 384 deletions

File tree

frontend/src/components/prompts/__tests__/copy-move-conflict.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ const event = {
7171
describe("copy and move conflict prompts", () => {
7272
beforeEach(() => {
7373
vi.clearAllMocks();
74-
vi.mocked(checkConflict).mockResolvedValue(conflict);
74+
vi.mocked(checkConflict).mockResolvedValue(
75+
conflict as ConflictingResource[]
76+
);
7577
});
7678

7779
it("waits for copy conflict detection before calling the copy API", async () => {

frontend/src/css/epubReader.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929

3030
.epub-reader .tocButton {
3131
color: var(--text);
32+
/*
33+
* vue-reader positions the TOC toggle at top: 10px, which lands under the
34+
* fixed 4em header bar (see .header) — so clicks hit the header's Close
35+
* button instead of opening the table of contents. Push it just below the
36+
* header, tracking the header's height so it stays clear if that changes.
37+
*/
38+
top: calc(4em + 10px);
3239
}
3340

3441
.epub-reader .tocButton.tocButtonExpanded {

frontend/src/i18n/pt-pt.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
"newPasswordConfirm": "Confirmar a sua palavra-passe",
240240
"newUser": "Novo Utilizador",
241241
"password": "Palavra-passe",
242-
"passwordUpdated": "Palavras-passe não coincidem!",
242+
"passwordUpdated": "Palavra-passe atualizada!",
243243
"path": "Caminho",
244244
"perm": {
245245
"create": "Criar ficheiros e pastas",

frontend/src/i18n/pt.json

Lines changed: 0 additions & 310 deletions
This file was deleted.

0 commit comments

Comments
 (0)