TagSpaces is an offline, open source, document manager with tagging support
fix S3 location not opened in electron
sytolk8ef5a75a85cf
diff --git a/app/package-template.json b/app/package-template.jsonindex 112da951e..f3578c708 100644--- a/app/package-template.json+++ b/app/package-template.json@@ -5,6 +5,6 @@"nodeDependencies": {"@tagspaces/extensions": "1.0.0","sharp": "^0.28.3",- "@tagspaces/tagspaces-ws": "^1.0.5"+ "@tagspaces/tagspaces-ws": "^1.0.9"}}diff --git a/app/package.json b/app/package.jsonindex 57403c98f..1ced7ed11 100644--- a/app/package.json+++ b/app/package.json@@ -15,6 +15,6 @@"dependencies": {"@tagspaces/extensions": "1.0.0","sharp": "^0.28.3",- "@tagspaces/tagspaces-ws": "^1.0.8"+ "@tagspaces/tagspaces-ws": "^1.0.9"}}diff --git a/app/reducers/app.ts b/app/reducers/app.tsindex f4f820ce9..54fafdc7a 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -1429,7 +1429,8 @@ export const actions = {);return true;})- .catch(() => {+ .catch(e => {+ console.log('connectedtoObjectStoreFailed', e);dispatch(actions.showNotification(i18n.t('core:connectedtoObjectStoreFailed'),diff --git a/app/services/platform-io.ts b/app/services/platform-io.tsindex 7088d8cbd..74acdc93e 100644--- a/app/services/platform-io.ts+++ b/app/services/platform-io.ts@@ -48,10 +48,10 @@ export default class PlatformIO {) {resolve();} else {- import('@tagspaces/tagspaces-platforms/index')- .then(IO => {+ import('@tagspaces/tagspaces-platforms/aws')+ .then(AWS => {// { default: IO }) => {- objectStoreAPI = IO;+ objectStoreAPI = AWS;objectStoreAPI.configure(objectStoreConfig);resolve();return true;diff --git a/app/services/search.ts b/app/services/search.tsindex 8cb642a7c..1096aad27 100644--- a/app/services/search.ts+++ b/app/services/search.ts@@ -18,13 +18,13 @@*/import Fuse from 'fuse.js';-import jmespath from 'jmespath';+import jmespath from '@gorillastack/jmespath';import OpenLocationCode from 'open-location-code-typescript';+import i18n from 'i18next';import { isGeoTag, parseGeoLocation } from '-/utils/misc';import { extractTimePeriod } from '-/utils/dates';import { Pro } from '../pro';import { TS } from '-/tagspaces.namespace';-import i18n from 'i18next';// export type FileTypeGroups = 'images' | 'notes' | 'documents' | 'audio' | 'video' | 'archives';diff --git a/package.json b/package.jsonindex a3b9ec48b..bfccff088 100644--- a/package.json+++ b/package.json@@ -285,7 +285,7 @@"@material-ui/icons": "^4.11.2","@material-ui/lab": "^4.0.0-alpha.57","@material-ui/pickers": "^3.2.10",- "@tagspaces/tagspaces-platforms": "^1.0.9",+ "@tagspaces/tagspaces-platforms": "^1.0.11","aws-amplify": "^3.3.27","aws-sdk": "^2.984.0","babel-polyfill": "^6.26.0",diff --git a/yarn.lock b/yarn.lockindex 574851afa..d257e02b4 100644--- a/yarn.lock+++ b/yarn.lock@@ -3362,10 +3362,10 @@dependencies:defer-to-connect "^1.0.1"-"@tagspaces/tagspaces-platforms@^1.0.9":- version "1.0.9"- resolved "https://registry.yarnpkg.com/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-1.0.9.tgz#e06881421e222fe839c3b9a44d3958ea60a63f4c"- integrity sha512-vW9wPHYmVWKmYIKexDiMts1boKyr93XYERYGBD7wYJLzNXiF9axA3+X453gDUx+ZMWS/D0ycKiEXxMa6JLsPnA==+"@tagspaces/tagspaces-platforms@^1.0.11":+ version "1.0.11"+ resolved "https://registry.yarnpkg.com/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-1.0.11.tgz#ffeda1694f69c8a9350b336341243f6fedee174f"+ integrity sha512-6pI6fhjPfqBHbxQ2LBLGHjvZOWQ4QJF8Sxef8NdjwqkmOKDFOgxs9YqrUG1lDfT5iZhse0hkJZF06yOV9w0SIg=="@testim/chrome-version@^1.0.7":version "1.0.7"@@ -4724,9 +4724,9 @@ aws-amplify@^3.3.27:"@aws-amplify/xr" "2.2.30"aws-sdk@^2.984.0:- version "2.984.0"- resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.984.0.tgz"- integrity sha512-wFwNKhlO03V7UnpIge2qT/gYOMvGUlmVuFgF2gQRIkt6lWYvnf8/QDTCKZLhGBpC8/mml10m0CM3khMNwU1KVQ==+ version "2.1008.0"+ resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1008.0.tgz#0f6b58ef6093afec2027a49c0696bec52bb79ef6"+ integrity sha512-wBEon+ARCuMcwEPpOFZqRT3elBLfLtPqv8jMql3Hsr7Ua5toPlgKMmjf368iTzBNaY7TOZsjLAT9nAhvtSZ++g==dependencies:buffer "4.9.2"events "1.1.1"@@ -8640,7 +8640,7 @@ eventemitter3@^4.0.0:version "1.1.1"- resolved "https://registry.npmjs.org/events/-/events-1.1.1.tgz"+ resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=events@^3.0.0, events@^3.1.0:@@ -11759,7 +11759,7 @@ jest@^26.4.0:version "0.15.0"- resolved "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"+ resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=jpeg-js@^0.4.2:@@ -17077,14 +17077,14 @@ sass-loader@^7.1.0:pify "^4.0.1"semver "^6.3.0"[email protected], sax@>=0.6.0:version "1.2.1"- resolved "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o=-sax@^1.2.4, sax@~1.2.4:+sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:version "1.2.4"- resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==saxes@^5.0.0:@@ -19280,7 +19280,7 @@ url-parse@^1.4.3, url-parse@^1.5.1:version "0.10.3"- resolved "https://registry.npmjs.org/url/-/url-0.10.3.tgz"+ resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=dependencies:punycode "1.3.2"@@ -19953,7 +19953,7 @@ xml-name-validator@^3.0.0:version "0.4.19"- resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"+ resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==dependencies:sax ">=0.6.0"@@ -19976,7 +19976,7 @@ xmlbuilder@>=11.0.1:xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:version "9.0.7"- resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=xmlchars@^2.2.0: