From 9f2c9caee10ce586c8a42bcafe4374a8214b73f5 Mon Sep 17 00:00:00 2001 From: Abdullah Atta Date: Mon, 24 Aug 2026 09:44:07 +0500 Subject: [PATCH] web: ask password again if wrong during import --- apps/web/package-lock.json | 66 +++++++++---------- apps/web/package.json | 2 +- .../components/file-provider-handler.tsx | 8 ++- packages/intl/locale/en.po | 4 +- packages/intl/locale/pseudo-LOCALE.po | 2 +- packages/intl/src/strings.ts | 2 +- 6 files changed, 45 insertions(+), 39 deletions(-) diff --git a/apps/web/package-lock.json b/apps/web/package-lock.json index a7df669a3..d877ce882 100644 --- a/apps/web/package-lock.json +++ b/apps/web/package-lock.json @@ -20,7 +20,7 @@ "@lingui/react": "5.1.2", "@mdi/js": "7.4.47", "@mdi/react": "1.6.1", - "@notesnook-importer/core": "^2.6.0", + "@notesnook-importer/core": "^2.6.1", "@notesnook/common": "file:../../packages/common", "@notesnook/core": "file:../../packages/core", "@notesnook/crypto": "file:../../packages/crypto", @@ -2921,12 +2921,12 @@ } }, "node_modules/@notesnook-importer/applenotes": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/applenotes/-/applenotes-1.1.0.tgz", - "integrity": "sha512-6mV6QtYqNqomyHJsWA926I1X8BsoM/6R3X8cdF7d4sg5cfkjENt2hoayBiW1ONK92MM9rU6mbJlqDSDEDinXPg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/applenotes/-/applenotes-1.1.1.tgz", + "integrity": "sha512-an3qV59xdHU24kuZr0UZUIrIF/5nqzhINw0wtKRE9NEFYItywoTbFI8TnOTaJu6KNCDznYSQ6JoP5XLX9bo+5A==", "license": "GPL-3.0-or-later", "dependencies": { - "@notesnook-importer/types": "^1.1.0", + "@notesnook-importer/types": "^1.1.1", "entities": "^4.4.0", "fflate": "^0.7.4", "protobufjs": "^8.7.2" @@ -2951,18 +2951,18 @@ "license": "MIT" }, "node_modules/@notesnook-importer/core": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/core/-/core-2.6.0.tgz", - "integrity": "sha512-HjVvNgH6hFDMM/m3i+7GNDLMfcqAvNessDMS+JBWp70k8w8m1KltkVL2E6bng/zRRG6hisJJMSQzFOwpTBS2Ag==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/core/-/core-2.6.1.tgz", + "integrity": "sha512-RuIeYZbGk26lq/Q8A6PernlIS7fIJWgmwhtA069AhutpzojAx57GkKF6Zmo6TWa7eID0mmxksHrcGDuaOLZzcA==", "license": "GPL-3.0-or-later", "dependencies": { - "@notesnook-importer/applenotes": "^1.1.0", - "@notesnook-importer/enex": "^2.5.0", - "@notesnook-importer/onenote": "^1.1.0", - "@notesnook-importer/samsung-notes": "^1.1.0", - "@notesnook-importer/storage": "^2.5.0", - "@notesnook-importer/types": "^1.1.0", - "@notesnook-importer/znel": "^2.5.0", + "@notesnook-importer/applenotes": "^1.1.1", + "@notesnook-importer/enex": "^2.5.1", + "@notesnook-importer/onenote": "^1.1.1", + "@notesnook-importer/samsung-notes": "^1.1.1", + "@notesnook-importer/storage": "^2.5.1", + "@notesnook-importer/types": "^1.1.1", + "@notesnook-importer/znel": "^2.5.1", "@stablelib/chacha20poly1305": "^1.0.1", "@streamparser/json": "^0.0.10", "@zip.js/zip.js": "^2.7.32", @@ -3020,9 +3020,9 @@ } }, "node_modules/@notesnook-importer/enex": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/enex/-/enex-2.5.0.tgz", - "integrity": "sha512-oqlg0SCqwTDmqGdi/p6m5FpcaKspIhDG08g/2fm2xIAYH95WJlyS4nb4pygyJGsywrq1USgIQ/Bup9hZ4jJKeA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/enex/-/enex-2.5.1.tgz", + "integrity": "sha512-faQwGE58RFJaY5P/6C2jPuO/coycpAFwQgFE5ixPqvlSzRCCuA7+IBnlnn6BbsBIeFoaplEThP9hEYo9kYqoXg==", "license": "GPL-3.0-or-later", "dependencies": { "base64-js": "^1.5.1", @@ -3035,9 +3035,9 @@ } }, "node_modules/@notesnook-importer/onenote": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/onenote/-/onenote-1.1.0.tgz", - "integrity": "sha512-V0cFx4QsC873wJsh5ONNG/pTAdTN+9LBYIAEIi+U6ZubTfm8Y2zIn/eBabVpFO62OvdD551EcFIbto5CTGJOrg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/onenote/-/onenote-1.1.1.tgz", + "integrity": "sha512-OuC7UMUxoSTmFgtKm0pxNc6gNWnZoF2h3NX78Xo8qARHiz/6+BCmuN/1M/R33CvvpMsOIzLgbhAM248UUxW80A==", "license": "GPL-3.0-or-later", "dependencies": { "fflate": "^0.7.4" @@ -3050,9 +3050,9 @@ "license": "MIT" }, "node_modules/@notesnook-importer/samsung-notes": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/samsung-notes/-/samsung-notes-1.1.0.tgz", - "integrity": "sha512-2/2WbDqBBYQ46qkpPf4M5mdgHgSsjBlyTxWQsr0jv5l2j9TedxKE6NwmMxlrRJFkLxNBnNw3Yj1E437h7AJpqA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/samsung-notes/-/samsung-notes-1.1.1.tgz", + "integrity": "sha512-XbpBqd9jR+cAkaNO/JhYiq+0Xb+9aHWaIRYg3+agvnKRFwGHqR7fyqfIaWdOGyugHG4Jtu92Ee1F5unJRROTuQ==", "license": "GPL-3.0-or-later", "dependencies": { "fflate": "^0.7.4" @@ -3065,21 +3065,21 @@ "license": "MIT" }, "node_modules/@notesnook-importer/storage": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/storage/-/storage-2.5.0.tgz", - "integrity": "sha512-7HpvJkafCs3Ba0DdzZA8QecLfdN7D7V3g4773/iwTsRxa07YTRcavmV2jBGY6DuMaTkJio/Q/M/kSI0m5yiU6A==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/storage/-/storage-2.5.1.tgz", + "integrity": "sha512-XZswbzbAjjCbT/u6BgfjCss+WX1lx50YMIyO4PHji8zIxwvkN55eMS6+BqQ+hpw7CMT/zyrSrZmsdhnjKJhRuQ==", "license": "GPL-3.0-or-later" }, "node_modules/@notesnook-importer/types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/types/-/types-1.1.0.tgz", - "integrity": "sha512-hoS4jHoaXiFnbUTElxYdIY85BOqf1wke0B+Oe5ExbHuFdUDOI0AtZWyCwArG9t0vfUlYmhJ1v27QHOfeE1kxQQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/types/-/types-1.1.1.tgz", + "integrity": "sha512-urgH9MBGddrL0oII5miJ21W/ocXad3PRWSTEMHmShwU1zNpwByZupnGrKU1Cyew+p0BN51qJ7r1SuGwL7jh6LQ==", "license": "GPL-3.0-or-later" }, "node_modules/@notesnook-importer/znel": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@notesnook-importer/znel/-/znel-2.5.0.tgz", - "integrity": "sha512-8Tx+fcAPJQeyjJpk9+mrak4c+v186IExgpy16I25fRJwl35k5B77NS0gWNOCFX80levInoX8FoXNp8IanVb8Rg==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@notesnook-importer/znel/-/znel-2.5.1.tgz", + "integrity": "sha512-C9i9WDia16HCIfvCLDavqAhL/7Mt7/WMY2vb574UBLwrqi3olH1J9GFGD9gweoNcc48WUFgE2XRd0eLjWxVxkg==", "license": "GPL-3.0-or-later", "dependencies": { "base64-js": "^1.5.1", diff --git a/apps/web/package.json b/apps/web/package.json index 30eaa3b66..efd25896f 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -18,7 +18,7 @@ "@lingui/react": "5.1.2", "@mdi/js": "7.4.47", "@mdi/react": "1.6.1", - "@notesnook-importer/core": "^2.6.0", + "@notesnook-importer/core": "^2.6.1", "@notesnook/common": "file:../../packages/common", "@notesnook/core": "file:../../packages/core", "@notesnook/crypto": "file:../../packages/crypto", diff --git a/apps/web/src/components/importer/components/file-provider-handler.tsx b/apps/web/src/components/importer/components/file-provider-handler.tsx index 711efc3de..886c30681 100644 --- a/apps/web/src/components/importer/components/file-provider-handler.tsx +++ b/apps/web/src/components/importer/components/file-provider-handler.tsx @@ -280,7 +280,13 @@ export function FileProviderHandler(props: FileProviderHandlerProps) { > {files.map((file, index) => ( t`Alignment`, browserStorageQuotaReached: () => t`Browser storage quota reached. Please delete some attachments from the attachment manager or clear some local data to free up space.`, - passwordFor: (filename: string) => t`Enter password for ${filename}`, + passwordFor: (filename: string) => t`Enter password for "${filename}"`, selectFolder: () => t`Select folder` };