Skip to content

TagSpaces is an offline, open source, document manager with tagging support

add moveDirectoryPromise in cordova for files

sytolke3d7deeeb37d
diff --git a/package-lock.json b/package-lock.json
index fdbe58d28..f619fc7b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,7 +83,7 @@
"uuid": "^9.0.0"
},
"devDependencies": {
- "@electron/notarize": "^2.1.0",
+ "@electron/notarize": "^2.2.0",
"@electron/rebuild": "^3.3.0",
"@playwright/test": "1.38.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
@@ -119,7 +119,7 @@
"detect-port": "^1.5.1",
"dotenv-webpack": "^8.0.1",
"electron": "^26.2.1",
- "electron-builder": "^24.6.4",
+ "electron-builder": "^24.9.1",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.2.2",
"electronmon": "^2.0.2",
@@ -13980,9 +13980,9 @@
"dev": true
},
"node_modules/7zip-bin": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz",
- "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
+ "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==",
"dev": true
},
"node_modules/abab": {
@@ -14421,9 +14421,9 @@
"dev": true
},
"node_modules/app-builder-lib": {
- "version": "24.6.4",
- "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
- "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
+ "version": "24.9.1",
+ "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.9.1.tgz",
+ "integrity": "sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==",
"dev": true,
"dependencies": {
"@develar/schema-utils": "~2.6.5",
@@ -14432,15 +14432,15 @@
"@electron/universal": "1.4.1",
"@malept/flatpak-bundler": "^0.4.0",
"@types/fs-extra": "9.0.13",
- "7zip-bin": "~5.1.1",
+ "7zip-bin": "~5.2.0",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.9",
- "builder-util": "24.5.0",
- "builder-util-runtime": "9.2.1",
+ "builder-util": "24.8.1",
+ "builder-util-runtime": "9.2.3",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.3.4",
"ejs": "^3.1.8",
- "electron-publish": "24.5.0",
+ "electron-publish": "24.8.1",
"form-data": "^4.0.0",
"fs-extra": "^10.1.0",
"hosted-git-info": "^4.1.0",
@@ -14488,6 +14488,19 @@
"node": ">=10"
}
},
+ "node_modules/app-builder-lib/node_modules/builder-util-runtime": {
+ "version": "9.2.3",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+ "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/app-builder-lib/node_modules/jsonfile": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -14500,6 +14513,12 @@
"graceful-fs": "^4.1.6"
}
},
+ "node_modules/app-builder-lib/node_modules/sax": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+ "dev": true
+ },
"node_modules/appdirsjs": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/appdirsjs/-/appdirsjs-1.2.7.tgz",
@@ -15887,16 +15906,16 @@
"dev": true
},
"node_modules/builder-util": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.5.0.tgz",
- "integrity": "sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==",
+ "version": "24.8.1",
+ "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.8.1.tgz",
+ "integrity": "sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==",
"dev": true,
"dependencies": {
"@types/debug": "^4.1.6",
- "7zip-bin": "~5.1.1",
+ "7zip-bin": "~5.2.0",
"app-builder-bin": "4.0.0",
"bluebird-lst": "^1.0.9",
- "builder-util-runtime": "9.2.1",
+ "builder-util-runtime": "9.2.3",
"chalk": "^4.1.2",
"cross-spawn": "^7.0.3",
"debug": "^4.3.4",
@@ -15927,6 +15946,25 @@
"resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
"integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
},
+ "node_modules/builder-util/node_modules/builder-util-runtime": {
+ "version": "9.2.3",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+ "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/builder-util/node_modules/sax": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+ "dev": true
+ },
"node_modules/builtin-status-codes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -19280,14 +19318,14 @@
}
},
"node_modules/dmg-builder": {
- "version": "24.6.4",
- "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
- "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
+ "version": "24.9.1",
+ "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.9.1.tgz",
+ "integrity": "sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==",
"dev": true,
"dependencies": {
- "app-builder-lib": "24.6.4",
- "builder-util": "24.5.0",
- "builder-util-runtime": "9.2.1",
+ "app-builder-lib": "24.9.1",
+ "builder-util": "24.8.1",
+ "builder-util-runtime": "9.2.3",
"fs-extra": "^10.1.0",
"iconv-lite": "^0.6.2",
"js-yaml": "^4.1.0"
@@ -19296,6 +19334,25 @@
"dmg-license": "^1.0.11"
}
},
+ "node_modules/dmg-builder/node_modules/builder-util-runtime": {
+ "version": "9.2.3",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+ "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/dmg-builder/node_modules/sax": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+ "dev": true
+ },
"node_modules/dmg-license": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
@@ -19601,16 +19658,16 @@
}
},
"node_modules/electron-builder": {
- "version": "24.6.4",
- "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
- "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
+ "version": "24.9.1",
+ "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.9.1.tgz",
+ "integrity": "sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==",
"dev": true,
"dependencies": {
- "app-builder-lib": "24.6.4",
- "builder-util": "24.5.0",
- "builder-util-runtime": "9.2.1",
+ "app-builder-lib": "24.9.1",
+ "builder-util": "24.8.1",
+ "builder-util-runtime": "9.2.3",
"chalk": "^4.1.2",
- "dmg-builder": "24.6.4",
+ "dmg-builder": "24.9.1",
"fs-extra": "^10.1.0",
"is-ci": "^3.0.0",
"lazy-val": "^1.0.5",
@@ -19626,6 +19683,25 @@
"node": ">=14.0.0"
}
},
+ "node_modules/electron-builder/node_modules/builder-util-runtime": {
+ "version": "9.2.3",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+ "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/electron-builder/node_modules/sax": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+ "dev": true
+ },
"node_modules/electron-context-menu": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.6.1.tgz",
@@ -19776,20 +19852,39 @@
}
},
"node_modules/electron-publish": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.5.0.tgz",
- "integrity": "sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==",
+ "version": "24.8.1",
+ "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.8.1.tgz",
+ "integrity": "sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==",
"dev": true,
"dependencies": {
"@types/fs-extra": "^9.0.11",
- "builder-util": "24.5.0",
- "builder-util-runtime": "9.2.1",
+ "builder-util": "24.8.1",
+ "builder-util-runtime": "9.2.3",
"chalk": "^4.1.2",
"fs-extra": "^10.1.0",
"lazy-val": "^1.0.5",
"mime": "^2.5.2"
}
},
+ "node_modules/electron-publish/node_modules/builder-util-runtime": {
+ "version": "9.2.3",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+ "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/electron-publish/node_modules/sax": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+ "dev": true
+ },
"node_modules/electron-to-chromium": {
"version": "1.4.583",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz",
diff --git a/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx b/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx
index eae010a74..732ab8afd 100644
--- a/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx
+++ b/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx
@@ -259,14 +259,12 @@ function MoveCopyFilesDialog(props: Props) {
<Button data-tid="closeMoveCopyDialog" onClick={() => onClose()}>
{t('core:cancel')}
</Button>
- <Tooltip
- title={t(AppConfig.isAndroid ? 'core:platformImplMissing' : '')}
- >
+ {(!AppConfig.isAndroid || selectedDirs.length === 0) && (
<Button
data-tid="confirmMoveFiles"
disabled={
!targetPath ||
- AppConfig.isAndroid ||
+ // AppConfig.isAndroid ||
targetPath === currentDirectoryPath
}
onClick={() => handleCopyMove(false)}
@@ -275,7 +273,7 @@ function MoveCopyFilesDialog(props: Props) {
>
{t('core:moveEntriesButton')}
</Button>
- </Tooltip>
+ )}
<ConfirmDialog
open={entriesExistPath !== undefined}
onClose={() => {
diff --git a/src/renderer/components/dialogs/ObjectStoreForm.tsx b/src/renderer/components/dialogs/ObjectStoreForm.tsx
index f78252854..990a87ec1 100644
--- a/src/renderer/components/dialogs/ObjectStoreForm.tsx
+++ b/src/renderer/components/dialogs/ObjectStoreForm.tsx
@@ -290,11 +290,11 @@ function ObjectStoreForm(props: Props) {
freeSolo
onChange={handleRegionChange}
onInputChange={handleRegionChange}
- placeholder={t('core:regionSearch')}
renderInput={(params) => (
<TextField
{...params}
label={t('core:regionSearch')}
+ placeholder={t('core:regionSearch')}
margin="normal"
/>
)}