Skip to content

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

Hide transfer sidecar files for local files

Stanimirfa9bf02e7eb2
diff --git a/package-lock.json b/package-lock.json
index b3cea9413..9abf01db5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,10 +21,10 @@
"@mui/lab": "7.0.0-beta.14",
"@mui/material": "^7.1.2",
"@mui/x-date-pickers": "^8.6.0",
- "@tagspaces/tagspaces-common": "4.5.91",
- "@tagspaces/tagspaces-common-aws3": "4.5.91",
- "@tagspaces/tagspaces-common-cordova": "4.5.91",
- "@tagspaces/tagspaces-indexer": "4.5.91",
+ "@tagspaces/tagspaces-common": "4.5.92",
+ "@tagspaces/tagspaces-common-aws3": "4.5.92",
+ "@tagspaces/tagspaces-common-cordova": "4.5.92",
+ "@tagspaces/tagspaces-indexer": "4.5.92",
"aws-amplify": "^4.3.8",
"clone": "^2.1.2",
"coordinate-parser": "^1.0.7",
@@ -19044,9 +19044,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.91.tgz",
- "integrity": "sha512-I23VFFYkz1B79ggJIhBPPD8IwT0LQB/d63JKKuazLZeAXz74rjfcX9TV7JuxcFfhiq4sNZoCCqeOkVI/YdA1gQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.92.tgz",
+ "integrity": "sha512-uFZYd7x5lxiJtwvqr7YgebPeO9iPZbSKTRb1UfUcb7X0UF81xe5+zA4QnlO3p25L0wSMF0uEvDBmUyHoEEoZ4g==",
"license": "MIT",
"dependencies": {
"dompurify": "^3.2.3",
@@ -19058,25 +19058,25 @@
}
},
"node_modules/@tagspaces/tagspaces-common-aws3": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.91.tgz",
- "integrity": "sha512-NhjY36T6zC1zyVkxdfl+xQHZZeGB7yNYtSsoaDpxVGv5AdoAsY1TQ4TrhkEKnN2RwqaFr9B2uYc/NgrX+rKoaw==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.92.tgz",
+ "integrity": "sha512-GJxfrLF1GDy4RItHnMz5nMhAFLNXg+LGDZfx71HjcKGq5sazMBMbzA+2I+E6AfKOLSyJPvqaOPX4Zy7uiFIQJA==",
"license": "MIT",
"dependencies": {
"@aws-sdk/client-s3": "^3.665.0",
"@aws-sdk/lib-storage": "^3.665.0",
"@aws-sdk/s3-request-presigner": "^3.665.0",
- "@tagspaces/tagspaces-common": "^4.5.91",
+ "@tagspaces/tagspaces-common": "^4.5.92",
"crypto-js": "^4.2.0"
}
},
"node_modules/@tagspaces/tagspaces-common-cordova": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.91.tgz",
- "integrity": "sha512-HRKraX5flcxRxknQZv2mZHRsHMQkBdOnbe+0b8Hx3nhBxIXyDiy9C4VpwljL5ACPe4maAbrEwF3hF803pnEAlw==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.92.tgz",
+ "integrity": "sha512-T+MVPuh33JU0x+qAmRDOdG2fGRXnmZdOLFX5tuPEocYcT7nzx5ZJ7S1drqiRGFzHEHE5zPFBngLKhjHm8VA/9Q==",
"license": "MIT",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.91"
+ "@tagspaces/tagspaces-common": "^4.5.92"
}
},
"node_modules/@tagspaces/tagspaces-common/node_modules/cssstyle": {
@@ -19283,12 +19283,12 @@
}
},
"node_modules/@tagspaces/tagspaces-indexer": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.91.tgz",
- "integrity": "sha512-NLcEcVmFyuVBgQYU3SxlqTIRBu6eNd/6YpHaXDAk9pEonauzLfJFvdU5rkQ3Ggs4KkW+bRQnXxceFw1/fdVerQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.92.tgz",
+ "integrity": "sha512-ph4P/c+4gQi9s87zOdyD0fdp9UmcObnSwgdKQeOh+lyAzb/1DYdTmnpxijJ7rrZiQMh2YIM47vi7ZKpySvCNyA==",
"license": "MIT",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.91"
+ "@tagspaces/tagspaces-common": "^4.5.92"
}
},
"node_modules/@tagspacespro/tagspacespro": {
diff --git a/package.json b/package.json
index f284f5681..f70176bd3 100644
--- a/package.json
+++ b/package.json
@@ -172,10 +172,10 @@
"@mui/lab": "7.0.0-beta.14",
"@mui/material": "^7.1.2",
"@mui/x-date-pickers": "^8.6.0",
- "@tagspaces/tagspaces-common": "4.5.91",
- "@tagspaces/tagspaces-common-aws3": "4.5.91",
- "@tagspaces/tagspaces-common-cordova": "4.5.91",
- "@tagspaces/tagspaces-indexer": "4.5.91",
+ "@tagspaces/tagspaces-common": "4.5.92",
+ "@tagspaces/tagspaces-common-aws3": "4.5.92",
+ "@tagspaces/tagspaces-common-cordova": "4.5.92",
+ "@tagspaces/tagspaces-indexer": "4.5.92",
"aws-amplify": "^4.3.8",
"clone": "^2.1.2",
"coordinate-parser": "^1.0.7",
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 3881eaaaa..f864dc526 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -12,8 +12,8 @@
"dependencies": {
"@elife/pm2": "3.6.1",
"@tagspaces/extensions": "1.0.197",
- "@tagspaces/tagspaces-common-node": "4.5.91",
- "@tagspaces/tagspaces-ws": "4.5.91",
+ "@tagspaces/tagspaces-common-node": "4.5.92",
+ "@tagspaces/tagspaces-ws": "4.5.92",
"sharp": "0.32.6",
"ws": "8.18.1"
},
@@ -160,9 +160,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.91.tgz",
- "integrity": "sha512-I23VFFYkz1B79ggJIhBPPD8IwT0LQB/d63JKKuazLZeAXz74rjfcX9TV7JuxcFfhiq4sNZoCCqeOkVI/YdA1gQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.92.tgz",
+ "integrity": "sha512-uFZYd7x5lxiJtwvqr7YgebPeO9iPZbSKTRb1UfUcb7X0UF81xe5+zA4QnlO3p25L0wSMF0uEvDBmUyHoEEoZ4g==",
"dependencies": {
"dompurify": "^3.2.3",
"dotenv": "^16.0.2",
@@ -173,22 +173,22 @@
}
},
"node_modules/@tagspaces/tagspaces-common-node": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.91.tgz",
- "integrity": "sha512-jGmlZAGHMoWDBrd+vqPxCkDGMpo6P7ZZrxwlwBSMH+3RJmPXmhT3O5MeHctKIIxmyE4Klnd6AogyuaHMHokTTA==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.92.tgz",
+ "integrity": "sha512-z2wdZJSWscCP5cJafLDY6zG/lOc6J4UOPnpDaXT0F8TCrO4zNMchdL2jd+BC0Jmtw5vY7B04PePYxKcFM0UXfA==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.91",
+ "@tagspaces/tagspaces-common": "^4.5.92",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0"
}
},
"node_modules/@tagspaces/tagspaces-indexer": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.91.tgz",
- "integrity": "sha512-NLcEcVmFyuVBgQYU3SxlqTIRBu6eNd/6YpHaXDAk9pEonauzLfJFvdU5rkQ3Ggs4KkW+bRQnXxceFw1/fdVerQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.92.tgz",
+ "integrity": "sha512-ph4P/c+4gQi9s87zOdyD0fdp9UmcObnSwgdKQeOh+lyAzb/1DYdTmnpxijJ7rrZiQMh2YIM47vi7ZKpySvCNyA==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.91"
+ "@tagspaces/tagspaces-common": "^4.5.92"
}
},
"node_modules/@tagspaces/tagspaces-pdf-extraction": {
@@ -209,25 +209,25 @@
}
},
"node_modules/@tagspaces/tagspaces-workers": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.91.tgz",
- "integrity": "sha512-3eEKHaqDBe6oDUI4c2027AlPlR/pkck+cWMStzEPMkVG6U+gtugqQ5y4xUAOdyEXEXWHEsz9JrEb5WQ/a38oPQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.92.tgz",
+ "integrity": "sha512-q/uq3gnYx4CrvYPOWTeUe38U6jlib5AZG9lZON+2/N+dwV/a8Mxro9xB3GVoHGH5pERjGTJ/JOhEVSUIkVAp9w==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.91",
- "@tagspaces/tagspaces-common-node": "^4.5.91",
+ "@tagspaces/tagspaces-common": "^4.5.92",
+ "@tagspaces/tagspaces-common-node": "^4.5.92",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
"@tagspaces/tagspaces-thumbgen-image": "^4.5.60",
"fswin": "^3.24.829"
}
},
"node_modules/@tagspaces/tagspaces-ws": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.91.tgz",
- "integrity": "sha512-ETL7ab45sDujjCSqozl3ZfHqYVPuose5MXB1cnfuItjoNKz6JyOVdBbVsYJiwhfnGLQj4aTdLdOY78cGUSrfZg==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.92.tgz",
+ "integrity": "sha512-0vjy4TAurXqkdFz2VJHJhP4XsrWVDVJN9sQxGKkVShw2Fz9+/0R3XZGgZjYsmtWCmn2zU/MiOY5tog5MnSM3Vg==",
"dependencies": {
- "@tagspaces/tagspaces-indexer": "^4.5.91",
+ "@tagspaces/tagspaces-indexer": "^4.5.92",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
- "@tagspaces/tagspaces-workers": "^4.5.91",
+ "@tagspaces/tagspaces-workers": "^4.5.92",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^9.0.2",
"ws": "^8.18.3"
@@ -1891,9 +1891,9 @@
}
},
"@tagspaces/tagspaces-common": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.91.tgz",
- "integrity": "sha512-I23VFFYkz1B79ggJIhBPPD8IwT0LQB/d63JKKuazLZeAXz74rjfcX9TV7JuxcFfhiq4sNZoCCqeOkVI/YdA1gQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.92.tgz",
+ "integrity": "sha512-uFZYd7x5lxiJtwvqr7YgebPeO9iPZbSKTRb1UfUcb7X0UF81xe5+zA4QnlO3p25L0wSMF0uEvDBmUyHoEEoZ4g==",
"requires": {
"dompurify": "^3.2.3",
"dotenv": "^16.0.2",
@@ -1904,22 +1904,22 @@
}
},
"@tagspaces/tagspaces-common-node": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.91.tgz",
- "integrity": "sha512-jGmlZAGHMoWDBrd+vqPxCkDGMpo6P7ZZrxwlwBSMH+3RJmPXmhT3O5MeHctKIIxmyE4Klnd6AogyuaHMHokTTA==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.92.tgz",
+ "integrity": "sha512-z2wdZJSWscCP5cJafLDY6zG/lOc6J4UOPnpDaXT0F8TCrO4zNMchdL2jd+BC0Jmtw5vY7B04PePYxKcFM0UXfA==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.91",
+ "@tagspaces/tagspaces-common": "^4.5.92",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0"
}
},
"@tagspaces/tagspaces-indexer": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.91.tgz",
- "integrity": "sha512-NLcEcVmFyuVBgQYU3SxlqTIRBu6eNd/6YpHaXDAk9pEonauzLfJFvdU5rkQ3Ggs4KkW+bRQnXxceFw1/fdVerQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.92.tgz",
+ "integrity": "sha512-ph4P/c+4gQi9s87zOdyD0fdp9UmcObnSwgdKQeOh+lyAzb/1DYdTmnpxijJ7rrZiQMh2YIM47vi7ZKpySvCNyA==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.91"
+ "@tagspaces/tagspaces-common": "^4.5.92"
}
},
"@tagspaces/tagspaces-pdf-extraction": {
@@ -1940,25 +1940,25 @@
}
},
"@tagspaces/tagspaces-workers": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.91.tgz",
- "integrity": "sha512-3eEKHaqDBe6oDUI4c2027AlPlR/pkck+cWMStzEPMkVG6U+gtugqQ5y4xUAOdyEXEXWHEsz9JrEb5WQ/a38oPQ==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.92.tgz",
+ "integrity": "sha512-q/uq3gnYx4CrvYPOWTeUe38U6jlib5AZG9lZON+2/N+dwV/a8Mxro9xB3GVoHGH5pERjGTJ/JOhEVSUIkVAp9w==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.91",
- "@tagspaces/tagspaces-common-node": "^4.5.91",
+ "@tagspaces/tagspaces-common": "^4.5.92",
+ "@tagspaces/tagspaces-common-node": "^4.5.92",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
"@tagspaces/tagspaces-thumbgen-image": "^4.5.60",
"fswin": "^3.24.829"
}
},
"@tagspaces/tagspaces-ws": {
- "version": "4.5.91",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.91.tgz",
- "integrity": "sha512-ETL7ab45sDujjCSqozl3ZfHqYVPuose5MXB1cnfuItjoNKz6JyOVdBbVsYJiwhfnGLQj4aTdLdOY78cGUSrfZg==",
+ "version": "4.5.92",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.92.tgz",
+ "integrity": "sha512-0vjy4TAurXqkdFz2VJHJhP4XsrWVDVJN9sQxGKkVShw2Fz9+/0R3XZGgZjYsmtWCmn2zU/MiOY5tog5MnSM3Vg==",
"requires": {
- "@tagspaces/tagspaces-indexer": "^4.5.91",
+ "@tagspaces/tagspaces-indexer": "^4.5.92",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
- "@tagspaces/tagspaces-workers": "^4.5.91",
+ "@tagspaces/tagspaces-workers": "^4.5.92",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^9.0.2",
"ws": "^8.18.3"
diff --git a/release/app/package.json b/release/app/package.json
index b784c4652..e06b638e2 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -19,8 +19,8 @@
"dependencies": {
"@elife/pm2": "3.6.1",
"@tagspaces/extensions": "1.0.197",
- "@tagspaces/tagspaces-common-node": "4.5.91",
- "@tagspaces/tagspaces-ws": "4.5.91",
+ "@tagspaces/tagspaces-common-node": "4.5.92",
+ "@tagspaces/tagspaces-ws": "4.5.92",
"sharp": "0.32.6",
"ws": "8.18.1"
},
diff --git a/src/renderer/components/EntryProperties.tsx b/src/renderer/components/EntryProperties.tsx
index fa38b70b8..3191cd6b6 100644
--- a/src/renderer/components/EntryProperties.tsx
+++ b/src/renderer/components/EntryProperties.tsx
@@ -1164,41 +1164,12 @@ function EntryProperties(props: Props) {
confirmDialogContentTID="confirmResetColorDialogContent"
/>
)}
- {/*{isMoveCopyFilesDialogOpened && (
- <MoveCopyFilesDialog
- key={getUuid()}
- open={isMoveCopyFilesDialogOpened}
- onClose={toggleMoveCopyFilesDialog}
- entries={[
- {
- ...openedEntry,
- isFile: openedEntry.isFile,
- name: entryName,
- tags: [],
- },
- ]}
- />
- )}*/}
- {/*{ThumbnailChooserDialog && (
- <ThumbnailChooserDialog
- open={isFileThumbChooseDialogOpened}
- onClose={toggleThumbFilesDialog}
- entry={openedEntry as TS.FileSystemEntry}
- />
- )}*/}
{showSharingLinkDialog && (
<LinkGeneratorDialog
open={showSharingLinkDialog}
onClose={() => setShowSharingLinkDialog(false)}
/>
)}
- {/*{BgndImgChooserDialog && (
- <BgndImgChooserDialog
- open={isBgndImgChooseDialogOpened}
- onClose={toggleBgndImgDialog}
- entry={openedEntry as TS.FileSystemEntry}
- />
- )}*/}
{CustomBackgroundDialog && (
<CustomBackgroundDialog
color={openedEntry.meta?.color}
diff --git a/src/renderer/components/LocationView.tsx b/src/renderer/components/LocationView.tsx
index 88a9fd984..25d885ab1 100644
--- a/src/renderer/components/LocationView.tsx
+++ b/src/renderer/components/LocationView.tsx
@@ -55,6 +55,7 @@ import { useDispatch } from 'react-redux';
import { actions as AppActions, AppDispatch } from '../reducers/app';
import DragItemTypes from './DragItemTypes';
import TargetMoveFileBox from './TargetMoveFileBox';
+import { useFileUploadContext } from '-/hooks/useFileUploadContext';
interface Props {
location: SubFolder;
@@ -162,17 +163,32 @@ function LocationView(props: Props) {
if (targetLocation.type !== currentLocation.type) {
//locationType.TYPE_CLOUD) {
dispatch(AppActions.resetProgress());
- openFileUploadDialog(targetPath);
- return uploadFiles(
- arrPath,
- targetPath,
- onUploadProgress,
- true,
- false,
- targetLocation.uuid,
- ).catch((error) => {
- console.log('uploadFiles', error);
- });
+ openFileUploadDialog(targetPath, undefined, false);
+ return (
+ uploadFiles(
+ arrPath,
+ targetPath,
+ onUploadProgress,
+ true,
+ false,
+ targetLocation.uuid,
+ )
+ /* todo show meta upload button
+ .then((fsEntries: Array<TS.FileSystemEntry>) => {
+ setMetaUpload(() =>
+ uploadMeta(
+ arrPath,
+ targetPath,
+ onUploadProgress,
+ false,
+ targetLocation.uuid,
+ ),
+ )
+ }*/
+ .catch((error) => {
+ console.log('uploadFiles', error);
+ })
+ );
} else if (targetLocation.type === locationType.TYPE_LOCAL) {
const entries =
selectedEntries.length > 0 ? selectedEntries : [entry];
diff --git a/src/renderer/components/TargetFileBox.tsx b/src/renderer/components/TargetFileBox.tsx
index 9cbb4f2ec..7b4c8ad49 100644
--- a/src/renderer/components/TargetFileBox.tsx
+++ b/src/renderer/components/TargetFileBox.tsx
@@ -89,7 +89,7 @@ function TargetFileBox(props: Props) {
);
}
dispatch(AppActions.resetProgress());
- openFileUploadDialog();
+ openFileUploadDialog(undefined, undefined, true);
const localLocation = findLocalLocation();
const sourceLocationId = localLocation ? localLocation.uuid : undefined;
return uploadFilesAPI(
diff --git a/src/renderer/components/dialogs/FileUploadDialog.tsx b/src/renderer/components/dialogs/FileUploadDialog.tsx
index 3ee724be8..e8c798423 100644
--- a/src/renderer/components/dialogs/FileUploadDialog.tsx
+++ b/src/renderer/components/dialogs/FileUploadDialog.tsx
@@ -52,11 +52,12 @@ interface Props {
open: boolean;
title: string;
targetPath?: string;
+ transferMeta?: boolean;
onClose: () => void;
}
function FileUploadDialog(props: Props) {
- const { open = false, title, onClose } = props;
+ const { open = false, transferMeta = false, title, onClose } = props;
const { t } = useTranslation();
const dispatch: AppDispatch = useDispatch();
const theme = useTheme();
@@ -273,7 +274,7 @@ function FileUploadDialog(props: Props) {
<TsDialogActions>
{progress && progress.length > 0 && !haveProgress && (
<>
- {AppConfig.isElectron && (
+ {transferMeta && AppConfig.isElectron && (
<TsButton
data-tid="uploadMetaTID"
onClick={() => {
diff --git a/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx b/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx
index b69559ef6..ec9f56122 100644
--- a/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx
+++ b/src/renderer/components/dialogs/MoveCopyFilesDialog.tsx
@@ -104,8 +104,9 @@ function MoveCopyFilesDialog(props: Props) {
function handleCopy() {
dispatch(AppActions.resetProgress());
- openFileUploadDialog(undefined, 'copyEntriesTitle');
+ openFileUploadDialog(undefined, 'copyEntriesTitle', false); //selectedFiles.length > 0);
if (selectedFiles.length > 0) {
+ //todo use uploadFilesAPI && transferMeta = true
copyFiles(
selectedFiles,
targetPath,
@@ -143,7 +144,7 @@ function MoveCopyFilesDialog(props: Props) {
}
if (selectedDirs.length > 0) {
dispatch(AppActions.resetProgress());
- openFileUploadDialog(undefined, 'moveEntriesTitle');
+ openFileUploadDialog(undefined, 'moveEntriesTitle', false);
moveDirs(
getEntriesCount(selectedDirs),
targetPath,
diff --git a/src/renderer/components/dialogs/hooks/FileUploadDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/FileUploadDialogContextProvider.tsx
index d1c284a38..d4f720369 100644
--- a/src/renderer/components/dialogs/hooks/FileUploadDialogContextProvider.tsx
+++ b/src/renderer/components/dialogs/hooks/FileUploadDialogContextProvider.tsx
@@ -29,7 +29,11 @@ import { getProgress } from '-/reducers/app';
import useFirstRender from '-/utils/useFirstRender';
type FileUploadDialogContextData = {
- openFileUploadDialog: (targetPath?: string, dialogTitle?: string) => void;
+ openFileUploadDialog: (
+ targetPath?: string,
+ dialogTitle?: string,
+ transferMeta?: boolean,
+ ) => void;
closeFileUploadDialog: () => void;
};
@@ -48,6 +52,7 @@ export const FileUploadDialogContextProvider = ({
}: FileUploadDialogContextProviderProps) => {
const open = useRef<boolean>(false);
const targetPath = useRef<string>(undefined);
+ const transferMeta = useRef<boolean>(undefined);
const dialogTitle = useRef<string>('importDialogTitle');
const progress = useSelector(getProgress);
const firstRender = useFirstRender();
@@ -65,9 +70,10 @@ export const FileUploadDialogContextProvider = ({
}
}, [progress]);
- function openDialog(tPath?: string, dTitle?: string) {
+ function openDialog(tPath?: string, dTitle?: string, tMeta?: boolean) {
open.current = true;
targetPath.current = tPath;
+ transferMeta.current = tMeta;
if (dTitle) {
dialogTitle.current = dTitle;
}
@@ -77,6 +83,7 @@ export const FileUploadDialogContextProvider = ({
function closeDialog() {
open.current = false;
targetPath.current = undefined;
+ transferMeta.current = undefined;
dialogTitle.current = 'importDialogTitle';
forceUpdate();
}
@@ -95,6 +102,7 @@ export const FileUploadDialogContextProvider = ({
onClose={() => closeDialog()}
title={dialogTitle.current}
targetPath={targetPath.current}
+ transferMeta={transferMeta.current}
/>
</FileUploadDialogContext.Provider>
);