Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
"build": "vite build",
"dev": "vite build --mode development --watch",
"serve": "vite --mode development --host 127.0.0.1",
"check": "pnpm run format && pnpm run lint && pnpm run typecheck",
"lint": "biome lint src styles",
"lint:fix": "biome lint --write src styles",
"format": "biome format .",
"format:fix": "biome format --write .",
"typecheck": "vue-tsc --noEmit"
"typecheck": "vue-tsc --noEmit",
"prepare": "simple-git-hooks"
},
"dependencies": {
"@betahuhn/feedback-js": "^2.1.25",
Expand All @@ -43,11 +45,15 @@
"@nextcloud/vite-config": "^2.5.2",
"@types/node": "^24.5.2",
"browserslist": "^4.26.2",
"simple-git-hooks": "^2.13.1",
"typescript": "^5.9.3",
"vite": "^7.3.1",
"vue-tsc": "^3.0.8"
},
"browserslist": [
"extends @nextcloud/browserslist-config"
]
],
"simple-git-hooks": {
"pre-commit": "pnpm run check"
}
}
9 changes: 9 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/app/files/actions/archive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ registerFileActionCompat({
"Restore",
UnarchiveSvg,
);
if (!path) {
return;
}
const destination = FilesHelper.getPathParts(path)
.slice(1)
.join("/");
Expand Down
7 changes: 6 additions & 1 deletion src/app/files/actions/export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ registerFileActionCompat({
callback: async () => downloadMetadata(node),
})
.build()
.show();
.show()
.catch((error) => {
if (!FilesHelper.isDialogCancelError(error)) {
throw error;
}
});
},
});

Expand Down
3 changes: 3 additions & 0 deletions src/app/files/actions/move.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ registerFileActionCompat({
async exec({ nodes }) {
const node = nodes[0];
const path = await FilesHelper.locationPicker(node, "Move", MoveSvg);
if (!path) {
return;
}
const destination = FilesHelper.getPathParts(path).slice(1).join("/");
await axios({
method: "post",
Expand Down
44 changes: 42 additions & 2 deletions src/app/files/actions/reference.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,49 @@ registerFileActionCompat({
variant: "secondary",
icon: SvgHelper.convert(OpenSvg),
callback: () => {
window.open(gatewayUrl, "_blank", "noopener,noreferrer");
void new Dialog(
t(
"files_external_ethswarm",
"Access on Swarm Gateway?",
),
t(
"files_external_ethswarm",
"You are about to access this file through gateway.ethswarm.org, a public Swarm gateway used to access Swarm content. Please note this opens an external link and can leave network and server access traces to your swarm reference.",
),
[
{
label: t("files_external_ethswarm", "Cancel"),
variant: "secondary",
callback: () => null,
},
{
label: t("files_external_ethswarm", "Proceed"),
variant: "primary",
icon: SvgHelper.convert(OpenSvg),
callback: () => {
window.open(
gatewayUrl,
"_blank",
"noopener,noreferrer",
);
},
},
],
)
.show()
.catch((error) => {
if (!FilesHelper.isDialogCancelError(error)) {
throw error;
}
});
},
},
]).show();
])
.show()
.catch((error) => {
if (!FilesHelper.isDialogCancelError(error)) {
throw error;
}
});
},
});
31 changes: 30 additions & 1 deletion src/util/FilesHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import SvgHelper from "@/util/SvgHelper";
const FilesHelper = {
isSwarmNode: (nodes) =>
getMainNode(nodes).attributes["ethswarm-node"] !== undefined,
isDialogCancelError: (error) => isDialogCancelError(error),
getSwarmRef: (nodes) => getSwarmRef(nodes),
hasSwarmRef: (nodes) => getSwarmRef(nodes) !== undefined,
canUnshareOnly: (nodes) => {
Expand Down Expand Up @@ -93,7 +94,13 @@ const FilesHelper = {
),
)
.build()
.pick(),
.pick()
.catch((error) => {
if (isDialogCancelError(error)) {
return null;
}
throw error;
}),
downloadFile: (blob, filename) => {
const url = URL.createObjectURL(blob);
const a = document.createElement("a");
Expand Down Expand Up @@ -140,4 +147,26 @@ function isArchive(nodes) {
return getPathParts(nodes)[1] === "Archive - HejBit";
}

function isDialogCancelError(error) {
if (error === null || typeof error === "undefined") {
return true;
}

if (typeof error === "string") {
return /cancel|abort|dismiss|closed|no nodes selected/i.test(error);
}

if (typeof error === "object") {
const message = "message" in error ? String(error.message ?? "") : "";
const name = "name" in error ? String(error.name ?? "") : "";

return (
/abort|cancel|dismiss|closed/i.test(name) ||
/cancel|abort|dismiss|closed|no nodes selected/i.test(message)
);
}

return false;
}

export default FilesHelper;
12 changes: 6 additions & 6 deletions vendor-bin/sentry/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading