TagSpaces is an offline, open source, document manager with tagging support
fix Second save of file on S3
sytolkdbf729244c7f
diff --git a/package-lock.json b/package-lock.jsonindex 9a6f48060..fb01d0fbd 100644--- a/package-lock.json+++ b/package-lock.json@@ -20,7 +20,7 @@"@mui/material": "^5.15.4","@mui/x-date-pickers": "^5.0.20","@tagspaces/tagspaces-common": "4.1.7",- "@tagspaces/tagspaces-common-aws": "4.1.7",+ "@tagspaces/tagspaces-common-aws": "4.1.9","@tagspaces/tagspaces-common-cordova": "4.1.7","@tagspaces/tagspaces-indexer": "4.1.7","@tagspaces/tagspaces-md": "4.0.3",@@ -13434,14 +13434,32 @@}},"node_modules/@tagspaces/tagspaces-common-aws": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws/-/tagspaces-common-aws-4.1.7.tgz",- "integrity": "sha512-EYYbATUN3tph0I0xStxHq2sqAfDM3Qk7s1GFduPzl9AXDPZpWdOgF/4lHcfCZYh4az6r/9hLXKq7vIT6OLAC3g==",+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws/-/tagspaces-common-aws-4.1.9.tgz",+ "integrity": "sha512-6VN+jgbpU68V+/PklJxjx01b80WuPssBrWpqB6wwuNYyxFzFJzjkqmrrI4X4ZUyrE8XRHgqv68wP7sr6btyW+g==","dependencies": {- "@tagspaces/tagspaces-common": "^4.1.7",+ "@tagspaces/tagspaces-common": "^4.1.8","aws-sdk": "2.1161.0"}},+ "node_modules/@tagspaces/tagspaces-common-aws/node_modules/@tagspaces/tagspaces-common": {+ "version": "4.1.8",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.1.8.tgz",+ "integrity": "sha512-10aPje2SxggstNw0eyhtcqDJltMh00COZHTywAm5JFPKtJa1wwtkdlfMlOqZSDn5gw98gTbmbQoJ3BLIYgbF0w==",+ "dependencies": {+ "dotenv": "^16.0.2",+ "picomatch": "^3.0.1",+ "uuid": "^8.3.2"+ }+ },+ "node_modules/@tagspaces/tagspaces-common-aws/node_modules/@tagspaces/tagspaces-common/node_modules/uuid": {+ "version": "8.3.2",+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",+ "bin": {+ "uuid": "dist/bin/uuid"+ }+ },"node_modules/@tagspaces/tagspaces-common-aws/node_modules/aws-sdk": {"version": "2.1161.0","resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1161.0.tgz",@@ -54575,14 +54593,31 @@}},"@tagspaces/tagspaces-common-aws": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws/-/tagspaces-common-aws-4.1.7.tgz",- "integrity": "sha512-EYYbATUN3tph0I0xStxHq2sqAfDM3Qk7s1GFduPzl9AXDPZpWdOgF/4lHcfCZYh4az6r/9hLXKq7vIT6OLAC3g==",+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws/-/tagspaces-common-aws-4.1.9.tgz",+ "integrity": "sha512-6VN+jgbpU68V+/PklJxjx01b80WuPssBrWpqB6wwuNYyxFzFJzjkqmrrI4X4ZUyrE8XRHgqv68wP7sr6btyW+g==","requires": {- "@tagspaces/tagspaces-common": "^4.1.7",+ "@tagspaces/tagspaces-common": "^4.1.8","aws-sdk": "2.1161.0"},"dependencies": {+ "@tagspaces/tagspaces-common": {+ "version": "4.1.8",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.1.8.tgz",+ "integrity": "sha512-10aPje2SxggstNw0eyhtcqDJltMh00COZHTywAm5JFPKtJa1wwtkdlfMlOqZSDn5gw98gTbmbQoJ3BLIYgbF0w==",+ "requires": {+ "dotenv": "^16.0.2",+ "picomatch": "^3.0.1",+ "uuid": "^8.3.2"+ },+ "dependencies": {+ "uuid": {+ "version": "8.3.2",+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="+ }+ }+ },"aws-sdk": {"version": "2.1161.0","resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1161.0.tgz",diff --git a/package.json b/package.jsonindex 36691b5ed..e8c5d4a70 100644--- a/package.json+++ b/package.json@@ -158,7 +158,7 @@"@mui/material": "^5.15.4","@mui/x-date-pickers": "^5.0.20","@tagspaces/tagspaces-common": "4.1.7",- "@tagspaces/tagspaces-common-aws": "4.1.7",+ "@tagspaces/tagspaces-common-aws": "4.1.9","@tagspaces/tagspaces-common-cordova": "4.1.7","@tagspaces/tagspaces-indexer": "4.1.7","@tagspaces/tagspaces-md": "4.0.3",diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex e3d04bab7..0000adb88 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -13,7 +13,7 @@"@elife/pm2": "3.6.1","@tagspaces/extensions": "1.0.97","@tagspaces/tagspaces-common-node": "4.1.7",- "@tagspaces/tagspaces-ws": "4.1.7",+ "@tagspaces/tagspaces-ws": "4.1.9","sharp": "0.32.6","ws": "8.16.0"},@@ -43,9 +43,9 @@}},"node_modules/@tagspaces/tagspaces-common": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.1.7.tgz",- "integrity": "sha512-Vdr3GfrG+w8zFajkktzMuGYK+Ad0fiWsapdjHcCEhswPUr3YeiBYsp4xqUBZJgtq1WfcsKGrSKtj5Qb2lUhtuw==",+ "version": "4.1.8",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.1.8.tgz",+ "integrity": "sha512-10aPje2SxggstNw0eyhtcqDJltMh00COZHTywAm5JFPKtJa1wwtkdlfMlOqZSDn5gw98gTbmbQoJ3BLIYgbF0w==","dependencies": {"dotenv": "^16.0.2","picomatch": "^3.0.1",@@ -65,9 +65,9 @@}},"node_modules/@tagspaces/tagspaces-platforms": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-4.1.7.tgz",- "integrity": "sha512-vUzneLMhOwyhzxlPE6eihdw5tsrBs15G1GDLokL7Fb/P/nLWf1U2yMBSo0UnzCxFNzmHExffP45yfmjI5qc9Qg==",+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-4.1.9.tgz",+ "integrity": "sha512-c/M85nKjzI0dX/Q5apZWpVgAx3hnqGUsvIqQDIBLCX9q04dFxPK7/RsZ4K4qYgEAOBZPABDWx2VilBCEn8lUBg==","hasInstallScript": true},"node_modules/@tagspaces/tagspaces-thumbgen-image": {@@ -80,22 +80,34 @@}},"node_modules/@tagspaces/tagspaces-workers": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.1.7.tgz",- "integrity": "sha512-Qcl521iTA1FI/mYuaKBdQQTEAn8e313gj806/rYzTzif2ZoFlC9mBve1JodMZk9Kr9M43Z8wvHx2WADTQEiCxw==",+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.1.9.tgz",+ "integrity": "sha512-wNWImLpEOUtkcHtO7dPyGUalXEDQGDeDFXkbtP0dsVPO1rgFCqpxB0Bgy5FKvsPNS0lPj+Z50Xd1hmmMT/Cuaw==","dependencies": {- "@tagspaces/tagspaces-common": "^4.1.7",- "@tagspaces/tagspaces-common-node": "^4.1.7",- "@tagspaces/tagspaces-platforms": "^4.1.7",+ "@tagspaces/tagspaces-common": "^4.1.8",+ "@tagspaces/tagspaces-common-node": "^4.1.8",+ "@tagspaces/tagspaces-platforms": "^4.1.9","@tagspaces/tagspaces-thumbgen-image": "^4.1.2"}},+ "node_modules/@tagspaces/tagspaces-workers/node_modules/@tagspaces/tagspaces-common-node": {+ "version": "4.1.8",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.1.8.tgz",+ "integrity": "sha512-W+eOXVKckUxcOoRjhmmVgr0/osrR5YerQn4NXhd2T+rc4jPblIw5hU5FQOuGJN99gRNZJZUmyFPGK34I3UEvSQ==",+ "dependencies": {+ "@tagspaces/tagspaces-common": "^4.1.8",+ "adm-zip": "^0.5.10",+ "fs-extra": "^10.0.0",+ "klaw": "^4.1.0",+ "marked": "^3.0.8"+ }+ },"node_modules/@tagspaces/tagspaces-ws": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.1.7.tgz",- "integrity": "sha512-/2P3HxtdXuxXdsh8aH+t9D00v9A9tqWOCCoesVKVsbh7nh6rLtRE4ZfgIz/NwKVs4B9xsQmf0SN8inv4tMv/7Q==",+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.1.9.tgz",+ "integrity": "sha512-SBOEZGwcGHAtXUezaNyQKyKDE1Y8InFOb7EgxEZfoIg73wkxP0PHAjdPe5y4EybJT5hHYtJ1ojN5z+mml0jyCg==","dependencies": {- "@tagspaces/tagspaces-workers": "^4.1.7",+ "@tagspaces/tagspaces-workers": "^4.1.9","find-free-ports": "^3.1.1","jsonwebtoken": "^8.5.1","ws": "^8.15.1"@@ -1102,9 +1114,9 @@}},"@tagspaces/tagspaces-common": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.1.7.tgz",- "integrity": "sha512-Vdr3GfrG+w8zFajkktzMuGYK+Ad0fiWsapdjHcCEhswPUr3YeiBYsp4xqUBZJgtq1WfcsKGrSKtj5Qb2lUhtuw==",+ "version": "4.1.8",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.1.8.tgz",+ "integrity": "sha512-10aPje2SxggstNw0eyhtcqDJltMh00COZHTywAm5JFPKtJa1wwtkdlfMlOqZSDn5gw98gTbmbQoJ3BLIYgbF0w==","requires": {"dotenv": "^16.0.2","picomatch": "^3.0.1",@@ -1124,9 +1136,9 @@}},"@tagspaces/tagspaces-platforms": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-4.1.7.tgz",- "integrity": "sha512-vUzneLMhOwyhzxlPE6eihdw5tsrBs15G1GDLokL7Fb/P/nLWf1U2yMBSo0UnzCxFNzmHExffP45yfmjI5qc9Qg=="+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-4.1.9.tgz",+ "integrity": "sha512-c/M85nKjzI0dX/Q5apZWpVgAx3hnqGUsvIqQDIBLCX9q04dFxPK7/RsZ4K4qYgEAOBZPABDWx2VilBCEn8lUBg=="},"@tagspaces/tagspaces-thumbgen-image": {"version": "4.1.2",@@ -1138,22 +1150,36 @@}},"@tagspaces/tagspaces-workers": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.1.7.tgz",- "integrity": "sha512-Qcl521iTA1FI/mYuaKBdQQTEAn8e313gj806/rYzTzif2ZoFlC9mBve1JodMZk9Kr9M43Z8wvHx2WADTQEiCxw==",+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.1.9.tgz",+ "integrity": "sha512-wNWImLpEOUtkcHtO7dPyGUalXEDQGDeDFXkbtP0dsVPO1rgFCqpxB0Bgy5FKvsPNS0lPj+Z50Xd1hmmMT/Cuaw==","requires": {- "@tagspaces/tagspaces-common": "^4.1.7",- "@tagspaces/tagspaces-common-node": "^4.1.7",- "@tagspaces/tagspaces-platforms": "^4.1.7",+ "@tagspaces/tagspaces-common": "^4.1.8",+ "@tagspaces/tagspaces-common-node": "^4.1.8",+ "@tagspaces/tagspaces-platforms": "^4.1.9","@tagspaces/tagspaces-thumbgen-image": "^4.1.2"+ },+ "dependencies": {+ "@tagspaces/tagspaces-common-node": {+ "version": "4.1.8",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.1.8.tgz",+ "integrity": "sha512-W+eOXVKckUxcOoRjhmmVgr0/osrR5YerQn4NXhd2T+rc4jPblIw5hU5FQOuGJN99gRNZJZUmyFPGK34I3UEvSQ==",+ "requires": {+ "@tagspaces/tagspaces-common": "^4.1.8",+ "adm-zip": "^0.5.10",+ "fs-extra": "^10.0.0",+ "klaw": "^4.1.0",+ "marked": "^3.0.8"+ }+ }}},"@tagspaces/tagspaces-ws": {- "version": "4.1.7",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.1.7.tgz",- "integrity": "sha512-/2P3HxtdXuxXdsh8aH+t9D00v9A9tqWOCCoesVKVsbh7nh6rLtRE4ZfgIz/NwKVs4B9xsQmf0SN8inv4tMv/7Q==",+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.1.9.tgz",+ "integrity": "sha512-SBOEZGwcGHAtXUezaNyQKyKDE1Y8InFOb7EgxEZfoIg73wkxP0PHAjdPe5y4EybJT5hHYtJ1ojN5z+mml0jyCg==","requires": {- "@tagspaces/tagspaces-workers": "^4.1.7",+ "@tagspaces/tagspaces-workers": "^4.1.9","find-free-ports": "^3.1.1","jsonwebtoken": "^8.5.1","ws": "^8.15.1"diff --git a/release/app/package.json b/release/app/package.jsonindex 6814b150c..2b3867f7f 100644--- a/release/app/package.json+++ b/release/app/package.json@@ -20,7 +20,7 @@"@elife/pm2": "3.6.1","@tagspaces/extensions": "1.0.97","@tagspaces/tagspaces-common-node": "4.1.7",- "@tagspaces/tagspaces-ws": "4.1.7",+ "@tagspaces/tagspaces-ws": "4.1.9","sharp": "0.32.6","ws": "8.16.0"},diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsxindex cf4a15e66..7c9c547fc 100644--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx@@ -271,7 +271,7 @@ export const DirectoryContentContextProvider = ({};}// update ordered entries (KanBan)- if (Pro && Pro.MetaOperations) {+ if (Pro && Pro.MetaOperations && action.oldEntryPath) {const dirPath = extractContainingDirectoryPath(action.entry.path,PlatformIO.getDirSeparator(),diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsxindex 3738ee58e..ad9887d0f 100644--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx@@ -342,7 +342,7 @@ export const OpenedEntryContextProvider = ({function reflectUpdateOpenedFileContent(entry: TS.FileSystemEntry) {if (currentEntry.current) {if (currentEntry.current.path === entry.path) {- currentEntry.current.lmdt = entry.lmdt;+ currentEntry.current = { ...currentEntry.current, lmdt: entry.lmdt };forceUpdate();}}