Skip to content

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

Migration to aws sdk v3 (#2143)

Stanimir4d337baeeb35
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ac5598807..32cefc55a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -40,12 +40,56 @@ jobs:
- uses: actions/upload-artifact@v4
if: failure()
with:
- name: test-artifacts
+ name: test-artifacts-desktop-win
path: |
- tests/test-pages/
+ test-results/
tests/test-reports/
+ playwright-report/
+ e2eTestsWinS3:
+ name: Test desktop pro app on Mac with S3 bucket
+ runs-on: macos-latest
+ env:
+ PD_PLATFORM: node
+ steps:
+ - name: Checking out default branch
+ uses: actions/checkout@v4
+ with:
+ submodules: true
+ - name: Checkout TestData
+ uses: actions/checkout@v4
+ with:
+ repository: tagspaces/testdata
+ path: tests/testdata
+ - name: Configure NPM for TagSpaces Pro
+ uses: actions/setup-node@v4
+ with:
+ node-version: '20.x'
+ always-auth: true
+ registry-url: https://npm.pkg.github.com/
+ scope: '@tagspacespro'
+ - name: Running npm install, prettier and type checks
+ run: |
+ npm install
+ npm run prettier-check
+ npm run type-check
+ env:
+ NODE_AUTH_TOKEN: ${{ secrets.TSPNPMINSTALL }}
+ - name: Run Unit tests
+ run: npm run test-unit
+ - name: Run Electron tests
+ run: |
+ npm run build-e2e
+ npm run test-playwright-s3
+ - uses: actions/upload-artifact@v4
+ if: failure()
+ with:
+ name: test-artifacts-desktop-s3-win
+ path: |
+ test-results/
+ tests/test-reports/
+ playwright-report/
e2eTestsWebWin:
- name: Test web pro app on Windows
+ name: Test web pro app on Windows with Minio
runs-on: windows-latest
env:
PD_PLATFORM: web
@@ -83,6 +127,50 @@ jobs:
file-url: 'https://s3.eu-central-1.wasabisys.com/demots/public/mc-20201119/minio.exe'
file-name: 'minio.exe'
location: './tests/bin/'
+ - name: Run Electron tests
+ run: |
+ npm run build-e2e-web
+ npm run test-playwright-web-headless-minio
+ - uses: actions/upload-artifact@v4
+ if: failure()
+ with:
+ name: test-artifacts-web-minio-win
+ path: |
+ test-results/
+ tests/test-reports/
+ playwright-report/
+ e2eTestsWebMac:
+ name: Test web pro app on Mac OS
+ runs-on: macos-latest
+ env:
+ PD_PLATFORM: web
+ steps:
+ - name: Checking out default branch
+ uses: actions/checkout@v4
+ with:
+ submodules: true
+ - name: Checkout TestData
+ uses: actions/checkout@v4
+ with:
+ repository: tagspaces/testdata
+ path: tests/testdata
+ - name: Configure NPM for TagSpaces Pro
+ uses: actions/setup-node@v4
+ with:
+ node-version: '20.x'
+ always-auth: true
+ registry-url: https://npm.pkg.github.com/
+ scope: '@tagspacespro'
+ - name: Running npm install, prettier and type checks
+ run: |
+ npm install
+ npm run prepare-web-pro
+ npm run prettier-check
+ npm run type-check
+ env:
+ NODE_AUTH_TOKEN: ${{ secrets.TSPNPMINSTALL }}
+ - name: Run Unit tests
+ run: npm run test-unit
- name: Run Electron tests
run: |
npm run build-e2e-web
@@ -90,8 +178,9 @@ jobs:
- uses: actions/upload-artifact@v4
if: failure()
with:
- name: test-artifacts-pr
+ name: test-artifacts-web-mac-s3
path: |
+ test-results/
tests/test-reports/
playwright-report/
# gitHubActionForNpmMac:
diff --git a/.gitignore b/.gitignore
index 2f25e0617..79a36fc2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,15 +102,17 @@ tests/*
!tests/global-setup.js
!tests/global-setup-minio.js
!tests/global-setup-web.js
+!tests/global-setup-web-minio.js
!tests/global-teardown.js
!tests/global-teardown-minio.js
!tests/global-teardown-web.js
+!tests/global-teardown-web-minio.js
!tests/setup-functions.js
!tests/test-data-refresh.js
!tests/create-1000files-nothumbs.sh
!tests/create-1000files.js
!tests/create-1000folders.js
-
+!tests/s3rver
builds/*
web/sw-con
.ycache/*
diff --git a/package-lock.json b/package-lock.json
index 71051c9c2..59c428ec4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,13 +19,12 @@
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.3.26",
- "@tagspaces/tagspaces-common-aws3": "4.3.26",
- "@tagspaces/tagspaces-common-cordova": "4.3.28",
- "@tagspaces/tagspaces-indexer": "4.3.26",
+ "@tagspaces/tagspaces-common": "4.4.6",
+ "@tagspaces/tagspaces-common-aws3": "4.4.8",
+ "@tagspaces/tagspaces-common-cordova": "4.4.6",
+ "@tagspaces/tagspaces-indexer": "4.4.6",
"@tagspaces/tagspaces-md": "4.3.30",
"aws-amplify": "^4.3.8",
- "aws-sdk": "^2.1036.0",
"classnames": "^2.3.1",
"clone": "^2.1.2",
"coordinate-parser": "^1.0.7",
@@ -67,7 +66,7 @@
"react-draggable": "^4.4.4",
"react-hotkeys": "^2.0.0",
"react-i18next": "^13.2.2",
- "react-image-gallery": "1.2.11",
+ "react-image-gallery": "1.3.0",
"react-infinite-scroller": "^1.2.6",
"react-leaflet": "^4.2.1",
"react-leaflet-fullscreen": "^4.1.1",
@@ -102,6 +101,7 @@
"@types/node": "20.6.2",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
+ "@types/react-image-gallery": "^1.2.4",
"@types/react-redux": "^7.1.24",
"@types/react-router-dom": "^5.3.3",
"@types/react-test-renderer": "^18.0.1",
@@ -170,6 +170,7 @@
"react-test-renderer": "18.2.0",
"redux-logger": "^3.0.6",
"rimraf": "^5.0.1",
+ "s3rver": "^3.7.1",
"sass": "^1.67.0",
"sass-loader": "^13.3.2",
"serve-static": "^1.14.1",
@@ -197,7 +198,7 @@
"yarn": "please-use-npm"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.63"
+ "@tagspacespro/tagspacespro": "5.0.64-alpha.8"
}
},
"node_modules/@adobe/css-tools": {
@@ -524,6 +525,73 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
+ "node_modules/@aws-crypto/crc32c": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz",
+ "integrity": "sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==",
+ "dependencies": {
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/crc32c/node_modules/@aws-crypto/util": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+ "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+ "dependencies": {
+ "@aws-sdk/types": "^3.222.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/crc32c/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/crc32c/node_modules/@smithy/is-array-buffer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/crc32c/node_modules/@smithy/util-buffer-from": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+ "dependencies": {
+ "@smithy/is-array-buffer": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/crc32c/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
"node_modules/@aws-crypto/ie11-detection": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-1.0.0.tgz",
@@ -537,6 +605,84 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
+ "node_modules/@aws-crypto/sha1-browser": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz",
+ "integrity": "sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==",
+ "dependencies": {
+ "@aws-crypto/supports-web-crypto": "^5.2.0",
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "@aws-sdk/util-locate-window": "^3.0.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/sha1-browser/node_modules/@aws-crypto/supports-web-crypto": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+ "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/sha1-browser/node_modules/@aws-crypto/util": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+ "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+ "dependencies": {
+ "@aws-sdk/types": "^3.222.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/sha1-browser/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/is-array-buffer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-buffer-from": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+ "dependencies": {
+ "@smithy/is-array-buffer": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
"node_modules/@aws-crypto/sha256-browser": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-1.2.2.tgz",
@@ -4653,6 +4799,44 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
+ "node_modules/@aws-sdk/core": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.614.0.tgz",
+ "integrity": "sha512-BUuS5/1YkgmKc4J0bg83XEtMyDHVyqG2QDzfmhYe8gbOIZabUl1FlrFVwhCAthtrrI6MPGTQcERB4BtJKUSplw==",
+ "dependencies": {
+ "@smithy/core": "^2.2.6",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/signature-v4": "^3.1.2",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "fast-xml-parser": "4.2.5",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/core/node_modules/fast-xml-parser": {
+ "version": "4.2.5",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
+ "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+ "funding": [
+ {
+ "type": "paypal",
+ "url": "https://paypal.me/naturalintelligence"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ],
+ "dependencies": {
+ "strnum": "^1.0.5"
+ },
+ "bin": {
+ "fxparser": "src/cli/cli.js"
+ }
+ },
"node_modules/@aws-sdk/credential-provider-cognito-identity": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.6.1.tgz",
@@ -4690,6 +4874,37 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
+ "node_modules/@aws-sdk/credential-provider-http": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.614.0.tgz",
+ "integrity": "sha512-YIEjlNUKb3Vo/iTnGAPdsiDC3FUUnNoex2OwU8LmR7AkYZiWdB8nx99DfgkkY+OFMUpw7nKD2PCOtuFONelfGA==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/fetch-http-handler": "^3.2.1",
+ "@smithy/node-http-handler": "^3.1.2",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-stream": "^3.0.6",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-http/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
"node_modules/@aws-sdk/credential-provider-imds": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.6.1.tgz",
@@ -5221,6 +5436,94 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
+ "node_modules/@aws-sdk/middleware-flexible-checksums": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.614.0.tgz",
+ "integrity": "sha512-ZLpxVXMboDeMT7p2Kdp5m1uLVKOktkZoMgLvvbe3zbrU4Ji5IU5xVE0aa4X7H28BtuODCs6SLESnPs19bhMKlA==",
+ "dependencies": {
+ "@aws-crypto/crc32": "5.2.0",
+ "@aws-crypto/crc32c": "5.2.0",
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/is-array-buffer": "^3.0.0",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@aws-crypto/crc32": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
+ "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==",
+ "dependencies": {
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@aws-crypto/util": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+ "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+ "dependencies": {
+ "@aws-sdk/types": "^3.222.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/util-buffer-from": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+ "dependencies": {
+ "@smithy/is-array-buffer": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/util-buffer-from/node_modules/@smithy/is-array-buffer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
"node_modules/@aws-sdk/middleware-header-default": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.6.1.tgz",
@@ -5681,6 +5984,34 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
+ "node_modules/@aws-sdk/region-config-resolver": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz",
+ "integrity": "sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-config-provider": "^3.0.0",
+ "@smithy/util-middleware": "^3.0.3",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/region-config-resolver/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
"node_modules/@aws-sdk/s3-request-presigner": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.6.1.tgz",
@@ -5742,6 +6073,64 @@
"node": ">= 10.0.0"
}
},
+ "node_modules/@aws-sdk/signature-v4-multi-region": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.614.0.tgz",
+ "integrity": "sha512-6mW3ONW4oLzxrePznYhz7sNT9ji9Am9ufLeV722tbOVS5lArBOZ6E1oPz0uYBhisUPznWKhcLRMggt7vIJWMng==",
+ "dependencies": {
+ "@aws-sdk/middleware-sdk-s3": "3.614.0",
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/signature-v4": "^3.1.2",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/middleware-sdk-s3": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.614.0.tgz",
+ "integrity": "sha512-9fJTaiuuOfFV4FqmUEhPYzrtv7JOfYpB7q65oG3uayVH4ngWHIJkjnnX79zRhNZKdPGta+XIsnZzjEghg82ngA==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-arn-parser": "3.568.0",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/signature-v4": "^3.1.2",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-config-provider": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/util-arn-parser": {
+ "version": "3.568.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.568.0.tgz",
+ "integrity": "sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
"node_modules/@aws-sdk/signature-v4/node_modules/tslib": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -6126,6 +6515,32 @@
"node": ">= 12.0.0"
}
},
+ "node_modules/@aws-sdk/util-endpoints": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz",
+ "integrity": "sha512-wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-endpoints": "^2.0.5",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/util-endpoints/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
"node_modules/@aws-sdk/util-format-url": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.6.1.tgz",
@@ -8551,6 +8966,15 @@
"resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz",
"integrity": "sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A=="
},
+ "node_modules/@colors/colors": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
+ "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.1.90"
+ }
+ },
"node_modules/@cspotcode/source-map-support": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -8659,6 +9083,17 @@
"postcss-selector-parser": "^6.0.13"
}
},
+ "node_modules/@dabh/diagnostics": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
+ "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
+ "dev": true,
+ "dependencies": {
+ "colorspace": "1.1.x",
+ "enabled": "2.0.x",
+ "kuler": "^2.0.0"
+ }
+ },
"node_modules/@date-io/core": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.17.0.tgz",
@@ -10041,6 +10476,63 @@
"@jridgewell/sourcemap-codec": "^1.4.14"
}
},
+ "node_modules/@koa/router": {
+ "version": "9.4.0",
+ "resolved": "https://registry.npmjs.org/@koa/router/-/router-9.4.0.tgz",
+ "integrity": "sha512-dOOXgzqaDoHu5qqMEPLKEgLz5CeIA7q8+1W62mCvFVCOqeC71UoTGJ4u1xUSOpIl2J1x2pqrNULkFteUeZW3/A==",
+ "deprecated": "**IMPORTANT 10x+ PERFORMANCE UPGRADE**: Please upgrade to v12.0.1+ as we have fixed an issue with debuglog causing 10x slower router benchmark performance, see https://github.com/koajs/router/pull/173",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.1.1",
+ "http-errors": "^1.7.3",
+ "koa-compose": "^4.1.0",
+ "methods": "^1.1.2",
+ "path-to-regexp": "^6.1.0"
+ },
+ "engines": {
+ "node": ">= 8.0.0"
+ }
+ },
+ "node_modules/@koa/router/node_modules/depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/@koa/router/node_modules/http-errors": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+ "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+ "dev": true,
+ "dependencies": {
+ "depd": "~1.1.2",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": ">= 1.5.0 < 2",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/@koa/router/node_modules/path-to-regexp": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
+ "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
+ "dev": true
+ },
+ "node_modules/@koa/router/node_modules/statuses": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/@leichtgewicht/ip-codec": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
@@ -13461,11 +13953,707 @@
"@sinonjs/commons": "^3.0.0"
}
},
+ "node_modules/@smithy/abort-controller": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz",
+ "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/chunked-blob-reader": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-3.0.0.tgz",
+ "integrity": "sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/chunked-blob-reader-native": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-3.0.0.tgz",
+ "integrity": "sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==",
+ "dependencies": {
+ "@smithy/util-base64": "^3.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/config-resolver": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz",
+ "integrity": "sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==",
+ "dependencies": {
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-config-provider": "^3.0.0",
+ "@smithy/util-middleware": "^3.0.3",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/core": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.2.6.tgz",
+ "integrity": "sha512-tBbVIv/ui7/lLTKayYJJvi8JLVL2SwOQTbNFEOrvzSE3ktByvsa1erwBOnAMo8N5Vu30g7lN4lLStrU75oDGuw==",
+ "dependencies": {
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/middleware-retry": "^3.0.9",
+ "@smithy/middleware-serde": "^3.0.3",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-middleware": "^3.0.3",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/credential-provider-imds": {
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.4.tgz",
+ "integrity": "sha512-NKyH01m97Xa5xf3pB2QOF3lnuE8RIK0hTVNU5zvZAwZU8uspYO4DHQVlK+Y5gwSrujTfHvbfd1D9UFJAc0iYKQ==",
+ "dependencies": {
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/types": "^3.3.0",
+ "@smithy/url-parser": "^3.0.3",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-codec": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.2.tgz",
+ "integrity": "sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==",
+ "dependencies": {
+ "@aws-crypto/crc32": "5.2.0",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-hex-encoding": "^3.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/eventstream-codec/node_modules/@aws-crypto/crc32": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
+ "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==",
+ "dependencies": {
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-codec/node_modules/@aws-crypto/util": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+ "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+ "dependencies": {
+ "@aws-sdk/types": "^3.222.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/eventstream-codec/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-codec/node_modules/@smithy/is-array-buffer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-codec/node_modules/@smithy/util-buffer-from": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+ "dependencies": {
+ "@smithy/is-array-buffer": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-codec/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-serde-browser": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.4.tgz",
+ "integrity": "sha512-Eo4anLZX6ltGJTZ5yJMc80gZPYYwBn44g0h7oFq6et+TYr5dUsTpIcDbz2evsOKIZhZ7zBoFWHtBXQ4QQeb5xA==",
+ "dependencies": {
+ "@smithy/eventstream-serde-universal": "^3.0.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-serde-config-resolver": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.3.tgz",
+ "integrity": "sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-serde-node": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.4.tgz",
+ "integrity": "sha512-mjlG0OzGAYuUpdUpflfb9zyLrBGgmQmrobNT8b42ZTsGv/J03+t24uhhtVEKG/b2jFtPIHF74Bq+VUtbzEKOKg==",
+ "dependencies": {
+ "@smithy/eventstream-serde-universal": "^3.0.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/eventstream-serde-universal": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.4.tgz",
+ "integrity": "sha512-Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A==",
+ "dependencies": {
+ "@smithy/eventstream-codec": "^3.1.2",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/fetch-http-handler": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.1.tgz",
+ "integrity": "sha512-0w0bgUvZmfa0vHN8a+moByhCJT07WN6AHKEhFSOLsDpnszm+5dLVv5utGaqbhOrZ/aF5x3xuPMs/oMCd+4O5xg==",
+ "dependencies": {
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/querystring-builder": "^3.0.3",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-base64": "^3.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/hash-blob-browser": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.2.tgz",
+ "integrity": "sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==",
+ "dependencies": {
+ "@smithy/chunked-blob-reader": "^3.0.0",
+ "@smithy/chunked-blob-reader-native": "^3.0.0",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/hash-node": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz",
+ "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-buffer-from": "^3.0.0",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/hash-stream-node": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.2.tgz",
+ "integrity": "sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/invalid-dependency": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz",
+ "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/is-array-buffer": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+ "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/md5-js": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.3.tgz",
+ "integrity": "sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/middleware-content-length": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz",
+ "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==",
+ "dependencies": {
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-endpoint": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.5.tgz",
+ "integrity": "sha512-V4acqqrh5tDxUEGVTOgf2lYMZqPQsoGntCrjrJZEeBzEzDry2d2vcI1QCXhGltXPPY+BMc6eksZMguA9fIY8vA==",
+ "dependencies": {
+ "@smithy/middleware-serde": "^3.0.3",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/shared-ini-file-loader": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "@smithy/url-parser": "^3.0.3",
+ "@smithy/util-middleware": "^3.0.3",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-retry": {
+ "version": "3.0.9",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.9.tgz",
+ "integrity": "sha512-Mrv9omExU1gA7Y0VEJG2LieGfPYtwwcEiOnVGZ54a37NEMr66TJ0glFslOJFuKWG6izg5DpKIUmDV9rRxjm47Q==",
+ "dependencies": {
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/service-error-classification": "^3.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-middleware": "^3.0.3",
+ "@smithy/util-retry": "^3.0.3",
+ "tslib": "^2.6.2",
+ "uuid": "^9.0.1"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-serde": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz",
+ "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-stack": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz",
+ "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/node-config-provider": {
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz",
+ "integrity": "sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==",
+ "dependencies": {
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/shared-ini-file-loader": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/node-http-handler": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.2.tgz",
+ "integrity": "sha512-Td3rUNI7qqtoSLTsJBtsyfoG4cF/XMFmJr6Z2dX8QNzIi6tIW6YmuyFml8mJ2cNpyWNqITKbROMOFrvQjmsOvw==",
+ "dependencies": {
+ "@smithy/abort-controller": "^3.1.1",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/querystring-builder": "^3.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/property-provider": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz",
+ "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/protocol-http": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.3.tgz",
+ "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/querystring-builder": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz",
+ "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-uri-escape": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/querystring-parser": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz",
+ "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/service-error-classification": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz",
+ "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/shared-ini-file-loader": {
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz",
+ "integrity": "sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/signature-v4": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.1.2.tgz",
+ "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==",
+ "dependencies": {
+ "@smithy/is-array-buffer": "^3.0.0",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-hex-encoding": "^3.0.0",
+ "@smithy/util-middleware": "^3.0.3",
+ "@smithy/util-uri-escape": "^3.0.0",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/smithy-client": {
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.7.tgz",
+ "integrity": "sha512-nZbJZB0XI3YnaFBWGDBr7kjaew6O0oNYNmopyIz6gKZEbxzrtH7rwvU1GcVxcSFoOwWecLJEe79fxEMljHopFQ==",
+ "dependencies": {
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/middleware-stack": "^3.0.3",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-stream": "^3.0.6",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
"node_modules/@smithy/types": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz",
+ "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/url-parser": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz",
+ "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==",
+ "dependencies": {
+ "@smithy/querystring-parser": "^3.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/util-base64": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
+ "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==",
+ "dependencies": {
+ "@smithy/util-buffer-from": "^3.0.0",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-body-length-browser": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
+ "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@smithy/util-body-length-node": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
+ "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-buffer-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+ "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+ "dependencies": {
+ "@smithy/is-array-buffer": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-config-provider": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
+ "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-defaults-mode-browser": {
+ "version": "3.0.9",
+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.9.tgz",
+ "integrity": "sha512-WKPcElz92MAQG09miBdb0GxEH/MwD5GfE8g07WokITq5g6J1ROQfYCKC1wNnkqAGfrSywT7L0rdvvqlBplqiyA==",
+ "dependencies": {
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "bowser": "^2.11.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/@smithy/util-defaults-mode-node": {
+ "version": "3.0.9",
+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.9.tgz",
+ "integrity": "sha512-dQLrUqFxqpf0GvEKEuFdgXcdZwz6oFm752h4d6C7lQz+RLddf761L2r7dSwGWzESMMB3wKj0jL+skRhEGlecjw==",
+ "dependencies": {
+ "@smithy/config-resolver": "^3.0.5",
+ "@smithy/credential-provider-imds": "^3.1.4",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/@smithy/util-endpoints": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz",
+ "integrity": "sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==",
+ "dependencies": {
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-hex-encoding": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
+ "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-middleware": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz",
+ "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-retry": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz",
+ "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==",
+ "dependencies": {
+ "@smithy/service-error-classification": "^3.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-stream": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.6.tgz",
+ "integrity": "sha512-w9i//7egejAIvplX821rPWWgaiY1dxsQUw0hXX7qwa/uZ9U3zplqTQ871jWadkcVB9gFDhkPWYVZf4yfFbZ0xA==",
+ "dependencies": {
+ "@smithy/fetch-http-handler": "^3.2.1",
+ "@smithy/node-http-handler": "^3.1.2",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-base64": "^3.0.0",
+ "@smithy/util-buffer-from": "^3.0.0",
+ "@smithy/util-hex-encoding": "^3.0.0",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-uri-escape": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
+ "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-utf8": {
"version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.0.0.tgz",
- "integrity": "sha512-VvWuQk2RKFuOr98gFhjca7fkBS+xLLURT8bUjk5XQoV0ZLm7WPwWPPY3/AwzTLuUBDeoKDCthfe1AsTUWaSEhw==",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+ "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
"dependencies": {
+ "@smithy/util-buffer-from": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@smithy/util-waiter": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz",
+ "integrity": "sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==",
+ "dependencies": {
+ "@smithy/abort-controller": "^3.1.1",
+ "@smithy/types": "^3.3.0",
"tslib": "^2.6.2"
},
"engines": {
@@ -13742,9 +14930,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.26.tgz",
- "integrity": "sha512-ml6JaMArt77T6SxrwAihB0HF2DiCYcR/zjAVXL/R83ETYzn+yx4B6etVAqMKYJ41tn4eGVR0SMFlDjpYrUsbAA==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.4.6.tgz",
+ "integrity": "sha512-JAXsfV5uJVi8rBHUExi5farW3355PkdvR+FdpRogLQFNAmVv8A9qlY7BkzlPgusv6JEJP9NJKoTNIJl9s/WeCQ==",
"dependencies": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -13752,71 +14940,737 @@
}
},
"node_modules/@tagspaces/tagspaces-common-aws3": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.3.26.tgz",
- "integrity": "sha512-Mt96/CsjO+PlNqmnyrLh8hOqj6sQsaleMkPzsGuUiLNLyDuHgHaXb+pq2G3efPRB3PrndNO+eEW33llZgKNv4w==",
+ "version": "4.4.8",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.4.8.tgz",
+ "integrity": "sha512-lcWgcI9xgCaz+Uc9jODmlNDubFp8G3Lpca5C8C1VENcOzjlAZ5N4zq0ncgMQNFLyMK9YP92Bhvy93DIc4WYszA==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.26",
- "aws-sdk": "2.1605.0"
+ "@aws-sdk/client-s3": "^3.614.0",
+ "@aws-sdk/lib-storage": "^3.614.0",
+ "@aws-sdk/s3-request-presigner": "^3.614.0",
+ "@tagspaces/tagspaces-common": "^4.4.6"
}
},
- "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/aws-sdk": {
- "version": "2.1605.0",
- "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1605.0.tgz",
- "integrity": "sha512-/wtOuF7WgkbN6YL3xJ+FB54kvIAfnP/DQVDaE6rSYv6ft0xr01Si94NgQWhb5OcFkFfRAC4auZX8PiFNtOi9xQ==",
- "hasInstallScript": true,
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-crypto/sha256-browser": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+ "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
"dependencies": {
- "buffer": "4.9.2",
- "events": "1.1.1",
- "ieee754": "1.1.13",
- "jmespath": "0.16.0",
- "querystring": "0.2.0",
- "sax": "1.2.1",
- "url": "0.10.3",
- "util": "^0.12.4",
- "uuid": "8.0.0",
- "xml2js": "0.6.2"
+ "@aws-crypto/sha256-js": "^5.2.0",
+ "@aws-crypto/supports-web-crypto": "^5.2.0",
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "@aws-sdk/util-locate-window": "^3.0.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
},
"engines": {
- "node": ">= 10.0.0"
+ "node": ">=14.0.0"
}
},
- "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/events": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
- "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-crypto/sha256-js": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+ "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+ "dependencies": {
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "tslib": "^2.6.2"
+ },
"engines": {
- "node": ">=0.4.x"
+ "node": ">=16.0.0"
}
},
- "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/punycode": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
- "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-crypto/supports-web-crypto": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+ "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ }
},
- "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/url": {
- "version": "0.10.3",
- "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
- "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-crypto/util": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+ "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
"dependencies": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
+ "@aws-sdk/types": "^3.222.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
}
},
- "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/uuid": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
- "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
- "bin": {
- "uuid": "dist/bin/uuid"
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/client-s3": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.614.0.tgz",
+ "integrity": "sha512-9BlhfeBegvyjOqHtcr9kvrT80wiy7EVUiqYyTFiiDv/hJIcG88XHQCZdLU7658XBkQ7aFrr5b8rF2HRD1oroxw==",
+ "dependencies": {
+ "@aws-crypto/sha1-browser": "5.2.0",
+ "@aws-crypto/sha256-browser": "5.2.0",
+ "@aws-crypto/sha256-js": "5.2.0",
+ "@aws-sdk/client-sso-oidc": "3.614.0",
+ "@aws-sdk/client-sts": "3.614.0",
+ "@aws-sdk/core": "3.614.0",
+ "@aws-sdk/credential-provider-node": "3.614.0",
+ "@aws-sdk/middleware-bucket-endpoint": "3.614.0",
+ "@aws-sdk/middleware-expect-continue": "3.609.0",
+ "@aws-sdk/middleware-flexible-checksums": "3.614.0",
+ "@aws-sdk/middleware-host-header": "3.609.0",
+ "@aws-sdk/middleware-location-constraint": "3.609.0",
+ "@aws-sdk/middleware-logger": "3.609.0",
+ "@aws-sdk/middleware-recursion-detection": "3.609.0",
+ "@aws-sdk/middleware-sdk-s3": "3.614.0",
+ "@aws-sdk/middleware-signing": "3.609.0",
+ "@aws-sdk/middleware-ssec": "3.609.0",
+ "@aws-sdk/middleware-user-agent": "3.614.0",
+ "@aws-sdk/region-config-resolver": "3.614.0",
+ "@aws-sdk/signature-v4-multi-region": "3.614.0",
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-endpoints": "3.614.0",
+ "@aws-sdk/util-user-agent-browser": "3.609.0",
+ "@aws-sdk/util-user-agent-node": "3.614.0",
+ "@aws-sdk/xml-builder": "3.609.0",
+ "@smithy/config-resolver": "^3.0.5",
+ "@smithy/core": "^2.2.6",
+ "@smithy/eventstream-serde-browser": "^3.0.4",
+ "@smithy/eventstream-serde-config-resolver": "^3.0.3",
+ "@smithy/eventstream-serde-node": "^3.0.4",
+ "@smithy/fetch-http-handler": "^3.2.1",
+ "@smithy/hash-blob-browser": "^3.1.2",
+ "@smithy/hash-node": "^3.0.3",
+ "@smithy/hash-stream-node": "^3.1.2",
+ "@smithy/invalid-dependency": "^3.0.3",
+ "@smithy/md5-js": "^3.0.3",
+ "@smithy/middleware-content-length": "^3.0.3",
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/middleware-retry": "^3.0.9",
+ "@smithy/middleware-serde": "^3.0.3",
+ "@smithy/middleware-stack": "^3.0.3",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/node-http-handler": "^3.1.2",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/url-parser": "^3.0.3",
+ "@smithy/util-base64": "^3.0.0",
+ "@smithy/util-body-length-browser": "^3.0.0",
+ "@smithy/util-body-length-node": "^3.0.0",
+ "@smithy/util-defaults-mode-browser": "^3.0.9",
+ "@smithy/util-defaults-mode-node": "^3.0.9",
+ "@smithy/util-endpoints": "^2.0.5",
+ "@smithy/util-retry": "^3.0.3",
+ "@smithy/util-stream": "^3.0.6",
+ "@smithy/util-utf8": "^3.0.0",
+ "@smithy/util-waiter": "^3.1.2",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/client-sso": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.614.0.tgz",
+ "integrity": "sha512-p5pyYaxRzBttjBkqfc8i3K7DzBdTg3ECdVgBo6INIUxfvDy0J8QUE8vNtCgvFIkq+uPw/8M+Eo4zzln7anuO0Q==",
+ "dependencies": {
+ "@aws-crypto/sha256-browser": "5.2.0",
+ "@aws-crypto/sha256-js": "5.2.0",
+ "@aws-sdk/core": "3.614.0",
+ "@aws-sdk/middleware-host-header": "3.609.0",
+ "@aws-sdk/middleware-logger": "3.609.0",
+ "@aws-sdk/middleware-recursion-detection": "3.609.0",
+ "@aws-sdk/middleware-user-agent": "3.614.0",
+ "@aws-sdk/region-config-resolver": "3.614.0",
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-endpoints": "3.614.0",
+ "@aws-sdk/util-user-agent-browser": "3.609.0",
+ "@aws-sdk/util-user-agent-node": "3.614.0",
+ "@smithy/config-resolver": "^3.0.5",
+ "@smithy/core": "^2.2.6",
+ "@smithy/fetch-http-handler": "^3.2.1",
+ "@smithy/hash-node": "^3.0.3",
+ "@smithy/invalid-dependency": "^3.0.3",
+ "@smithy/middleware-content-length": "^3.0.3",
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/middleware-retry": "^3.0.9",
+ "@smithy/middleware-serde": "^3.0.3",
+ "@smithy/middleware-stack": "^3.0.3",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/node-http-handler": "^3.1.2",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/url-parser": "^3.0.3",
+ "@smithy/util-base64": "^3.0.0",
+ "@smithy/util-body-length-browser": "^3.0.0",
+ "@smithy/util-body-length-node": "^3.0.0",
+ "@smithy/util-defaults-mode-browser": "^3.0.9",
+ "@smithy/util-defaults-mode-node": "^3.0.9",
+ "@smithy/util-endpoints": "^2.0.5",
+ "@smithy/util-middleware": "^3.0.3",
+ "@smithy/util-retry": "^3.0.3",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/client-sso-oidc": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.614.0.tgz",
+ "integrity": "sha512-BI1NWcpppbHg/28zbUg54dZeckork8BItZIcjls12vxasy+p3iEzrJVG60jcbUTTsk3Qc1tyxNfrdcVqx0y7Ww==",
+ "dependencies": {
+ "@aws-crypto/sha256-browser": "5.2.0",
+ "@aws-crypto/sha256-js": "5.2.0",
+ "@aws-sdk/core": "3.614.0",
+ "@aws-sdk/credential-provider-node": "3.614.0",
+ "@aws-sdk/middleware-host-header": "3.609.0",
+ "@aws-sdk/middleware-logger": "3.609.0",
+ "@aws-sdk/middleware-recursion-detection": "3.609.0",
+ "@aws-sdk/middleware-user-agent": "3.614.0",
+ "@aws-sdk/region-config-resolver": "3.614.0",
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-endpoints": "3.614.0",
+ "@aws-sdk/util-user-agent-browser": "3.609.0",
+ "@aws-sdk/util-user-agent-node": "3.614.0",
+ "@smithy/config-resolver": "^3.0.5",
+ "@smithy/core": "^2.2.6",
+ "@smithy/fetch-http-handler": "^3.2.1",
+ "@smithy/hash-node": "^3.0.3",
+ "@smithy/invalid-dependency": "^3.0.3",
+ "@smithy/middleware-content-length": "^3.0.3",
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/middleware-retry": "^3.0.9",
+ "@smithy/middleware-serde": "^3.0.3",
+ "@smithy/middleware-stack": "^3.0.3",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/node-http-handler": "^3.1.2",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/url-parser": "^3.0.3",
+ "@smithy/util-base64": "^3.0.0",
+ "@smithy/util-body-length-browser": "^3.0.0",
+ "@smithy/util-body-length-node": "^3.0.0",
+ "@smithy/util-defaults-mode-browser": "^3.0.9",
+ "@smithy/util-defaults-mode-node": "^3.0.9",
+ "@smithy/util-endpoints": "^2.0.5",
+ "@smithy/util-middleware": "^3.0.3",
+ "@smithy/util-retry": "^3.0.3",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@aws-sdk/client-sts": "^3.614.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/client-sts": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.614.0.tgz",
+ "integrity": "sha512-i6QmaVA1KHHYNnI2VYQy/sc31rLm4+jSp8b/YbQpFnD0w3aXsrEEHHlxek45uSkHb4Nrj1omFBVy/xp1WVYx2Q==",
+ "dependencies": {
+ "@aws-crypto/sha256-browser": "5.2.0",
+ "@aws-crypto/sha256-js": "5.2.0",
+ "@aws-sdk/client-sso-oidc": "3.614.0",
+ "@aws-sdk/core": "3.614.0",
+ "@aws-sdk/credential-provider-node": "3.614.0",
+ "@aws-sdk/middleware-host-header": "3.609.0",
+ "@aws-sdk/middleware-logger": "3.609.0",
+ "@aws-sdk/middleware-recursion-detection": "3.609.0",
+ "@aws-sdk/middleware-user-agent": "3.614.0",
+ "@aws-sdk/region-config-resolver": "3.614.0",
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-endpoints": "3.614.0",
+ "@aws-sdk/util-user-agent-browser": "3.609.0",
+ "@aws-sdk/util-user-agent-node": "3.614.0",
+ "@smithy/config-resolver": "^3.0.5",
+ "@smithy/core": "^2.2.6",
+ "@smithy/fetch-http-handler": "^3.2.1",
+ "@smithy/hash-node": "^3.0.3",
+ "@smithy/invalid-dependency": "^3.0.3",
+ "@smithy/middleware-content-length": "^3.0.3",
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/middleware-retry": "^3.0.9",
+ "@smithy/middleware-serde": "^3.0.3",
+ "@smithy/middleware-stack": "^3.0.3",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/node-http-handler": "^3.1.2",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/url-parser": "^3.0.3",
+ "@smithy/util-base64": "^3.0.0",
+ "@smithy/util-body-length-browser": "^3.0.0",
+ "@smithy/util-body-length-node": "^3.0.0",
+ "@smithy/util-defaults-mode-browser": "^3.0.9",
+ "@smithy/util-defaults-mode-node": "^3.0.9",
+ "@smithy/util-endpoints": "^2.0.5",
+ "@smithy/util-middleware": "^3.0.3",
+ "@smithy/util-retry": "^3.0.3",
+ "@smithy/util-utf8": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/credential-provider-env": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz",
+ "integrity": "sha512-v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/credential-provider-ini": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.614.0.tgz",
+ "integrity": "sha512-KfLuLFGwlvFSZ2MuzYwWGPb1y5TeiwX5okIDe0aQ1h10oD3924FXbN+mabOnUHQ8EFcGAtCaWbrC86mI7ktC6A==",
+ "dependencies": {
+ "@aws-sdk/credential-provider-env": "3.609.0",
+ "@aws-sdk/credential-provider-http": "3.614.0",
+ "@aws-sdk/credential-provider-process": "3.614.0",
+ "@aws-sdk/credential-provider-sso": "3.614.0",
+ "@aws-sdk/credential-provider-web-identity": "3.609.0",
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/credential-provider-imds": "^3.1.4",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/shared-ini-file-loader": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@aws-sdk/client-sts": "^3.614.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/credential-provider-node": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.614.0.tgz",
+ "integrity": "sha512-4J6gPEuFZP0mkWq5E//oMS1vrmMM88iNNcv7TEljYnsc6JTAlKejCyFwx6CN+nkIhmIZsl06SXIhBemzBdBPfg==",
+ "dependencies": {
+ "@aws-sdk/credential-provider-env": "3.609.0",
+ "@aws-sdk/credential-provider-http": "3.614.0",
+ "@aws-sdk/credential-provider-ini": "3.614.0",
+ "@aws-sdk/credential-provider-process": "3.614.0",
+ "@aws-sdk/credential-provider-sso": "3.614.0",
+ "@aws-sdk/credential-provider-web-identity": "3.609.0",
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/credential-provider-imds": "^3.1.4",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/shared-ini-file-loader": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/credential-provider-process": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.614.0.tgz",
+ "integrity": "sha512-Q0SI0sTRwi8iNODLs5+bbv8vgz8Qy2QdxbCHnPk/6Cx6LMf7i3dqmWquFbspqFRd8QiqxStrblwxrUYZi09tkA==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/shared-ini-file-loader": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/credential-provider-sso": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.614.0.tgz",
+ "integrity": "sha512-55+gp0JY4451cWI1qXmVMFM0GQaBKiQpXv2P0xmd9P3qLDyeFUSEW8XPh0d2lb1ICr6x4s47ynXVdGCIv2mXMg==",
+ "dependencies": {
+ "@aws-sdk/client-sso": "3.614.0",
+ "@aws-sdk/token-providers": "3.614.0",
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/shared-ini-file-loader": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/credential-provider-web-identity": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz",
+ "integrity": "sha512-U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@aws-sdk/client-sts": "^3.609.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/lib-storage": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.614.0.tgz",
+ "integrity": "sha512-Bzni+r7pS+nRiqcmWPpB/OiQEM4GszGRp1DXpL3rKnwaeu+Qgf2w12DULxWUacIvOc4IzLsv6tpEidQ/P1zKQg==",
+ "dependencies": {
+ "@smithy/abort-controller": "^3.1.1",
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/smithy-client": "^3.1.7",
+ "buffer": "5.6.0",
+ "events": "3.3.0",
+ "stream-browserify": "3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@aws-sdk/client-s3": "^3.614.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-bucket-endpoint": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.614.0.tgz",
+ "integrity": "sha512-TqEY8KcZeZ0LIxXaqG9RSSNnDHvD8RAFP4Xenwsxqnyad0Yn7LgCoFwRByelJ0t54ROYL1/ETJleWE4U4TOXdg==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-arn-parser": "3.568.0",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-config-provider": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-expect-continue": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.609.0.tgz",
+ "integrity": "sha512-+zeg//mSer4JZRxOB/4mUOMUJyuYPwATnIC5moBB8P8Xe+mJaVRFy8qlCtzYNj2TycnlsBPzTK0j7P1yvDh97w==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-host-header": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.609.0.tgz",
+ "integrity": "sha512-iTKfo158lc4jLDfYeZmYMIBHsn8m6zX+XB6birCSNZ/rrlzAkPbGE43CNdKfvjyWdqgLMRXF+B+OcZRvqhMXPQ==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-location-constraint": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.609.0.tgz",
+ "integrity": "sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-logger": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz",
+ "integrity": "sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-recursion-detection": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.609.0.tgz",
+ "integrity": "sha512-6sewsYB7/o/nbUfA99Aa/LokM+a/u4Wpm/X2o0RxOsDtSB795ObebLJe2BxY5UssbGaWkn7LswyfvrdZNXNj1w==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-sdk-s3": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.614.0.tgz",
+ "integrity": "sha512-9fJTaiuuOfFV4FqmUEhPYzrtv7JOfYpB7q65oG3uayVH4ngWHIJkjnnX79zRhNZKdPGta+XIsnZzjEghg82ngA==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-arn-parser": "3.568.0",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/signature-v4": "^3.1.2",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-config-provider": "^3.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-signing": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.609.0.tgz",
+ "integrity": "sha512-2w3dBLjQVKIajYzokO4hduq8/0hSMUYHHmIo1Kdl+MSY8uwRBt12bLL6pyreobTcRMxizvn2ph/CQ9I1ST/WGQ==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/signature-v4": "^3.1.2",
+ "@smithy/types": "^3.3.0",
+ "@smithy/util-middleware": "^3.0.3",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-ssec": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.609.0.tgz",
+ "integrity": "sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/middleware-user-agent": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.614.0.tgz",
+ "integrity": "sha512-xUxh0UPQiMTG6E31Yvu6zVYlikrIcFDKljM11CaatInzvZubGTGiX0DjpqRlfGzUNsuPc/zNrKwRP2+wypgqIw==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-endpoints": "3.614.0",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/s3-request-presigner": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.614.0.tgz",
+ "integrity": "sha512-KCXFfnkW8QVtigvStA3zvIHBp/FmwwCBcMgp3WjJNNPVKit3RM70veAWJBZUghHmHtd9fTijO2uwzHtusjkyHw==",
+ "dependencies": {
+ "@aws-sdk/signature-v4-multi-region": "3.614.0",
+ "@aws-sdk/types": "3.609.0",
+ "@aws-sdk/util-format-url": "3.609.0",
+ "@smithy/middleware-endpoint": "^3.0.5",
+ "@smithy/protocol-http": "^4.0.3",
+ "@smithy/smithy-client": "^3.1.7",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/token-providers": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz",
+ "integrity": "sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/property-provider": "^3.1.3",
+ "@smithy/shared-ini-file-loader": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@aws-sdk/client-sso-oidc": "^3.614.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/types": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+ "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/util-arn-parser": {
+ "version": "3.568.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.568.0.tgz",
+ "integrity": "sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/util-format-url": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.609.0.tgz",
+ "integrity": "sha512-fuk29BI/oLQlJ7pfm6iJ4gkEpHdavffAALZwXh9eaY1vQ0ip0aKfRTiNudPoJjyyahnz5yJ1HkmlcDitlzsOrQ==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/querystring-builder": "^3.0.3",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/util-user-agent-browser": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz",
+ "integrity": "sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/types": "^3.3.0",
+ "bowser": "^2.11.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/util-user-agent-node": {
+ "version": "3.614.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz",
+ "integrity": "sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==",
+ "dependencies": {
+ "@aws-sdk/types": "3.609.0",
+ "@smithy/node-config-provider": "^3.1.4",
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "aws-crt": ">=1.0.0"
+ },
+ "peerDependenciesMeta": {
+ "aws-crt": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@aws-sdk/xml-builder": {
+ "version": "3.609.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.609.0.tgz",
+ "integrity": "sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==",
+ "dependencies": {
+ "@smithy/types": "^3.3.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@smithy/is-array-buffer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/@smithy/util-buffer-from": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+ "dependencies": {
+ "@smithy/is-array-buffer": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@tagspaces/tagspaces-common-aws3/node_modules/buffer": {
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
+ "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
+ "dependencies": {
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4"
}
},
"node_modules/@tagspaces/tagspaces-common-cordova": {
- "version": "4.3.28",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.3.28.tgz",
- "integrity": "sha512-GsrlhGN4Xvlpx2sONd3mEVALPJmZB7hIR4/RFlcWrotAA8/N5K+pKPrOiYiUVHEkMdX6ueWbbzegVve8D10l3A==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.4.6.tgz",
+ "integrity": "sha512-x4wy1W3Bm1zWmrZ5hBydcY2xU4S1GyZxDnC42S7Y6xgI6QB8TRmejda29pz/UPKOKbCNDVT4qRoJolgCJiZE9w==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.26"
+ "@tagspaces/tagspaces-common": "^4.4.6"
}
},
"node_modules/@tagspaces/tagspaces-common/node_modules/uuid": {
@@ -13828,11 +15682,11 @@
}
},
"node_modules/@tagspaces/tagspaces-indexer": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.3.26.tgz",
- "integrity": "sha512-oRZ+3iiZNSYVY7PSQtReWSSM9Lq9xv3nW3uAP58foD3uXPmvzhT9+zD2DEV9q8uSh7C+/fGbdcGBRlSow+HUSg==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.4.6.tgz",
+ "integrity": "sha512-5GdpU5dd9ef4YxftZLHS0DC7WBNbXcnCJTVAFooSS4KRjFecV7arF5vbAit7/z+s6nGE6F+9sW0+aUo3BYywJA==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.26"
+ "@tagspaces/tagspaces-common": "^4.4.6"
}
},
"node_modules/@tagspaces/tagspaces-md": {
@@ -13874,9 +15728,9 @@
}
},
"node_modules/@tagspacespro/tagspacespro": {
- "version": "5.0.63",
- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.63/2f3130071624332aa832f03cb0bed6edeb61a190",
- "integrity": "sha512-zoKMwpvltW2VmyV+JKKidxlKOrJXmupQdlfPiRM/khiN7mXLVGhHyMKQalbwbrYIQoKVFbDHrZqVYdU1xg2R9Q==",
+ "version": "5.0.64-alpha.8",
+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.64-alpha.8/87a0363add2f48b2c4fa230b453376feca460f5a",
+ "integrity": "sha512-iKgJ3bVymo9BVderj1LfoDMnfu8nGJS8zPvTJYONjsUv493b9BMAvFY3H/qV4hqcF8YlcARiFSAEH0Mgq+dFQw==",
"license": "Proprietary",
"optional": true
},
@@ -14653,6 +16507,15 @@
"@types/react": "*"
}
},
+ "node_modules/@types/react-image-gallery": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/@types/react-image-gallery/-/react-image-gallery-1.2.4.tgz",
+ "integrity": "sha512-H0xpmT5rlSH0qiTvcUDCPDLRBi3J3Xa4COqaDqGb7ffLFpQoPAxpZdNuKCuThhFI0xJmNnMubZiD6B3kCBHtcw==",
+ "dev": true,
+ "dependencies": {
+ "@types/react": "*"
+ }
+ },
"node_modules/@types/react-redux": {
"version": "7.1.33",
"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz",
@@ -14798,6 +16661,12 @@
"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
"dev": true
},
+ "node_modules/@types/triple-beam": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
+ "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
+ "dev": true
+ },
"node_modules/@types/trusted-types": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -16479,6 +18348,7 @@
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
"integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+ "dev": true,
"dependencies": {
"possible-typed-array-names": "^1.0.0"
},
@@ -16509,57 +18379,6 @@
"@aws-amplify/xr": "3.0.64"
}
},
- "node_modules/aws-sdk": {
- "version": "2.1629.0",
- "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1629.0.tgz",
- "integrity": "sha512-fxhru9iLRqwsYK9BJgawomKAyxpsWVP5Unwa//rnQXCeX5pfYCaixKyV/B6U1x4LMcz3uN83tYvVah8uHxhTqA==",
- "hasInstallScript": true,
- "dependencies": {
- "buffer": "4.9.2",
- "events": "1.1.1",
- "ieee754": "1.1.13",
- "jmespath": "0.16.0",
- "querystring": "0.2.0",
- "sax": "1.2.1",
- "url": "0.10.3",
- "util": "^0.12.4",
- "uuid": "8.0.0",
- "xml2js": "0.6.2"
- },
- "engines": {
- "node": ">= 10.0.0"
- }
- },
- "node_modules/aws-sdk/node_modules/events": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
- "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
- "engines": {
- "node": ">=0.4.x"
- }
- },
- "node_modules/aws-sdk/node_modules/punycode": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
- "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
- },
- "node_modules/aws-sdk/node_modules/url": {
- "version": "0.10.3",
- "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
- "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
- "dependencies": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
- }
- },
- "node_modules/aws-sdk/node_modules/uuid": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
- "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
- "bin": {
- "uuid": "dist/bin/uuid"
- }
- },
"node_modules/aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -17321,6 +19140,18 @@
"integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
"dev": true
},
+ "node_modules/busboy": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz",
+ "integrity": "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==",
+ "dev": true,
+ "dependencies": {
+ "dicer": "0.3.0"
+ },
+ "engines": {
+ "node": ">=4.5.0"
+ }
+ },
"node_modules/bytes": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -17419,6 +19250,19 @@
"node": ">=0.10.0"
}
},
+ "node_modules/cache-content-type": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz",
+ "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==",
+ "dev": true,
+ "dependencies": {
+ "mime-types": "^2.1.18",
+ "ylru": "^1.2.0"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
"node_modules/cacheable-lookup": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
@@ -18042,6 +19886,16 @@
"node": ">=0.10.0"
}
},
+ "node_modules/color": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+ "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^1.9.3",
+ "color-string": "^1.6.0"
+ }
+ },
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -18058,6 +19912,16 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
+ "node_modules/color-string": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+ "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "^1.0.0",
+ "simple-swizzle": "^0.2.2"
+ }
+ },
"node_modules/color-support": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -18067,6 +19931,21 @@
"color-support": "bin.js"
}
},
+ "node_modules/color/node_modules/color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "1.1.3"
+ }
+ },
+ "node_modules/color/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
"node_modules/colord": {
"version": "2.9.3",
"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
@@ -18079,6 +19958,16 @@
"integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
"peer": true
},
+ "node_modules/colorspace": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+ "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
+ "dev": true,
+ "dependencies": {
+ "color": "^3.1.3",
+ "text-hex": "1.0.x"
+ }
+ },
"node_modules/combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -18688,6 +20577,19 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"dev": true
},
+ "node_modules/cookies": {
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
+ "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
+ "dev": true,
+ "dependencies": {
+ "depd": "~2.0.0",
+ "keygrip": "~1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
"node_modules/coordinate-parser": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/coordinate-parser/-/coordinate-parser-1.0.7.tgz",
@@ -20377,6 +22279,18 @@
"wrappy": "1"
}
},
+ "node_modules/dicer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz",
+ "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==",
+ "dev": true,
+ "dependencies": {
+ "streamsearch": "0.1.2"
+ },
+ "engines": {
+ "node": ">=4.5.0"
+ }
+ },
"node_modules/diff": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -21073,6 +22987,12 @@
"url": "https://github.com/sponsors/wooorm"
}
},
+ "node_modules/enabled": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
+ "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
+ "dev": true
+ },
"node_modules/encode-utf8": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
@@ -23761,6 +25681,12 @@
"pend": "~1.2.0"
}
},
+ "node_modules/fecha": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
+ "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
+ "dev": true
+ },
"node_modules/fflate": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.3.tgz",
@@ -24102,6 +26028,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/fn.name": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
+ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
+ "dev": true
+ },
"node_modules/follow-redirects": {
"version": "1.15.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
@@ -24125,6 +26057,7 @@
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+ "dev": true,
"dependencies": {
"is-callable": "^1.1.3"
}
@@ -25002,6 +26935,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+ "dev": true,
"dependencies": {
"has-symbols": "^1.0.3"
},
@@ -25375,6 +27309,59 @@
"url": "https://github.com/fb55/entities?sponsor=1"
}
},
+ "node_modules/http-assert": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz",
+ "integrity": "sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==",
+ "dev": true,
+ "dependencies": {
+ "deep-equal": "~1.0.1",
+ "http-errors": "~1.8.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/http-assert/node_modules/deep-equal": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+ "integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==",
+ "dev": true
+ },
+ "node_modules/http-assert/node_modules/depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/http-assert/node_modules/http-errors": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+ "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+ "dev": true,
+ "dependencies": {
+ "depd": "~1.1.2",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": ">= 1.5.0 < 2",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/http-assert/node_modules/statuses": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/http-cache-semantics": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
@@ -25542,6 +27529,12 @@
"ms": "^2.0.0"
}
},
+ "node_modules/humanize-number": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/humanize-number/-/humanize-number-0.0.2.tgz",
+ "integrity": "sha512-un3ZAcNQGI7RzaWGZzQDH47HETM4Wrj6z6E4TId8Yeq9w5ZKUVB1nrT2jwFheTUjEmqcgTjXDc959jum+ai1kQ==",
+ "dev": true
+ },
"node_modules/husky": {
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
@@ -25908,6 +27901,7 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+ "dev": true,
"dependencies": {
"call-bind": "^1.0.2",
"has-tostringtag": "^1.0.0"
@@ -26005,6 +27999,7 @@
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+ "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -26165,6 +28160,7 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+ "dev": true,
"dependencies": {
"has-tostringtag": "^1.0.0"
},
@@ -26446,6 +28442,7 @@
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
"integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+ "dev": true,
"dependencies": {
"which-typed-array": "^1.1.14"
},
@@ -27922,14 +29919,6 @@
"url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
- "node_modules/jmespath": {
- "version": "0.16.0",
- "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
- "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==",
- "engines": {
- "node": ">= 0.6.0"
- }
- },
"node_modules/joi": {
"version": "17.13.1",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.13.1.tgz",
@@ -28385,6 +30374,18 @@
"resolved": "https://registry.npmjs.org/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz",
"integrity": "sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw=="
},
+ "node_modules/keygrip": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+ "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+ "dev": true,
+ "dependencies": {
+ "tsscmp": "1.0.6"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/keyv": {
"version": "4.5.4",
"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -28422,6 +30423,185 @@
"integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==",
"dev": true
},
+ "node_modules/koa": {
+ "version": "2.15.3",
+ "resolved": "https://registry.npmjs.org/koa/-/koa-2.15.3.tgz",
+ "integrity": "sha512-j/8tY9j5t+GVMLeioLaxweJiKUayFhlGqNTzf2ZGwL0ZCQijd2RLHK0SLW5Tsko8YyyqCZC2cojIb0/s62qTAg==",
+ "dev": true,
+ "dependencies": {
+ "accepts": "^1.3.5",
+ "cache-content-type": "^1.0.0",
+ "content-disposition": "~0.5.2",
+ "content-type": "^1.0.4",
+ "cookies": "~0.9.0",
+ "debug": "^4.3.2",
+ "delegates": "^1.0.0",
+ "depd": "^2.0.0",
+ "destroy": "^1.0.4",
+ "encodeurl": "^1.0.2",
+ "escape-html": "^1.0.3",
+ "fresh": "~0.5.2",
+ "http-assert": "^1.3.0",
+ "http-errors": "^1.6.3",
+ "is-generator-function": "^1.0.7",
+ "koa-compose": "^4.1.0",
+ "koa-convert": "^2.0.0",
+ "on-finished": "^2.3.0",
+ "only": "~0.0.2",
+ "parseurl": "^1.3.2",
+ "statuses": "^1.5.0",
+ "type-is": "^1.6.16",
+ "vary": "^1.1.2"
+ },
+ "engines": {
+ "node": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
+ }
+ },
+ "node_modules/koa-compose": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz",
+ "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==",
+ "dev": true
+ },
+ "node_modules/koa-convert": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz",
+ "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==",
+ "dev": true,
+ "dependencies": {
+ "co": "^4.6.0",
+ "koa-compose": "^4.1.0"
+ },
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/koa-logger": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/koa-logger/-/koa-logger-3.2.1.tgz",
+ "integrity": "sha512-MjlznhLLKy9+kG8nAXKJLM0/ClsQp/Or2vI3a5rbSQmgl8IJBQO0KI5FA70BvW+hqjtxjp49SpH2E7okS6NmHg==",
+ "dev": true,
+ "dependencies": {
+ "bytes": "^3.1.0",
+ "chalk": "^2.4.2",
+ "humanize-number": "0.0.2",
+ "passthrough-counter": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 7.6.0"
+ }
+ },
+ "node_modules/koa-logger/node_modules/ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/koa-logger/node_modules/chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/koa-logger/node_modules/color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "1.1.3"
+ }
+ },
+ "node_modules/koa-logger/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/koa-logger/node_modules/escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/koa-logger/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/koa-logger/node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/koa/node_modules/http-errors": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+ "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+ "dev": true,
+ "dependencies": {
+ "depd": "~1.1.2",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": ">= 1.5.0 < 2",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/koa/node_modules/http-errors/node_modules/depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/koa/node_modules/statuses": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/kuler": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
+ "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==",
+ "dev": true
+ },
"node_modules/language-subtag-registry": {
"version": "0.3.23",
"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
@@ -29903,6 +32083,23 @@
"node": ">=4"
}
},
+ "node_modules/logform": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz",
+ "integrity": "sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==",
+ "dev": true,
+ "dependencies": {
+ "@colors/colors": "1.6.0",
+ "@types/triple-beam": "^1.3.2",
+ "fecha": "^4.2.0",
+ "ms": "^2.1.1",
+ "safe-stable-stringify": "^2.3.1",
+ "triple-beam": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
"node_modules/logkitty": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/logkitty/-/logkitty-0.7.1.tgz",
@@ -39907,6 +42104,15 @@
"wrappy": "1"
}
},
+ "node_modules/one-time": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
+ "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+ "dev": true,
+ "dependencies": {
+ "fn.name": "1.x.x"
+ }
+ },
"node_modules/onetime": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -39919,6 +42125,12 @@
"node": ">=4"
}
},
+ "node_modules/only": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz",
+ "integrity": "sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==",
+ "dev": true
+ },
"node_modules/open": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
@@ -40330,6 +42542,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/passthrough-counter": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/passthrough-counter/-/passthrough-counter-1.0.0.tgz",
+ "integrity": "sha512-Wy8PXTLqPAN0oEgBrlnsXPMww3SYJ44tQ8aVrGAI4h4JZYCS0oYqsPqtPR8OhJpv6qFbpbB7XAn0liKV7EXubA==",
+ "dev": true
+ },
"node_modules/path-exists": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -40685,6 +42903,7 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+ "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -41850,15 +44069,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/querystring": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
- "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
- "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
- "engines": {
- "node": ">=0.4.x"
- }
- },
"node_modules/querystringify": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -42265,9 +44475,9 @@
}
},
"node_modules/react-image-gallery": {
- "version": "1.2.11",
- "resolved": "https://registry.npmjs.org/react-image-gallery/-/react-image-gallery-1.2.11.tgz",
- "integrity": "sha512-YLMCdNSCf3YPhRmnjEOdEZGEXghTMx4o3dlAqd0rz0nAyebUvTz/xJnIHPActbPSHCvVJgt5A09EPHYbGqw++w==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/react-image-gallery/-/react-image-gallery-1.3.0.tgz",
+ "integrity": "sha512-lKnPaOzxqSdujPFyl+CkVw0j1aYoNCHk61cvr1h7aahf5aWqmPcR9YhUB4cYrt5Tn5KHDaPUzYm5/+cX9WxzaA==",
"peerDependencies": {
"react": "^16.0.0 || ^17.0.0 || ^18.0.0"
}
@@ -44220,6 +46430,54 @@
"tslib": "^2.1.0"
}
},
+ "node_modules/s3rver": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/s3rver/-/s3rver-3.7.1.tgz",
+ "integrity": "sha512-H9KIX6n8NqcfoE4ziFNbQASBQfjcNJgb+3wbT9L5iotEqfOncFO1c38cfJSFSo7xXTu1zM9HA6t2u9xKNlYRaA==",
+ "dev": true,
+ "dependencies": {
+ "@koa/router": "^9.0.0",
+ "busboy": "^0.3.1",
+ "commander": "^5.0.0",
+ "fast-xml-parser": "^3.12.19",
+ "fs-extra": "^8.0.0",
+ "he": "^1.2.0",
+ "koa": "^2.7.0",
+ "koa-logger": "^3.2.0",
+ "lodash": "^4.17.5",
+ "statuses": "^2.0.0",
+ "winston": "^3.0.0"
+ },
+ "bin": {
+ "s3rver": "bin/s3rver.js"
+ },
+ "engines": {
+ "node": ">=8.3.0"
+ }
+ },
+ "node_modules/s3rver/node_modules/fs-extra": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=6 <7 || >=8"
+ }
+ },
+ "node_modules/s3rver/node_modules/universalify": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
"node_modules/sade": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
@@ -44300,6 +46558,15 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/safe-stable-stringify": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
+ "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -44375,11 +46642,6 @@
}
}
},
- "node_modules/sax": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
- "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
- },
"node_modules/saxes": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
@@ -44900,6 +47162,21 @@
"debug": "^4.0.1"
}
},
+ "node_modules/simple-swizzle": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+ "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+ "dev": true,
+ "dependencies": {
+ "is-arrayish": "^0.3.1"
+ }
+ },
+ "node_modules/simple-swizzle/node_modules/is-arrayish": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+ "dev": true
+ },
"node_modules/simple-update-notifier": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
@@ -45460,6 +47737,15 @@
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
+ "node_modules/stack-trace": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+ "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/stack-utils": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
@@ -45590,6 +47876,24 @@
"node": ">= 0.4"
}
},
+ "node_modules/stream-browserify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+ "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+ "dependencies": {
+ "inherits": "~2.0.4",
+ "readable-stream": "^3.5.0"
+ }
+ },
+ "node_modules/streamsearch": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
+ "integrity": "sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
"node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -46603,6 +48907,12 @@
"deprecated": "no longer maintained",
"dev": true
},
+ "node_modules/text-hex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+ "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
+ "dev": true
+ },
"node_modules/text-segmentation": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
@@ -46883,6 +49193,15 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/triple-beam": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
+ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 14.0.0"
+ }
+ },
"node_modules/trough": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
@@ -47154,6 +49473,15 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
},
+ "node_modules/tsscmp": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+ "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.6.x"
+ }
+ },
"node_modules/tsutils": {
"version": "3.21.0",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
@@ -47977,18 +50305,6 @@
"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
},
- "node_modules/util": {
- "version": "0.12.5",
- "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
- "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
- "dependencies": {
- "inherits": "^2.0.3",
- "is-arguments": "^1.0.4",
- "is-generator-function": "^1.0.7",
- "is-typed-array": "^1.1.3",
- "which-typed-array": "^1.1.2"
- }
- },
"node_modules/util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -48982,6 +51298,7 @@
"version": "1.1.15",
"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
"integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+ "dev": true,
"dependencies": {
"available-typed-arrays": "^1.0.7",
"call-bind": "^1.0.7",
@@ -49011,6 +51328,54 @@
"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
"dev": true
},
+ "node_modules/winston": {
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz",
+ "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==",
+ "dev": true,
+ "dependencies": {
+ "@colors/colors": "^1.6.0",
+ "@dabh/diagnostics": "^2.0.2",
+ "async": "^3.2.3",
+ "is-stream": "^2.0.0",
+ "logform": "^2.6.0",
+ "one-time": "^1.0.0",
+ "readable-stream": "^3.4.0",
+ "safe-stable-stringify": "^2.3.1",
+ "stack-trace": "0.0.x",
+ "triple-beam": "^1.3.0",
+ "winston-transport": "^4.7.0"
+ },
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
+ "node_modules/winston-transport": {
+ "version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.1.tgz",
+ "integrity": "sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA==",
+ "dev": true,
+ "dependencies": {
+ "logform": "^2.6.1",
+ "readable-stream": "^3.6.2",
+ "triple-beam": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
+ "node_modules/winston/node_modules/is-stream": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/word-wrap": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
@@ -49171,26 +51536,6 @@
"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
"dev": true
},
- "node_modules/xml2js": {
- "version": "0.6.2",
- "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
- "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
- "dependencies": {
- "sax": ">=0.6.0",
- "xmlbuilder": "~11.0.0"
- },
- "engines": {
- "node": ">=4.0.0"
- }
- },
- "node_modules/xml2js/node_modules/xmlbuilder": {
- "version": "11.0.1",
- "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
- "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
- "engines": {
- "node": ">=4.0"
- }
- },
"node_modules/xmlbuilder": {
"version": "15.1.1",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
@@ -49289,6 +51634,15 @@
"fd-slicer": "~1.1.0"
}
},
+ "node_modules/ylru": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.4.0.tgz",
+ "integrity": "sha512-2OQsPNEmBCvXuFlIni/a+Rn+R2pHW9INm0BxXJ4hVDA8TirqMj+J/Rp9ItLatT/5pZqWwefVrTQcHpixsxnVlA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
"node_modules/yn": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
diff --git a/package.json b/package.json
index d4b6c4d06..317ad3bb2 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
"linux-fix-sandbox": "sudo chown root:root node_modules/electron/dist/chrome-sandbox && sudo chmod 4755 node_modules/electron/dist/chrome-sandbox",
"minio-start": "./tests/bin/minio server ./tests/testdata-tmp/file-structure",
"minio-start-windows": ".\\tests\\bin\\minio.exe server ./tests/testdata-tmp/file-structure",
+ "s3server-start": "cross-env NODE_OPTIONS=--openssl-legacy-provider ts-node ./scripts/startS3server.js",
"scope-login": "npm login --scope=@tagspacespro --registry=https://npm.pkg.github.com",
"package": "ts-node ./.erb/scripts/clean.js && npm run build && electron-builder build --publish never && npm run build:dll",
"package-android": "npm run build:cordova && cd cordova && npm install && cordova build --release android",
@@ -133,9 +134,12 @@
"test-clone-data": "rimraf tests/testdata && git clone https://github.com/tagspaces/testdata tests/testdata",
"test-playwright": "npm run test-refresh-data && cross-env npx playwright test --config ./playwright.config.js -g '^(?!.*\\b_pro\\b).*\\belectron\\b.*'",
"test-playwright-pro": "npm run test-refresh-data && cross-env npx playwright test --config ./playwright.config.js -g '/\\belectron\\b/'",
+ "test-playwright-s3": "npx playwright install --with-deps && cross-env NODE_OPTIONS=--openssl-legacy-provider npx playwright test --config ./playwright.config.s3.js -g '/\\bminio\\b/'",
"test-playwright-minio": "npm run test-refresh-data && cross-env npx playwright test --config ./playwright.config.minio.js -g '/\\bminio\\b/'",
- "test-playwright-web": "npm run test-refresh-data && cross-env npx playwright test --config ./playwright.config.web.js -g '/\\bweb\\b/'",
- "test-playwright-web-headless": "npm run test-refresh-data && cross-env HEADLESS_MODE=true npx playwright test --config ./playwright.config.web.js -g '/\\bweb\\b/'",
+ "test-playwright-web": "npx playwright install --with-deps && cross-env NODE_OPTIONS=--openssl-legacy-provider npx playwright test --config ./playwright.config.web.js -g '/\\bweb\\b/'",
+ "test-playwright-web-headless": "npx playwright install --with-deps && cross-env NODE_OPTIONS=--openssl-legacy-provider HEADLESS_MODE=true npx playwright test --config ./playwright.config.web.js -g '/\\bweb\\b/'",
+ "test-playwright-web-minio": "npm run test-refresh-data && cross-env npx playwright test --config ./playwright.config.web.minio.js -g '/\\bweb\\b/'",
+ "test-playwright-web-headless-minio": "npm run test-refresh-data && cross-env HEADLESS_MODE=true npx playwright test --config ./playwright.config.web.minio.js -g '/\\bweb\\b/'",
"test-pw-web-browsers": "npm run test-refresh-data && cross-env DEBUG=pw:api npx playwright test --config ./playwright.config.web.browsers.js -g '/\\bweb\\b/'",
"test-refresh-data": "rimraf tests/testdata-tmp && shx mkdir -p tests/testdata-tmp/file-structure && shx cp -rL tests/testdata/file-structure tests/testdata-tmp && npx playwright install --with-deps",
"test-unit": "npx playwright test --config ./playwright.unit.js",
@@ -160,13 +164,12 @@
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.3.26",
- "@tagspaces/tagspaces-common-aws3": "4.3.26",
- "@tagspaces/tagspaces-common-cordova": "4.3.28",
- "@tagspaces/tagspaces-indexer": "4.3.26",
+ "@tagspaces/tagspaces-common": "4.4.6",
+ "@tagspaces/tagspaces-common-aws3": "4.4.8",
+ "@tagspaces/tagspaces-common-cordova": "4.4.6",
+ "@tagspaces/tagspaces-indexer": "4.4.6",
"@tagspaces/tagspaces-md": "4.3.30",
"aws-amplify": "^4.3.8",
- "aws-sdk": "^2.1036.0",
"classnames": "^2.3.1",
"clone": "^2.1.2",
"coordinate-parser": "^1.0.7",
@@ -208,7 +211,7 @@
"react-draggable": "^4.4.4",
"react-hotkeys": "^2.0.0",
"react-i18next": "^13.2.2",
- "react-image-gallery": "1.2.11",
+ "react-image-gallery": "1.3.0",
"react-infinite-scroller": "^1.2.6",
"react-leaflet": "^4.2.1",
"react-leaflet-fullscreen": "^4.1.1",
@@ -230,7 +233,7 @@
"uuid": "^9.0.0"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.63"
+ "@tagspacespro/tagspacespro": "5.0.64-alpha.8"
},
"devDependencies": {
"@electron/notarize": "^2.3.2",
@@ -246,6 +249,7 @@
"@types/node": "20.6.2",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
+ "@types/react-image-gallery": "^1.2.4",
"@types/react-redux": "^7.1.24",
"@types/react-router-dom": "^5.3.3",
"@types/react-test-renderer": "^18.0.1",
@@ -314,6 +318,7 @@
"react-test-renderer": "18.2.0",
"redux-logger": "^3.0.6",
"rimraf": "^5.0.1",
+ "s3rver": "^3.7.1",
"sass": "^1.67.0",
"sass-loader": "^13.3.2",
"serve-static": "^1.14.1",
diff --git a/playwright.config.common.js b/playwright.config.common.js
index 73d5b7efb..1bdd4d7d7 100644
--- a/playwright.config.common.js
+++ b/playwright.config.common.js
@@ -6,12 +6,16 @@ const pwConfig = {
// Use the grep option to filter tests by title and file extension
// grep: /.*\.pw\.js$/,
testMatch: /.*\.pw\.e2e\.js/,
+ use: {
+ screenshot: 'only-on-failure', // Automatically take screenshots on failure
+ trace: 'on-first-retry',
+ },
// Set the timeout for each test
timeout: process.env.CI ? 120000 : 300000,
// (2 hours) Maximum time in milliseconds the whole test suite can run. Useful on CI to prevent broken setup from running too long and wasting resources.
globalTimeout: process.env.CI ? 2 * 60 * 60 * 1000 : undefined,
ignoreSnapshots: !process.env.CI,
- retries: process.env.CI ? 3 : 0,
+ retries: process.env.CI ? 2 : 0,
// The maximum number of test failures for the whole test suite run. After reaching this number, testing will stop and exit with an error
maxFailures: 0, // process.env.CI ? 20 : 0,
globalSetup: './tests/global-setup.js',
diff --git a/playwright.config.minio.js b/playwright.config.minio.js
index cf80528bc..4b51ddaa0 100644
--- a/playwright.config.minio.js
+++ b/playwright.config.minio.js
@@ -5,11 +5,12 @@ global.isWeb = false;
global.isWin = /win32|mswin(?!ce)|mingw|bccwin|cygwin/i.test(process.platform);
global.isHeadlessMode = process.env.HEADLESS_MODE === 'true';
global.isMinio = true;
+global.isS3 = false;
global.isElectron = true;
global.isUnitTest = false;
export default defineConfig({
...pwConfig,
- globalSetup: './tests/global-setup-minio.js',
- globalTeardown: './tests/global-teardown-minio.js',
+ //globalSetup: './tests/global-setup-minio.js',
+ //globalTeardown: './tests/global-teardown-minio.js',
});
diff --git a/playwright.config.s3.js b/playwright.config.s3.js
new file mode 100644
index 000000000..b02449574
--- /dev/null
+++ b/playwright.config.s3.js
@@ -0,0 +1,16 @@
+import { defineConfig } from '@playwright/test';
+import pwConfig from './playwright.config.common';
+
+global.isWeb = false;
+global.isWin = /win32|mswin(?!ce)|mingw|bccwin|cygwin/i.test(process.platform);
+global.isHeadlessMode = process.env.HEADLESS_MODE === 'true';
+global.isMinio = false;
+global.isS3 = true;
+global.isElectron = true;
+global.isUnitTest = false;
+
+export default defineConfig({
+ ...pwConfig,
+ //globalSetup: './tests/s3rver/S3rverStart.js',
+ //globalTeardown: './tests/s3rver/S3rverStop.js',
+});
diff --git a/playwright.config.web.js b/playwright.config.web.js
index a416981ff..2c4a9e4f8 100644
--- a/playwright.config.web.js
+++ b/playwright.config.web.js
@@ -6,13 +6,23 @@ import pwConfig from './playwright.config.common';
global.isWeb = true;
global.isWin = /win32|mswin(?!ce)|mingw|bccwin|cygwin/i.test(process.platform);
global.isHeadlessMode = process.env.HEADLESS_MODE === 'true';
-global.isMinio = true;
+global.isMinio = false;
+global.isS3 = true;
global.isElectron = false;
global.isUnitTest = false;
const config = defineConfig({
...pwConfig,
- globalSetup: './tests/global-setup-web.js',
- globalTeardown: './tests/global-teardown-web.js',
+ /*global: {
+ isWeb: true,
+ isWin: /win32|mswin(?!ce)|mingw|bccwin|cygwin/i.test(process.platform),
+ isHeadlessMode: process.env.HEADLESS_MODE === 'true',
+ isMinio: false,
+ isS3: true,
+ isElectron: false,
+ isUnitTest: false
+ }*/
+ // globalSetup: './tests/global-setup-web.js',
+ // globalTeardown: './tests/global-teardown-web.js',
});
export default config;
diff --git a/playwright.config.web.minio.js b/playwright.config.web.minio.js
new file mode 100644
index 000000000..2c5fca780
--- /dev/null
+++ b/playwright.config.web.minio.js
@@ -0,0 +1,19 @@
+import { defineConfig } from '@playwright/test';
+import pwConfig from './playwright.config.common';
+//const dotenv = require('dotenv');
+//dotenv.config({ path: path.resolve(__dirname, 'tests', 'env', 'web.env') });
+
+global.isWeb = true;
+global.isWin = /win32|mswin(?!ce)|mingw|bccwin|cygwin/i.test(process.platform);
+global.isHeadlessMode = process.env.HEADLESS_MODE === 'true';
+global.isMinio = true;
+global.isS3 = false;
+global.isElectron = false;
+global.isUnitTest = false;
+
+const config = defineConfig({
+ ...pwConfig,
+ //globalSetup: './tests/global-setup-web-minio.js',
+ //globalTeardown: './tests/global-teardown-web-minio.js',
+});
+export default config;
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index bd6d79e4c..dfcc362e2 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,19 +1,19 @@
{
"name": "tagspaces",
- "version": "5.9.2",
+ "version": "5.9.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "5.9.2",
+ "version": "5.9.3",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
"@elife/pm2": "3.6.1",
- "@tagspaces/extensions": "1.0.118",
- "@tagspaces/tagspaces-common-node": "4.3.26",
- "@tagspaces/tagspaces-ws": "4.3.27",
+ "@tagspaces/extensions": "1.0.119",
+ "@tagspaces/tagspaces-common-node": "4.4.6",
+ "@tagspaces/tagspaces-ws": "4.4.6",
"sharp": "0.32.6",
"ws": "8.16.0"
},
@@ -30,9 +30,9 @@
}
},
"node_modules/@tagspaces/extensions": {
- "version": "1.0.118",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.118.tgz",
- "integrity": "sha512-nj1tT91NxQwuoHPI1MjeYg67fyeM/1xDgOyzySN+VWG78LH/dg5SNoZp9EpDTlRPlr87sRwl9KNsmxX6X5bI3A==",
+ "version": "1.0.119",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.119.tgz",
+ "integrity": "sha512-rpCosXd9TQO7jO8Sat2xXxn4f0tNIPb8deJ7rlu8kQ/w4xdinbTnnpLwSWtFynXtKWAG4v8gjEIjooBzcSFX+A==",
"dependencies": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
@@ -43,9 +43,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.26.tgz",
- "integrity": "sha512-ml6JaMArt77T6SxrwAihB0HF2DiCYcR/zjAVXL/R83ETYzn+yx4B6etVAqMKYJ41tn4eGVR0SMFlDjpYrUsbAA==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.4.6.tgz",
+ "integrity": "sha512-JAXsfV5uJVi8rBHUExi5farW3355PkdvR+FdpRogLQFNAmVv8A9qlY7BkzlPgusv6JEJP9NJKoTNIJl9s/WeCQ==",
"dependencies": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -53,11 +53,11 @@
}
},
"node_modules/@tagspaces/tagspaces-common-node": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.26.tgz",
- "integrity": "sha512-xsSNkFQzo2bcbHsAaAyWmLKrA3dGipnWft8eMNtiMa6lsemHjA1xTy4jxyvDviixBxwUcRwGofrqD/2xaEJxZg==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.4.6.tgz",
+ "integrity": "sha512-5huaw2789GcqrQsYM7BfXlhaFcEyjhMix4//PWa+M4Tg3ZNdTuUZ7AdCvCxWxw1rTMSaUNdlvkdyAz3DZ1QRYg==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.26",
+ "@tagspaces/tagspaces-common": "^4.4.6",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0",
@@ -74,22 +74,22 @@
}
},
"node_modules/@tagspaces/tagspaces-workers": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.26.tgz",
- "integrity": "sha512-hMGntLZLMaNedLqS6q5aYaeRz6VdJoz2gTSAR9CjNXKr079oYGkhmjwMCcG/vSCuBaCINN2bmHffeA5vqfrdrQ==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.4.6.tgz",
+ "integrity": "sha512-imav5ZvXmvo/pgCdKgGfnAqWCdWCpRSex1P4sikJFOhPbt1AZkHLWDJRttNXwcAHbSIdZ9q3Mx21hT/ygHkIIQ==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.26",
- "@tagspaces/tagspaces-common-node": "^4.3.26",
+ "@tagspaces/tagspaces-common": "^4.4.6",
+ "@tagspaces/tagspaces-common-node": "^4.4.6",
"@tagspaces/tagspaces-thumbgen-image": "^4.2.3",
"fswin": "^3.24.524"
}
},
"node_modules/@tagspaces/tagspaces-ws": {
- "version": "4.3.27",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.27.tgz",
- "integrity": "sha512-+cSSD+noje1a87fv1lGC0U9ffxy+IBnWekqVDvHqnI3VAtzXaufpJz62CqL0coRIGCpFlso+6S15goeW7KF44w==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.4.6.tgz",
+ "integrity": "sha512-PAvdNxTZ1P02DkaCpp9qMeRe1dDDAxscz7h49UCfU3DTFSoVsnCZJi6wvk1JitR9kaMI2gdEH2yQE1YgbGEA8Q==",
"dependencies": {
- "@tagspaces/tagspaces-workers": "^4.3.26",
+ "@tagspaces/tagspaces-workers": "^4.4.6",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^8.5.1",
"ws": "^8.15.1"
@@ -1122,18 +1122,18 @@
}
},
"@tagspaces/extensions": {
- "version": "1.0.118",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.118.tgz",
- "integrity": "sha512-nj1tT91NxQwuoHPI1MjeYg67fyeM/1xDgOyzySN+VWG78LH/dg5SNoZp9EpDTlRPlr87sRwl9KNsmxX6X5bI3A==",
+ "version": "1.0.119",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.119.tgz",
+ "integrity": "sha512-rpCosXd9TQO7jO8Sat2xXxn4f0tNIPb8deJ7rlu8kQ/w4xdinbTnnpLwSWtFynXtKWAG4v8gjEIjooBzcSFX+A==",
"requires": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
}
},
"@tagspaces/tagspaces-common": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.26.tgz",
- "integrity": "sha512-ml6JaMArt77T6SxrwAihB0HF2DiCYcR/zjAVXL/R83ETYzn+yx4B6etVAqMKYJ41tn4eGVR0SMFlDjpYrUsbAA==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.4.6.tgz",
+ "integrity": "sha512-JAXsfV5uJVi8rBHUExi5farW3355PkdvR+FdpRogLQFNAmVv8A9qlY7BkzlPgusv6JEJP9NJKoTNIJl9s/WeCQ==",
"requires": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -1141,11 +1141,11 @@
}
},
"@tagspaces/tagspaces-common-node": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.26.tgz",
- "integrity": "sha512-xsSNkFQzo2bcbHsAaAyWmLKrA3dGipnWft8eMNtiMa6lsemHjA1xTy4jxyvDviixBxwUcRwGofrqD/2xaEJxZg==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.4.6.tgz",
+ "integrity": "sha512-5huaw2789GcqrQsYM7BfXlhaFcEyjhMix4//PWa+M4Tg3ZNdTuUZ7AdCvCxWxw1rTMSaUNdlvkdyAz3DZ1QRYg==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.3.26",
+ "@tagspaces/tagspaces-common": "^4.4.6",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0",
@@ -1162,22 +1162,22 @@
}
},
"@tagspaces/tagspaces-workers": {
- "version": "4.3.26",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.26.tgz",
- "integrity": "sha512-hMGntLZLMaNedLqS6q5aYaeRz6VdJoz2gTSAR9CjNXKr079oYGkhmjwMCcG/vSCuBaCINN2bmHffeA5vqfrdrQ==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.4.6.tgz",
+ "integrity": "sha512-imav5ZvXmvo/pgCdKgGfnAqWCdWCpRSex1P4sikJFOhPbt1AZkHLWDJRttNXwcAHbSIdZ9q3Mx21hT/ygHkIIQ==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.3.26",
- "@tagspaces/tagspaces-common-node": "^4.3.26",
+ "@tagspaces/tagspaces-common": "^4.4.6",
+ "@tagspaces/tagspaces-common-node": "^4.4.6",
"@tagspaces/tagspaces-thumbgen-image": "^4.2.3",
"fswin": "^3.24.524"
}
},
"@tagspaces/tagspaces-ws": {
- "version": "4.3.27",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.27.tgz",
- "integrity": "sha512-+cSSD+noje1a87fv1lGC0U9ffxy+IBnWekqVDvHqnI3VAtzXaufpJz62CqL0coRIGCpFlso+6S15goeW7KF44w==",
+ "version": "4.4.6",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.4.6.tgz",
+ "integrity": "sha512-PAvdNxTZ1P02DkaCpp9qMeRe1dDDAxscz7h49UCfU3DTFSoVsnCZJi6wvk1JitR9kaMI2gdEH2yQE1YgbGEA8Q==",
"requires": {
- "@tagspaces/tagspaces-workers": "^4.3.26",
+ "@tagspaces/tagspaces-workers": "^4.4.6",
"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.json
index 74521f0fc..40b1b50f4 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -18,9 +18,9 @@
},
"dependencies": {
"@elife/pm2": "3.6.1",
- "@tagspaces/extensions": "1.0.118",
- "@tagspaces/tagspaces-common-node": "4.3.26",
- "@tagspaces/tagspaces-ws": "4.3.27",
+ "@tagspaces/extensions": "1.0.119",
+ "@tagspaces/tagspaces-common-node": "4.4.6",
+ "@tagspaces/tagspaces-ws": "4.4.6",
"sharp": "0.32.6",
"ws": "8.16.0"
},
diff --git a/scripts/extconfig-s3-location.js b/scripts/extconfig-s3-location.js
new file mode 100644
index 000000000..d889f4f35
--- /dev/null
+++ b/scripts/extconfig-s3-location.js
@@ -0,0 +1,26 @@
+window.ExtIsFirstRun = false;
+window.ExtCheckForUpdatesOnStartup = false;
+window.ExtUseGenerateThumbnails = true;
+window.ExtLocationsReadOnly = false;
+window.ExtSaveLocationsInBrowser = true;
+window.ExtLocations = [
+ {
+ uuid: '40565f09-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the location
+ type: '1', // 1 defines the locations a cloud based
+ name: 'supported-filestypes', // the name of the location
+ path: '', // the path to sub folder in the location
+ endpointURL: 'http://localhost:4569',
+ accessKeyId: 'S3RVER', // the access key of the user
+ secretAccessKey: 'S3RVER', // the secret case of the user
+ bucketName: 'supported-filestypes', // the name of the S3 bucket
+ region: 'eu-central-1', // the AWS region
+ isDefault: true, // if true this location will be loaded by the application start
+ isReadOnly: false, // if true the user interface of the application turns to read-only mode
+ disableIndexing: false, // if true the search index will be persisted and loaded by default on location opening
+ fullTextIndex: false, // activated the full-text search for TXT, MD and HTML files
+ watchForChanges: false, // activates the watching for changed files in the current location
+ maxIndexAge: 600000,
+ maxLoops: 2,
+ creationDate: '2024-06-01T08:46:50.449Z',
+ },
+];
diff --git a/scripts/startS3server.js b/scripts/startS3server.js
new file mode 100644
index 000000000..df9e1df66
--- /dev/null
+++ b/scripts/startS3server.js
@@ -0,0 +1,9 @@
+import { runS3Server } from '../tests/setup-functions';
+import { uploadTestDirectory } from '../tests/s3rver/S3DataRefresh';
+import { deleteTestData } from '../tests/e2e/hook';
+deleteTestData()
+ .then(() => runS3Server(false))
+ .then((instance) => uploadTestDirectory())
+ .then(() => {
+ console.log('S3.server started');
+ });
diff --git a/scripts/webs3extconfig-two-locations.js b/scripts/webs3extconfig-two-locations.js
new file mode 100644
index 000000000..6f7a0ba61
--- /dev/null
+++ b/scripts/webs3extconfig-two-locations.js
@@ -0,0 +1,63 @@
+window.ExtIsFirstRun = false;
+window.ExtCheckForUpdatesOnStartup = false;
+window.ExtUseGenerateThumbnails = true;
+window.ExtLocations = [
+ {
+ uuid: '30575f19-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the location
+ type: '1', // 1 defines the locations a cloud based
+ name: 'empty_folder', // the name of the location
+ path: '/empty_folder', // the path to sub folder in the location
+ endpointURL: 'http://localhost:4569',
+ accessKeyId: 'S3RVER', // the access key of the user
+ secretAccessKey: 'S3RVER', // the secret case of the user
+ bucketName: 'supported-filestypes', // the name of the S3 bucket
+ region: 'eu-central-1', // the AWS region
+ isDefault: false, // if true this location will be loaded by the application start
+ isReadOnly: false, // if true the user interface of the application turns to read-only mode
+ disableIndexing: false, // if true the search index will be persisted and loaded by default on location opening
+ fullTextIndex: true, // activated the full-text search for TXT, MD and HTML files
+ watchForChanges: false, // activates the watching for changed files in the current location
+ maxIndexAge: 600000,
+ maxLoops: 2,
+ creationDate: '2024-06-01T08:46:50.449Z',
+ },
+ {
+ uuid: '30675f09-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the location
+ type: '1', // 1 defines the locations a cloud based
+ name: 'supported-filestypes', // the name of the location
+ path: '', // the path to sub folder in the location
+ endpointURL: 'http://localhost:4569',
+ accessKeyId: 'S3RVER', // the access key of the user
+ secretAccessKey: 'S3RVER', // the secret case of the user
+ bucketName: 'supported-filestypes', // the name of the S3 bucket
+ region: 'eu-central-1', // the AWS region
+ isDefault: true, // if true this location will be loaded by the application start
+ isReadOnly: false, // if true the user interface of the application turns to read-only mode
+ disableIndexing: false, // if true the search index will be persisted and loaded by default on location opening
+ fullTextIndex: true, // activated the full-text search for TXT, MD and HTML files
+ watchForChanges: false, // activates the watching for changed files in the current location
+ maxIndexAge: 600000,
+ maxLoops: 2,
+ creationDate: '2024-06-01T08:46:50.449Z',
+ },
+];
+/*window.ExtSearches = [
+ {
+ uuid: '16474266-0445-4f47-b092-25b884448d04', // an unique id of the search
+ title: 'search by tag 1star', // the name of the search
+ tagsAND: [
+ {
+ id: '6040a658-5e95-44da-acd0-b48d7aade9ce',
+ type: 'plain',
+ title: '1star',
+ color: '#ffcc24',
+ textcolor: '#ffffff'
+ }
+ ], // the tagsAND
+ searchBoxing: 'location',
+ searchType: 'semistrict',
+ fileTypes: ['files'],
+ maxSearchResults: 1000,
+ forceIndexing: false
+ }
+];*/
diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsx
index f603a2415..6ad52bb78 100644
--- a/src/renderer/components/EntryContainer.tsx
+++ b/src/renderer/components/EntryContainer.tsx
@@ -738,15 +738,19 @@ function EntryContainer() {
}
}
const haveDescription = description?.length > 0;
- const tabsComponent = (marginRight = undefined) => (
- <EntryContainerTabs
- isEditable={isEditable}
- isPanelOpened={isPanelOpened}
- openPanel={openPanel}
- toggleProperties={toggleProperties}
- haveDescription={haveDescription}
- marginRight={marginRight}
- />
+
+ const tabsComponent = useCallback(
+ (marginRight: string | undefined = undefined) => (
+ <EntryContainerTabs
+ isEditable={isEditable}
+ isPanelOpened={isPanelOpened}
+ openPanel={openPanel}
+ toggleProperties={toggleProperties}
+ haveDescription={haveDescription}
+ marginRight={marginRight}
+ />
+ ),
+ [isEditable, isPanelOpened, haveDescription],
);
if (!autoSave && !editFile) {
diff --git a/src/renderer/components/EntryContainerTabs.tsx b/src/renderer/components/EntryContainerTabs.tsx
index 47ba247cc..917f6718f 100644
--- a/src/renderer/components/EntryContainerTabs.tsx
+++ b/src/renderer/components/EntryContainerTabs.tsx
@@ -16,8 +16,9 @@
*
*/
-import React, { useEffect, useReducer, useRef } from 'react';
+import React, { useCallback, useEffect, useReducer, useRef } from 'react';
import { styled, useTheme } from '@mui/material/styles';
+import useMediaQuery from '@mui/material/useMediaQuery';
import { useSelector, useDispatch } from 'react-redux';
import { getBackupFileDir } from '@tagspaces/tagspaces-common/paths';
import Tabs from '@mui/material/Tabs';
@@ -31,7 +32,6 @@ import {
actions as SettingsActions,
getEntryContainerTab,
getMapTileServer,
- isDesktopMode,
} from '-/reducers/settings';
import {
FolderPropertiesIcon,
@@ -44,6 +44,7 @@ import { useTranslation } from 'react-i18next';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { CommonLocation } from '-/utils/CommonLocation';
+import TsTabPanel from '-/components/TsTabPanel';
interface StyledTabsProps {
children?: React.ReactNode;
@@ -74,15 +75,15 @@ const StyledTabs = styled((props: StyledTabsProps) => (
interface StyledTabProps {
title: string;
- desktopMode: any;
+ tinyMode: any;
icon: any;
onClick: (event: React.SyntheticEvent) => void;
}
const StyledTab = styled((props: StyledTabProps) => (
- <Tooltip title={!props.desktopMode && props.title}>
+ <Tooltip title={!props.tinyMode && props.title}>
<Tab
- label={props.desktopMode && props.title}
+ label={!props.tinyMode && props.title}
disableRipple
iconPosition="start"
{...props}
@@ -115,12 +116,6 @@ interface EntryContainerTabsProps {
marginRight: string;
}
-interface TabPanelProps {
- children?: React.ReactNode;
- index: number;
- value: number;
-}
-
function EntryContainerTabs(props: EntryContainerTabsProps) {
const {
openPanel,
@@ -137,10 +132,10 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
const theme = useTheme();
const tabIndex = useSelector(getEntryContainerTab);
const tileServer = useSelector(getMapTileServer);
- const desktopMode = useSelector(isDesktopMode);
const haveRevisions = useRef<boolean>(isEditable);
const dispatch: AppDispatch = useDispatch();
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+ const isTinyMode = useMediaQuery(theme.breakpoints.down('sm'));
useEffect(() => {
if (!isEditable) {
@@ -159,30 +154,6 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
}
}, [isEditable]);
- function TsTabPanel(tprops: TabPanelProps) {
- const { children, value, index, ...other } = tprops;
-
- return (
- <div
- role="tabpanel"
- hidden={value !== index}
- id={`simple-tabpanel-${index}`}
- aria-labelledby={`simple-tab-${index}`}
- {...other}
- style={{
- height: '100%',
- overflowY: 'auto',
- overflowX: 'hidden',
- paddingTop: 5,
- paddingLeft: 10,
- paddingRight: 10,
- }}
- >
- {value === index && children}
- </div>
- );
- }
-
// Create functions that dispatch actions
const handleChange = (event: React.SyntheticEvent, newValue: number) => {
dispatch(SettingsActions.setEntryContainerTab(newValue));
@@ -232,7 +203,7 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
data-tid="detailsTabTID"
icon={<FolderPropertiesIcon />}
title={t('core:details')}
- desktopMode={desktopMode}
+ tinyMode={isTinyMode}
{...a11yProps(0)}
onClick={handleTabClick}
/>
@@ -242,7 +213,7 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
haveDescription ? <EditDescriptionIcon /> : <DescriptionIcon />
}
title={t('core:filePropertiesDescription')}
- desktopMode={desktopMode}
+ tinyMode={isTinyMode}
{...a11yProps(1)}
onClick={handleTabClick}
/>
@@ -251,21 +222,21 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
data-tid="revisionsTabTID"
icon={<RevisionIcon />}
title={t('core:revisions')}
- desktopMode={desktopMode}
+ tinyMode={isTinyMode}
{...a11yProps(2)}
onClick={handleTabClick}
/>
)}
</StyledTabs>
</Box>
- <TsTabPanel value={selectedTabIndex} index={0}>
+ <TsTabPanel key="propertiesTab" value={selectedTabIndex} index={0}>
<EntryProperties key={openedEntry.path} tileServer={tileServer} />
</TsTabPanel>
- <TsTabPanel value={selectedTabIndex} index={1}>
+ <TsTabPanel key="descriptionTab" value={selectedTabIndex} index={1}>
<EditDescription />
</TsTabPanel>
{haveRevisions.current && (
- <TsTabPanel value={selectedTabIndex} index={2}>
+ <TsTabPanel key="revisionsTab" value={selectedTabIndex} index={2}>
<Revisions />
</TsTabPanel>
)}
diff --git a/src/renderer/components/EntryProperties.tsx b/src/renderer/components/EntryProperties.tsx
index f463faa35..690ded667 100644
--- a/src/renderer/components/EntryProperties.tsx
+++ b/src/renderer/components/EntryProperties.tsx
@@ -23,6 +23,7 @@ import React, {
useRef,
useState,
} from 'react';
+import { useSelector } from 'react-redux';
import { styled, useTheme } from '@mui/material/styles';
import {
getMetaFileLocationForFile,
@@ -78,6 +79,7 @@ import {
openUrl,
} from '-/services/utils-io';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
+import { isDesktopMode } from '-/reducers/settings';
import { parseGeoLocation } from '-/utils/geo';
import { Pro } from '../pro';
import TagsSelect from './TagsSelect';
@@ -100,6 +102,8 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { useNotificationContext } from '-/hooks/useNotificationContext';
import { generateClipboardLink } from '-/utils/dom';
import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
+import useFirstRender from '-/utils/useFirstRender';
+import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
const PREFIX = 'EntryProperties';
@@ -225,6 +229,7 @@ const defaultBackgrounds = [
function EntryProperties(props: Props) {
const { t } = useTranslation();
const theme = useTheme();
+ const desktopMode = useSelector(isDesktopMode);
const { openedEntry, sharingLink, getOpenedDirProps } =
useOpenedEntryContext();
const { isEditMode } = useFilePropertiesContext();
@@ -234,6 +239,7 @@ function EntryProperties(props: Props) {
setBackgroundColorChange,
saveDirectoryPerspective,
} = useIOActionsContext();
+ const { metaActions } = useEditedEntryMetaContext();
const { addTags, removeTags, removeAllTags } = useTaggingActionsContext();
const { findLocation, readOnlyMode } = useCurrentLocationContext();
const { showNotification } = useNotificationContext();
@@ -264,7 +270,11 @@ function EntryProperties(props: Props) {
useState<boolean>(false);
const [displayColorPicker, setDisplayColorPicker] = useState<boolean>(false);
+ const backgroundImage = useRef<string>('none');
+ const thumbImage = useRef<string>('none');
+
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+ const firstRender = useFirstRender();
const [popoverAnchorEl, setPopoverAnchorEl] =
React.useState<HTMLElement | null>(null);
@@ -280,6 +290,54 @@ function EntryProperties(props: Props) {
setPopoverAnchorEl(null);
};
+ useEffect(() => {
+ reloadBackground();
+ reloadThumbnails();
+ }, [location]);
+
+ useEffect(() => {
+ if (!firstRender && metaActions && metaActions.length > 0 && openedEntry) {
+ for (const action of metaActions) {
+ if (action.action === 'bgdImgChange') {
+ reloadBackground(); //todo rethink this duplicate from openedEntry changes
+ } else if (action.action === 'thumbChange') {
+ reloadThumbnails();
+ }
+ }
+ }
+ }, [metaActions, openedEntry]);
+
+ function reloadBackground() {
+ if (location) {
+ location
+ .getFolderBgndPath(openedEntry.path, openedEntry.meta?.lastUpdated)
+ .then((bgPath) => {
+ const bgImage = bgPath ? 'url("' + bgPath + '")' : 'none';
+ if (bgImage !== backgroundImage.current) {
+ backgroundImage.current = bgImage;
+ forceUpdate();
+ }
+ });
+ }
+ }
+
+ function reloadThumbnails() {
+ if (location) {
+ location
+ .getThumbPath(
+ openedEntry.meta?.thumbPath,
+ openedEntry.meta?.lastUpdated,
+ )
+ .then((thumbPath) => {
+ const thbImage = thumbPath ? 'url("' + thumbPath + '")' : 'none';
+ if (thbImage !== thumbImage.current) {
+ thumbImage.current = thbImage;
+ forceUpdate();
+ }
+ });
+ }
+ }
+
useEffect(() => {
if (editName === entryName && fileNameRef.current) {
fileNameRef.current.focus();
@@ -504,14 +562,14 @@ function EntryProperties(props: Props) {
const showLinkForDownloading = isCloudLocation && openedEntry.isFile;
- const thumbUrl = location.getThumbPath(
+ /*const thumbUrl = location.getThumbPath(
openedEntry.meta?.thumbPath,
openedEntry.meta?.lastUpdated,
);
const backgroundUrl = location.getFolderBgndPath(
openedEntry.path,
openedEntry.meta?.lastUpdated,
- );
+ );*/
return (
<Root>
@@ -561,6 +619,7 @@ function EntryProperties(props: Props) {
}}
margin="dense"
name="name"
+ size={desktopMode ? 'small' : 'medium'}
fullWidth={true}
data-tid="fileNameProperties"
defaultValue={entryName} // openedEntry.current.name}
@@ -707,6 +766,7 @@ function EntryProperties(props: Props) {
<TextField
margin="dense"
fullWidth={true}
+ size={desktopMode ? 'small' : 'medium'}
value={ldtm}
label={t('core:fileLDTM')}
InputProps={{
@@ -733,6 +793,7 @@ function EntryProperties(props: Props) {
margin="dense"
fullWidth={true}
value={fileSize()}
+ size={desktopMode ? 'small' : 'medium'}
label={t('core:fileSize')}
InputProps={{
readOnly: true,
@@ -762,6 +823,7 @@ function EntryProperties(props: Props) {
title={openedEntry.url || openedEntry.path}
fullWidth={true}
label={t('core:filePath')}
+ size={desktopMode ? 'small' : 'medium'}
data-tid="filePathProperties"
value={openedEntry.path || ''}
InputProps={{
@@ -809,7 +871,8 @@ function EntryProperties(props: Props) {
<TextField
data-tid="sharingLinkTID"
margin="dense"
- name="path"
+ name="sharinglink"
+ size={desktopMode ? 'small' : 'medium'}
label={
<>
{t('core:sharingLink')}
@@ -861,6 +924,7 @@ function EntryProperties(props: Props) {
<TextField
margin="dense"
name="downloadLink"
+ size={desktopMode ? 'small' : 'medium'}
label={
<>
{t('core:downloadLink')}
@@ -1055,9 +1119,7 @@ function EntryProperties(props: Props) {
style={{
backgroundSize: 'cover',
backgroundRepeat: 'no-repeat',
- backgroundImage: thumbUrl
- ? 'url("' + thumbUrl + '")'
- : '',
+ backgroundImage: thumbImage.current,
backgroundPosition: 'center',
borderRadius: 8,
minHeight: 150,
@@ -1107,7 +1169,7 @@ function EntryProperties(props: Props) {
style={{
backgroundSize: 'cover',
backgroundRepeat: 'no-repeat',
- backgroundImage: 'url("' + backgroundUrl + '")',
+ backgroundImage: backgroundImage.current,
backgroundPosition: 'center',
borderRadius: 8,
minHeight: 150,
@@ -1137,7 +1199,8 @@ function EntryProperties(props: Props) {
<TextField
data-tid="entryIDTID"
margin="dense"
- name="path"
+ name="entryid"
+ size={desktopMode ? 'small' : 'medium'}
label={
<>
{t('core:entryId')}
diff --git a/src/renderer/components/FileUploadContainer.tsx b/src/renderer/components/FileUploadContainer.tsx
index 2f34d3800..bc3ce049f 100644
--- a/src/renderer/components/FileUploadContainer.tsx
+++ b/src/renderer/components/FileUploadContainer.tsx
@@ -23,9 +23,10 @@ import { actions as AppActions, AppDispatch } from '-/reducers/app';
import { useIOActionsContext } from '-/hooks/useIOActionsContext';
import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
import { useFileUploadDialogContext } from '-/components/dialogs/hooks/useFileUploadDialogContext';
+import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
interface Props {
- id: string;
+ id?: string;
directoryPath: string;
//toggleProgressDialog: () => void;
}
@@ -38,6 +39,7 @@ const FileUploadContainer = forwardRef(
(props: Props, ref: Ref<FileUploadContainerRef>) => {
const dispatch: AppDispatch = useDispatch();
const { id, directoryPath } = props;
+ const { findLocalLocation } = useCurrentLocationContext();
const { openFileUploadDialog } = useFileUploadDialogContext();
const { uploadFilesAPI } = useIOActionsContext();
const { setReflectMetaActions } = useEditedEntryMetaContext();
@@ -91,10 +93,16 @@ const FileUploadContainer = forwardRef(
// const file = selection.currentTarget.files[0];
dispatch(AppActions.resetProgress());
openFileUploadDialog();
+ const localLocation = findLocalLocation();
+ const sourceLocationId = localLocation ? localLocation.uuid : undefined;
uploadFilesAPI(
Array.from(selection.currentTarget.files),
directoryPath,
onUploadProgress,
+ true,
+ true,
+ undefined,
+ sourceLocationId,
)
.then((fsEntries: Array<TS.FileSystemEntry>) => {
const actions: TS.EditMetaAction[] = fsEntries.map((entry) => ({
@@ -108,10 +116,11 @@ const FileUploadContainer = forwardRef(
console.log('uploadFiles', error);
});
}
+ const inputId = id || `id-${Math.random().toString(36).substr(2, 9)}`;
return (
<input
- id={id}
+ id={inputId}
style={{ display: 'none' }}
ref={fileInput}
accept="*"
diff --git a/src/renderer/components/LocationManager.tsx b/src/renderer/components/LocationManager.tsx
index 3ba63c087..862fc2c51 100644
--- a/src/renderer/components/LocationManager.tsx
+++ b/src/renderer/components/LocationManager.tsx
@@ -22,8 +22,7 @@ import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
import { List } from '@mui/material';
import LocationManagerMenu from '-/components/menus/LocationManagerMenu';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
-import { actions as LocationActions } from '-/reducers/locations';
-import { actions as AppActions, AppDispatch } from '-/reducers/app';
+import { AppDispatch } from '-/reducers/app';
import LocationView from '-/components/LocationView';
import { Pro } from '-/pro';
import { classes, SidePanel } from '-/components/SidePanels.css';
@@ -54,11 +53,12 @@ interface Props {
function LocationManager(props: Props) {
const { t } = useTranslation();
- const dispatch: AppDispatch = useDispatch();
const {
locations,
currentLocation,
addLocations,
+ moveLocation,
+ deleteLocation,
selectedLocation,
setSelectedLocation,
locationDirectoryContextMenuAnchorEl,
@@ -95,13 +95,13 @@ function LocationManager(props: Props) {
if (!result.destination) {
return;
}
-
- dispatch(
+ moveLocation(result.draggableId, result.destination.index);
+ /*dispatch(
LocationActions.moveLocation(
result.draggableId,
result.destination.index,
),
- );
+ );*/
};
const { reduceHeightBy, show } = props;
@@ -236,7 +236,8 @@ function LocationManager(props: Props) {
})}
confirmCallback={(result) => {
if (result && selectedLocation) {
- dispatch(LocationActions.deleteLocation(selectedLocation));
+ deleteLocation(selectedLocation);
+ //dispatch(LocationActions.deleteLocation(selectedLocation));
}
}}
cancelDialogTID="cancelDeleteLocationDialog"
diff --git a/src/renderer/components/PerspectiveSelector.tsx b/src/renderer/components/PerspectiveSelector.tsx
index 3ecade862..d2ca10cdb 100644
--- a/src/renderer/components/PerspectiveSelector.tsx
+++ b/src/renderer/components/PerspectiveSelector.tsx
@@ -17,6 +17,7 @@
*/
import React from 'react';
+import { useSelector } from 'react-redux';
import ListItemIcon from '@mui/material/ListItemIcon';
import LayersClearIcon from '@mui/icons-material/LayersClear';
import ListItemText from '@mui/material/ListItemText';
@@ -26,9 +27,9 @@ import { AvailablePerspectives, PerspectiveIDs } from '-/perspectives';
import { Pro } from '-/pro';
import { BetaLabel, ProLabel } from '-/components/HelperComponents';
import { useTranslation } from 'react-i18next';
+import { isDesktopMode } from '-/reducers/settings';
interface Props {
- //language: string;
defaultValue: string;
onChange: (event: any) => void;
testId: string;
@@ -37,7 +38,7 @@ interface Props {
function PerspectiveSelector(props: Props) {
const { defaultValue, onChange, testId, label } = props;
-
+ const desktopMode = useSelector(isDesktopMode);
const { t } = useTranslation();
const perspectiveSelectorMenuItems = [];
@@ -86,7 +87,7 @@ function PerspectiveSelector(props: Props) {
select
label={label}
fullWidth
- // input={<Input id="changePerspectiveId" />}
+ size={desktopMode ? 'small' : 'medium'}
>
{perspectiveSelectorMenuItems}
</TextField>
diff --git a/src/renderer/components/RenderPerspective.tsx b/src/renderer/components/RenderPerspective.tsx
index f99f6062c..fc304923c 100644
--- a/src/renderer/components/RenderPerspective.tsx
+++ b/src/renderer/components/RenderPerspective.tsx
@@ -33,6 +33,7 @@ import CustomDragLayer from '-/components/CustomDragLayer';
import TargetFileBox from '-/components/TargetFileBox';
import { NativeTypes } from 'react-dnd-html5-backend';
import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
+import useFirstRender from '-/utils/useFirstRender';
const GridPerspective = React.lazy(
() =>
@@ -159,9 +160,10 @@ function RenderPerspective(props: Props) {
const { getPerspective } = useDirectoryContentContext();
const { metaActions } = useEditedEntryMetaContext();
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+ const firstRender = useFirstRender();
useEffect(() => {
- if (metaActions && metaActions.length > 0) {
+ if (!firstRender && metaActions && metaActions.length > 0) {
for (const action of metaActions) {
if (action.action === 'perspectiveChange') {
forceUpdate();
diff --git a/src/renderer/components/SearchAutocomplete.tsx b/src/renderer/components/SearchAutocomplete.tsx
index 8036c12d3..dae16e15f 100644
--- a/src/renderer/components/SearchAutocomplete.tsx
+++ b/src/renderer/components/SearchAutocomplete.tsx
@@ -71,6 +71,7 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';
import { removePrefix } from '-/services/utils-io';
+import { isDesktopMode } from '-/reducers/settings';
interface Props {
style?: any;
@@ -91,6 +92,7 @@ interface Props {
function SearchAutocomplete(props: Props) {
const { t } = useTranslation();
+ const desktopMode = useSelector(isDesktopMode);
const theme = useTheme();
const { openLink } = useOpenedEntryContext();
const { locations, currentLocation, changeLocationByID, openLocationById } =
@@ -1190,13 +1192,14 @@ function SearchAutocomplete(props: Props) {
<IconButton
id="advancedButton"
data-tid="advancedSearch"
- style={{ maxHeight: 35 }}
+ style={{ maxHeight: 34 }}
+ size={desktopMode ? 'small' : 'medium'}
onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
setAnchorSearch(event.currentTarget);
}}
>
- <AdvancedSearchIcon />
- <DropDownIcon />
+ <AdvancedSearchIcon fontSize={desktopMode ? 'small' : 'medium'} />
+ {/* <DropDownIcon /> */}
</IconButton>
</Tooltip>
<Tooltip title={t('clearSearch') + ' (ESC)'}>
@@ -1205,10 +1208,11 @@ function SearchAutocomplete(props: Props) {
onClick={() => {
clearSearch();
}}
- size="small"
+ style={{ maxHeight: 34 }}
+ size={desktopMode ? 'small' : 'medium'}
edge="end"
>
- <ClearSearchIcon />
+ <ClearSearchIcon fontSize={desktopMode ? 'small' : 'medium'} />
</IconButton>
</Tooltip>
</>
@@ -1239,7 +1243,10 @@ function SearchAutocomplete(props: Props) {
<style>
{`
#searchAutocompleteComp .MuiAutocomplete-root .MuiInputBase-root {
- padding: 1px 5px 0 5px !important;
+ padding: 1px 15px 0 5px !important;
+ }
+ #searchAutocompleteComp .MuiTextField-root {
+ overflow-x: hidden !important;
}
.MuiAutocomplete-popper {
min-width: 350px;
@@ -1431,7 +1438,8 @@ function SearchAutocomplete(props: Props) {
)}
</Box>
)}
- sx={{ width: 'calc(100% - 80px)' }}
+ sx={{ width: '100%' }}
+ size="small"
onKeyDown={onKeyDownHandler}
disableClearable={true}
renderInput={(params) => {
@@ -1483,11 +1491,6 @@ function SearchAutocomplete(props: Props) {
</Button>
</Tooltip>
</div>
- <SavedSearchesMenu
- anchorEl={openSavedSearches}
- open={Boolean(openSavedSearches)}
- onClose={() => setOpenSavedSearches(null)}
- />
</>
);
}
diff --git a/src/renderer/components/SearchBox.tsx b/src/renderer/components/SearchBox.tsx
index 0cd78d5ca..be92684ff 100644
--- a/src/renderer/components/SearchBox.tsx
+++ b/src/renderer/components/SearchBox.tsx
@@ -61,8 +61,8 @@ function SearchBox(props: Props) {
style: {
overflow: 'hidden',
height: 720,
- background: alpha(theme.palette.background.default, 0.9),
- backdropFilter: 'blur(5px)',
+ // background: alpha(theme.palette.background.default, 0.95),
+ // backdropFilter: 'blur(5px)',
},
},
}}
diff --git a/src/renderer/components/SearchPopover.tsx b/src/renderer/components/SearchPopover.tsx
index 46eeed735..e4a443c52 100644
--- a/src/renderer/components/SearchPopover.tsx
+++ b/src/renderer/components/SearchPopover.tsx
@@ -43,6 +43,7 @@ import TagsSelect from './TagsSelect';
import {
getMaxSearchResults,
getShowUnixHiddenEntries,
+ isDesktopMode,
} from '-/reducers/settings';
import { FileTypeGroups, haveSearchFilters } from '-/services/search';
import { Pro } from '../pro';
@@ -88,6 +89,7 @@ interface Props {
function SearchPopover(props: Props) {
const { t } = useTranslation();
+ const desktopMode = useSelector(isDesktopMode);
const theme = useTheme();
const {
openCurrentDirectory,
@@ -554,6 +556,7 @@ function SearchPopover(props: Props) {
name="savedSearch"
labelId="saved-searches"
disabled={isIndexing !== undefined || !Pro}
+ size={desktopMode ? 'small' : 'medium'}
onChange={handleSavedSearchChange}
displayEmpty
fullWidth
@@ -608,6 +611,7 @@ function SearchPopover(props: Props) {
label={t('core:searchQueryInfo')}
value={props.textQuery}
onChange={handleSearchTermChange}
+ size={desktopMode ? 'small' : 'medium'}
onKeyDown={startSearch}
style={{ width: '100%' }}
InputProps={{
@@ -794,6 +798,7 @@ function SearchPopover(props: Props) {
fullWidth
value={JSON.stringify(fileTypes.current)}
onChange={handleFileTypeChange}
+ size={desktopMode ? 'small' : 'medium'}
input={
<OutlinedInput
name="fileTypes"
@@ -923,6 +928,7 @@ function SearchPopover(props: Props) {
fullWidth
value={fileSize.current}
onChange={handleFileSizeChange}
+ size={desktopMode ? 'small' : 'medium'}
input={
<OutlinedInput
name="fileSize"
@@ -977,6 +983,7 @@ function SearchPopover(props: Props) {
fullWidth
value={lastModified.current}
onChange={handleLastModifiedChange}
+ size={desktopMode ? 'small' : 'medium'}
input={
<OutlinedInput
name="lastModified"
diff --git a/src/renderer/components/TagsSelect.tsx b/src/renderer/components/TagsSelect.tsx
index 08261f6c5..333e02e5c 100644
--- a/src/renderer/components/TagsSelect.tsx
+++ b/src/renderer/components/TagsSelect.tsx
@@ -28,62 +28,23 @@ import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
import { getAllTags } from '-/services/taglibrary-utils';
import { Box } from '@mui/material';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
-
-/*const styles: any = (theme: any) => ({
- root: {
- flexGrow: 1
- },
- input: {
- display: 'flex',
- padding: 0,
- height: 'auto'
- },
- valueContainer: {
- display: 'flex',
- flexWrap: 'wrap',
- flex: 1,
- alignItems: 'center',
- overflow: 'hidden'
- },
- noOptionsMessage: {
- padding: theme.spacing(1, 2)
- },
- singleValue: {
- fontSize: 16
- },
- placeholder: {
- position: 'absolute',
- left: 2,
- bottom: 6,
- fontSize: 16
- },
- paper: {
- position: 'absolute',
- zIndex: 2,
- marginTop: theme.spacing(1),
- left: 0,
- right: 0
- }
-});*/
+import { isDesktopMode } from '-/reducers/settings';
interface Props {
dataTid?: string;
tags: TS.Tag[];
label?: string;
tagSearchType?: string;
- // defaultBackgroundColor?: string;
- // defaultTextColor?: string;
handleChange?: (param1: any, param2: any, param3?: any) => void;
- // allTags?: TS.Tag[];
tagMode?: 'default' | 'display' | 'remove';
placeholderText?: string;
selectedEntryPath?: string;
autoFocus?: boolean;
- // removeTags: (paths: Array<string>, tags: Array<Tag>) => void;
}
function TagsSelect(props: Props) {
const { readOnlyMode } = useCurrentLocationContext();
+ const desktopMode = useSelector(isDesktopMode);
const [tagMenuAnchorEl, setTagMenuAnchorEl] = useState<null | HTMLElement>(
null,
);
@@ -188,6 +149,7 @@ function TagsSelect(props: Props) {
autoSelect
autoComplete
disableClearable
+ size={desktopMode ? 'small' : 'medium'}
value={tags}
onChange={handleTagChange}
renderTags={(value: readonly TS.Tag[], getTagProps) =>
diff --git a/src/renderer/components/TsTabPanel.tsx b/src/renderer/components/TsTabPanel.tsx
new file mode 100644
index 000000000..527512dfc
--- /dev/null
+++ b/src/renderer/components/TsTabPanel.tsx
@@ -0,0 +1,51 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2017-present TagSpaces UG (haftungsbeschraenkt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import React from 'react';
+
+interface TabPanelProps {
+ children?: React.ReactNode;
+ index: number;
+ value: number;
+}
+
+function TsTabPanel(props: TabPanelProps) {
+ const { children, value, index, ...other } = props;
+
+ return (
+ <div
+ role="tabpanel"
+ hidden={value !== index}
+ id={`simple-tabpanel-${index}`}
+ aria-labelledby={`simple-tab-${index}`}
+ {...other}
+ style={{
+ height: '100%',
+ overflowY: 'auto',
+ overflowX: 'hidden',
+ paddingTop: 5,
+ paddingLeft: 10,
+ paddingRight: 10,
+ }}
+ >
+ {children}
+ </div>
+ );
+}
+
+export default TsTabPanel;
diff --git a/src/renderer/components/dialogs/LinkGeneratorDialog.tsx b/src/renderer/components/dialogs/LinkGeneratorDialog.tsx
index 6a6058337..3bb84880e 100644
--- a/src/renderer/components/dialogs/LinkGeneratorDialog.tsx
+++ b/src/renderer/components/dialogs/LinkGeneratorDialog.tsx
@@ -68,11 +68,12 @@ function LinkGeneratorDialog(props: Props) {
}, []);
function setSignedLink() {
- signedLink.current = location.generateURLforPath(
- gPath,
- linkValidityDuration.current,
- );
- forceUpdate();
+ location
+ .generateURLforPath(gPath, linkValidityDuration.current)
+ .then((url) => {
+ signedLink.current = url;
+ forceUpdate();
+ });
}
return (
diff --git a/src/renderer/components/dialogs/ObjectStoreForm.tsx b/src/renderer/components/dialogs/ObjectStoreForm.tsx
index 990a87ec1..5ae2e66f6 100644
--- a/src/renderer/components/dialogs/ObjectStoreForm.tsx
+++ b/src/renderer/components/dialogs/ObjectStoreForm.tsx
@@ -134,10 +134,11 @@ function ObjectStoreForm(props: Props) {
function handleRegionChange(inputValue: any, value: string, reason: string) {
if (reason === 'input') {
setRegion(value);
- } else if (reason === 'select-option') {
+ } else if (reason === 'selectOption') {
setRegion(value);
}
if (reason === 'clear') {
+ //|| reason === 'reset') {
setRegion('');
}
}
@@ -294,6 +295,7 @@ function ObjectStoreForm(props: Props) {
<TextField
{...params}
label={t('core:regionSearch')}
+ data-tid="regionTID"
placeholder={t('core:regionSearch')}
margin="normal"
/>
diff --git a/src/renderer/components/dialogs/components/CreateFile.tsx b/src/renderer/components/dialogs/components/CreateFile.tsx
index c7c2492db..d8b756337 100644
--- a/src/renderer/components/dialogs/components/CreateFile.tsx
+++ b/src/renderer/components/dialogs/components/CreateFile.tsx
@@ -18,7 +18,6 @@
import React, { useReducer, useRef, useState } from 'react';
import { styled } from '@mui/material/styles';
-import { useSelector } from 'react-redux';
import Button from '@mui/material/Button';
import ButtonGroup from '@mui/material/ButtonGroup';
import Typography from '@mui/material/Typography';
@@ -28,7 +27,6 @@ import {
locationType,
} from '@tagspaces/tagspaces-common/misc';
import AppConfig from '-/AppConfig';
-import { getFirstRWLocation } from '-/reducers/locations';
import Tooltip from '-/components/Tooltip';
import TextField from '@mui/material/TextField';
import FormHelperText from '@mui/material/FormHelperText';
@@ -64,11 +62,12 @@ function CreateFile(props: Props) {
const { t } = useTranslation();
//const dispatch: AppDispatch = useDispatch();
- const { currentLocation, openLocation } = useCurrentLocationContext();
+ const { currentLocation, openLocation, getFirstRWLocation } =
+ useCurrentLocationContext();
const { currentDirectoryPath } = useDirectoryContentContext();
const { targetDirectoryPath } = useTargetPathContext();
- const firstRWLocation = useSelector(getFirstRWLocation);
+ const firstRWLocation = getFirstRWLocation();
const fileName = useRef<string>(
'note' +
diff --git a/src/renderer/components/dialogs/hooks/TargetPathContextProvider.tsx b/src/renderer/components/dialogs/hooks/TargetPathContextProvider.tsx
index 377fcdb9b..f2f1db44d 100644
--- a/src/renderer/components/dialogs/hooks/TargetPathContextProvider.tsx
+++ b/src/renderer/components/dialogs/hooks/TargetPathContextProvider.tsx
@@ -17,9 +17,7 @@
*/
import React, { createContext, useMemo } from 'react';
-import { useSelector } from 'react-redux';
import { locationType } from '@tagspaces/tagspaces-common/misc';
-import { getFirstRWLocation } from '-/reducers/locations';
import { PerspectiveIDs } from '-/perspectives';
import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
@@ -40,11 +38,11 @@ export type TargetPathContextProviderProps = {
export const TargetPathContextProvider = ({
children,
}: TargetPathContextProviderProps) => {
- const { currentLocation } = useCurrentLocationContext();
+ const { currentLocation, getFirstRWLocation } = useCurrentLocationContext();
const { selectedEntries } = useSelectedEntriesContext();
const { currentDirectoryPath, getPerspective } = useDirectoryContentContext();
- const firstRWLocation = useSelector(getFirstRWLocation);
+ const firstRWLocation = getFirstRWLocation();
const context = useMemo(() => {
let targetDirectoryPath = currentDirectoryPath;
diff --git a/src/renderer/components/menus/DirectoryMenu.tsx b/src/renderer/components/menus/DirectoryMenu.tsx
index 3f16c4ebf..723a1a7da 100644
--- a/src/renderer/components/menus/DirectoryMenu.tsx
+++ b/src/renderer/components/menus/DirectoryMenu.tsx
@@ -435,22 +435,24 @@ Do you want to continue?`)
);
return (
- <Menu
- anchorEl={anchorEl}
- open={open}
- onClose={onClose}
- anchorReference={mouseY && mouseX ? 'anchorPosition' : undefined}
- anchorPosition={
- mouseY && mouseX ? { top: mouseY, left: mouseX } : undefined
- }
- >
- <MenuList>{menuItems}</MenuList>
+ <>
+ <Menu
+ anchorEl={anchorEl}
+ open={open}
+ onClose={onClose}
+ anchorReference={mouseY && mouseX ? 'anchorPosition' : undefined}
+ anchorPosition={
+ mouseY && mouseX ? { top: mouseY, left: mouseX } : undefined
+ }
+ >
+ <MenuList>{menuItems}</MenuList>
+ </Menu>
<FileUploadContainer
- id="dirMenuId"
+ /*id="dirMenuId"*/
ref={fileUploadContainerRef}
directoryPath={directoryPath}
/>
- </Menu>
+ </>
);
}
diff --git a/src/renderer/components/menus/FileMenu.tsx b/src/renderer/components/menus/FileMenu.tsx
index 0ea2fe93e..ff97a48f4 100644
--- a/src/renderer/components/menus/FileMenu.tsx
+++ b/src/renderer/components/menus/FileMenu.tsx
@@ -16,7 +16,7 @@
*
*/
-import React from 'react';
+import React, { useEffect, useReducer, useRef } from 'react';
import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
import ShareIcon from '@mui/icons-material/Share';
@@ -114,10 +114,24 @@ function FileMenu(props: Props) {
setFolderBackgroundPromise,
} = useIOActionsContext();
const { openEntry } = useOpenedEntryContext();
- const { openDirectory, currentLocationPath } = useDirectoryContentContext();
+ const { openDirectory, currentLocationPath, getAllPropertiesPromise } =
+ useDirectoryContentContext();
const { showNotification } = useNotificationContext();
const { setFolderThumbnailPromise } = usePlatformFacadeContext();
const { currentLocation, readOnlyMode } = useCurrentLocationContext();
+ const downloadFileUrl = useRef<string>(undefined);
+ const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+
+ useEffect(() => {
+ if (currentLocation.haveObjectStoreSupport()) {
+ currentLocation
+ .generateURLforPath(selectedFilePath, 86400)
+ .then((url) => {
+ downloadFileUrl.current = url;
+ forceUpdate();
+ });
+ }
+ }, [currentLocation, selectedFilePath]);
function generateFileLink() {
const entryPath = selectedEntries[0].path;
@@ -205,14 +219,18 @@ function FileMenu(props: Props) {
});
}
- function setFolderBackground() {
+ async function setFolderBackground() {
onClose();
- let path =
+ let path;
+ if (
currentLocation &&
(currentLocation.haveObjectStoreSupport() ||
currentLocation.haveWebDavSupport())
- ? currentLocation.generateURLforPath(selectedFilePath, 604800) // 7 days
- : selectedFilePath;
+ ) {
+ path = await currentLocation.generateURLforPath(selectedFilePath, 604800); // 7 days
+ } else {
+ path = selectedFilePath;
+ }
const directoryPath = extractContainingDirectoryPath(
selectedFilePath,
@@ -220,14 +238,10 @@ function FileMenu(props: Props) {
);
setFolderBackgroundPromise(path, directoryPath)
- .then((directoryPath: string) => {
- setBackgroundImageChange(
- currentLocation.toFsEntry(directoryPath, false),
- );
- /*dispatch(
- AppActions.setLastBackgroundImageChange(path, new Date().getTime()),
- );*/
- showNotification('Background created for: ' + directoryPath);
+ .then((dirPath: string) => getAllPropertiesPromise(dirPath))
+ .then((fsEntry: TS.FileSystemEntry) => {
+ setBackgroundImageChange(fsEntry);
+ showNotification('Background created for: ' + fsEntry.path);
return true;
})
.catch((error) => {
@@ -511,7 +525,7 @@ function FileMenu(props: Props) {
<MenuItem
key="setAsBgndTID"
data-tid="setAsBgndTID"
- onClick={setFolderBackground}
+ onClick={() => setFolderBackground()}
>
<ListItemIcon>
<ImageIcon />
@@ -542,12 +556,9 @@ function FileMenu(props: Props) {
key="downloadFileUrl"
data-tid="downloadFileUrlTID"
onClick={() => {
- const url = currentLocation.haveObjectStoreSupport()
- ? currentLocation.generateURLforPath(selectedFilePath, 86400)
- : undefined;
const downloadResult = downloadFile(
selectedFilePath,
- url,
+ downloadFileUrl.current,
currentLocation?.getDirSeparator(),
);
if (downloadResult === -1) {
diff --git a/src/renderer/components/menus/LocationContextMenu.tsx b/src/renderer/components/menus/LocationContextMenu.tsx
index a2f6f71fa..ced6ca024 100644
--- a/src/renderer/components/menus/LocationContextMenu.tsx
+++ b/src/renderer/components/menus/LocationContextMenu.tsx
@@ -17,7 +17,6 @@
*/
import React from 'react';
-import { useDispatch } from 'react-redux';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
import { generateSharingLink } from '@tagspaces/tagspaces-common/paths';
import ListItemText from '@mui/material/ListItemText';
@@ -35,8 +34,6 @@ import OpenFolderNativelyIcon from '@mui/icons-material/Launch';
import { OpenNewWindowIcon, CloseIcon } from '-/components/CommonIcons';
import { locationType } from '@tagspaces/tagspaces-common/misc';
import AppConfig from '-/AppConfig';
-import { actions as LocationActions } from '-/reducers/locations';
-import { AppDispatch } from '-/reducers/app';
import { useTranslation } from 'react-i18next';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';
@@ -59,6 +56,8 @@ function LocationContextMenu(props: Props) {
const {
addLocation,
closeLocation,
+ moveLocationUp,
+ moveLocationDown,
getLocationPosition,
selectedLocation,
locationDirectoryContextMenuAnchorEl,
@@ -67,15 +66,15 @@ function LocationContextMenu(props: Props) {
} = useCurrentLocationContext();
const { createLocationIndex } = useLocationIndexContext();
const { openCreateEditLocationDialog } = useCreateEditLocationDialogContext();
- const dispatch: AppDispatch = useDispatch();
+ //const dispatch: AppDispatch = useDispatch();
- const moveLocationUp = (locationId) => {
+ /*const moveLocationUp = (locationId) => {
dispatch(LocationActions.moveLocationUp(locationId));
};
const moveLocationDown = (locationId) => {
dispatch(LocationActions.moveLocationDown(locationId));
- };
+ };*/
const indexLocation = () => {
setLocationDirectoryContextMenuAnchorEl(null);
diff --git a/src/renderer/hooks/CurrentLocationContextProvider.tsx b/src/renderer/hooks/CurrentLocationContextProvider.tsx
index cd47d3fee..96567f68a 100644
--- a/src/renderer/hooks/CurrentLocationContextProvider.tsx
+++ b/src/renderer/hooks/CurrentLocationContextProvider.tsx
@@ -41,6 +41,7 @@ import AppConfig from '../AppConfig';
import versionMeta from '-/version.json';
import { CommonLocation } from '-/utils/CommonLocation';
import { getDevicePaths } from '-/services/utils-io';
+import { TS } from '-/tagspaces.namespace';
type CurrentLocationContextData = {
locations: CommonLocation[];
@@ -62,6 +63,10 @@ type CurrentLocationContextData = {
arrLocations: Array<CommonLocation>,
override?: boolean,
) => void;
+ deleteLocation: (location: CommonLocation) => void;
+ moveLocationUp: (locationUUID: string) => void;
+ moveLocationDown: (locationUUID: string) => void;
+ moveLocation: (locationUUID: string, newIndex: number) => void;
openLocation: (
location: CommonLocation,
skipInitialDirList?: boolean,
@@ -75,6 +80,7 @@ type CurrentLocationContextData = {
getLocationPosition: (locationId: string) => number;
locationDirectoryContextMenuAnchorEl: null | HTMLElement;
setLocationDirectoryContextMenuAnchorEl: (el: HTMLElement) => void;
+ getFirstRWLocation: () => CommonLocation | undefined;
};
export const CurrentLocationContext = createContext<CurrentLocationContextData>(
@@ -91,6 +97,10 @@ export const CurrentLocationContext = createContext<CurrentLocationContextData>(
editLocation: () => {},
addLocation: () => {},
addLocations: () => {},
+ deleteLocation: undefined,
+ moveLocationUp: undefined,
+ moveLocationDown: undefined,
+ moveLocation: undefined,
openLocation: () => {},
closeLocation: () => {},
closeAllLocations: () => {},
@@ -101,6 +111,7 @@ export const CurrentLocationContext = createContext<CurrentLocationContextData>(
getLocationPosition: () => 0,
locationDirectoryContextMenuAnchorEl: undefined,
setLocationDirectoryContextMenuAnchorEl: () => {},
+ getFirstRWLocation: undefined,
},
);
@@ -114,7 +125,17 @@ export const CurrentLocationContextProvider = ({
const dispatch: AppDispatch = useDispatch();
const { t } = useTranslation();
const { showNotification } = useNotificationContext();
- const currentLocation = useRef<CommonLocation>(undefined);
+
+ const locations: TS.Location[] = useSelector(getLocations);
+ const defaultLocationId = useSelector(getDefaultLocationId);
+ const settingsPersistTagsInSidecarFile: boolean = useSelector(
+ getPersistTagsInSidecarFile,
+ );
+
+ const allLocations = useRef<CommonLocation[]>(
+ locations.map((l) => new CommonLocation(l)),
+ );
+ const currentLocation = useRef<string>(defaultLocationId);
const selectedLocation = useRef<CommonLocation>(undefined);
const skipInitialDirList = useRef<boolean>(false);
const initLocations = useRef<boolean>(false);
@@ -123,11 +144,6 @@ export const CurrentLocationContextProvider = ({
setLocationDirectoryContextMenuAnchorEl,
] = useState<null | HTMLElement>(null);
- const locations: CommonLocation[] = useSelector(getLocations);
- const defaultLocationId = useSelector(getDefaultLocationId);
- const settingsPersistTagsInSidecarFile: boolean = useSelector(
- getPersistTagsInSidecarFile,
- );
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
useEffect(() => {
@@ -148,14 +164,14 @@ export const CurrentLocationContextProvider = ({
}, []);
useEffect(() => {
- if (locations.length < 1) {
+ if (allLocations.current.length < 1) {
// init locations
setDefaultLocations();
} else {
// check if current location exist (or is removed)
if (currentLocation.current) {
- const location = locations.find(
- (location) => location.uuid === currentLocation.current.uuid,
+ const location = allLocations.current.find(
+ (location) => location.uuid === currentLocation.current,
);
if (!location) {
setCurrentLocation(undefined);
@@ -163,7 +179,7 @@ export const CurrentLocationContextProvider = ({
}
}
}
- }, [locations]);
+ }, [allLocations.current]);
function getLocationPath(location: CommonLocation): Promise<string> {
let locationPath = '';
@@ -196,19 +212,21 @@ export const CurrentLocationContextProvider = ({
return Promise.resolve(locationPath);
}
- function findLocation(locationID: string): CommonLocation {
+ function findLocation(locationID: string = undefined): CommonLocation {
if (!locationID) {
- return currentLocation.current;
+ locationID = currentLocation.current;
}
- const loc = locations.find((l) => l.uuid === locationID);
+ const loc = allLocations.current.find((l) => l.uuid === locationID);
if (loc) {
return loc;
}
- return currentLocation.current;
+ return undefined;
}
function findLocalLocation(): CommonLocation {
- const loc = locations.find((l) => l.type === locationType.TYPE_LOCAL);
+ const loc = allLocations.current.find(
+ (l) => l.type === locationType.TYPE_LOCAL,
+ );
if (loc) {
return loc;
}
@@ -217,6 +235,7 @@ export const CurrentLocationContextProvider = ({
function setDefaultLocations() {
if (!initLocations.current) {
+ // setDefaultLocations first time only
initLocations.current = true;
getDevicePaths()
.then((devicePaths) => {
@@ -246,17 +265,104 @@ export const CurrentLocationContextProvider = ({
locationPosition: number = undefined,
) {
dispatch(LocationActions.createLocation(location, locationPosition));
+ allLocations.current = [...allLocations.current, location];
if (openAfterCreate) {
openLocation(location);
}
}
+
+ function deleteLocation(location: CommonLocation) {
+ dispatch(LocationActions.deleteLocation(location));
+ allLocations.current = allLocations.current.filter(
+ (l) => l.uuid !== location.uuid,
+ );
+ }
+
+ function moveLocationUp(locationUUID) {
+ const currentIndex = allLocations.current.findIndex(
+ (l) => l.uuid === locationUUID,
+ );
+
+ // If location is not found or is already at the top, do nothing
+ if (currentIndex <= 0) {
+ return;
+ }
+
+ // Create a copy of the array
+ const newArray = [...allLocations.current];
+
+ // Swap the location with the one above it
+ const temp = newArray[currentIndex];
+ newArray[currentIndex] = newArray[currentIndex - 1];
+ newArray[currentIndex - 1] = temp;
+
+ allLocations.current = newArray;
+
+ dispatch(LocationActions.moveLocationUp(locationUUID));
+ }
+
+ function moveLocationDown(locationUUID) {
+ const currentIndex = allLocations.current.findIndex(
+ (l) => l.uuid === locationUUID,
+ );
+
+ // If location is not found or is already at the bottom, return the original array
+ if (
+ currentIndex === -1 ||
+ currentIndex >= allLocations.current.length - 1
+ ) {
+ return;
+ }
+
+ // Create a copy of the array
+ const newArray = [...allLocations.current];
+
+ // Swap the location with the one below it
+ const temp = newArray[currentIndex];
+ newArray[currentIndex] = newArray[currentIndex + 1];
+ newArray[currentIndex + 1] = temp;
+
+ allLocations.current = newArray;
+
+ dispatch(LocationActions.moveLocationDown(locationUUID));
+ }
+
+ function moveLocation(locationUUID: string, newIndex: number) {
+ // Check if allLocations.current is an array and newIndex is within bounds
+ if (
+ !Array.isArray(allLocations.current) ||
+ newIndex < 0 ||
+ newIndex >= allLocations.current.length
+ ) {
+ throw new Error('Invalid input');
+ }
+
+ // Find the index of the location with the given UUID
+ const currentIndex = allLocations.current.findIndex(
+ (l) => l.uuid === locationUUID,
+ );
+
+ // If the location is not found, throw an error
+ if (currentIndex === -1) {
+ throw new Error('Location not found');
+ }
+
+ // Remove the location from its current position
+ const [location] = allLocations.current.splice(currentIndex, 1);
+
+ // Insert the location at the specified new index
+ allLocations.current.splice(newIndex, 0, location);
+ allLocations.current = [...allLocations.current];
+ dispatch(LocationActions.moveLocation(locationUUID, newIndex));
+ }
+
/**
* @param arrLocations
* @param override = true - if location exist override else skip
*/
function addLocations(arrLocations: Array<CommonLocation>, override = true) {
arrLocations.forEach((newLocation: CommonLocation, idx, array) => {
- const locationExist: boolean = locations.some(
+ const locationExist: boolean = allLocations.current.some(
(location) => location.uuid === newLocation.uuid,
);
const isLast = idx === array.length - 1;
@@ -269,8 +375,11 @@ export const CurrentLocationContextProvider = ({
}
function setCurrentLocation(location) {
- currentLocation.current = location;
- forceUpdate();
+ const newLocationId = location?.uuid;
+ if (currentLocation.current !== newLocationId) {
+ currentLocation.current = newLocationId;
+ forceUpdate();
+ }
}
function setSelectedLocation(location) {
@@ -280,6 +389,9 @@ export const CurrentLocationContextProvider = ({
function editLocation(location: CommonLocation, openAfterEdit = true) {
dispatch(LocationActions.changeLocation(location));
+ allLocations.current = allLocations.current.map((l) =>
+ l.uuid === location.uuid ? location : l,
+ );
setCurrentLocation(location);
if (openAfterEdit) {
/*
@@ -297,15 +409,33 @@ export const CurrentLocationContextProvider = ({
}
}
- const readOnlyMode: boolean = useMemo(
- () => currentLocation.current && currentLocation.current.isReadOnly,
+ function getFirstRWLocation(): CommonLocation | undefined {
+ let foundLocation = allLocations.current.find(
+ (location) => location.isDefault && !location.isReadOnly,
+ );
+ if (!foundLocation) {
+ foundLocation = allLocations.current.find(
+ (location) => !location.isReadOnly,
+ );
+ }
+ return foundLocation;
+ }
+
+ const location: CommonLocation = useMemo(
+ () => findLocation(),
[currentLocation.current],
);
+ const readOnlyMode: boolean = useMemo(() => {
+ if (location) {
+ return location.isReadOnly;
+ }
+ return false;
+ }, [currentLocation.current]);
+
const persistTagsInSidecarFile: boolean = useMemo(() => {
const locationPersistTagsInSidecarFile =
- currentLocation.current &&
- currentLocation.current.persistTagsInSidecarFile;
+ location && location.persistTagsInSidecarFile;
if (locationPersistTagsInSidecarFile !== undefined) {
return locationPersistTagsInSidecarFile;
}
@@ -317,10 +447,7 @@ export const CurrentLocationContextProvider = ({
skipInitDirList: boolean = false,
) {
skipInitialDirList.current = skipInitDirList;
- if (
- !currentLocation.current ||
- location.uuid !== currentLocation.current.uuid
- ) {
+ if (!currentLocation.current || location.uuid !== currentLocation.current) {
if (location && location.name) {
document.title = location.name + ' | ' + versionMeta.name;
}
@@ -329,10 +456,7 @@ export const CurrentLocationContextProvider = ({
}
function changeLocationByID(locationId: string) {
- if (
- !currentLocation.current ||
- locationId !== currentLocation.current.uuid
- ) {
+ if (!currentLocation.current || locationId !== currentLocation.current) {
const location = findLocation(locationId);
if (location) {
setCurrentLocation(location);
@@ -363,10 +487,7 @@ export const CurrentLocationContextProvider = ({
}
function closeLocation(locationId: string) {
- if (
- currentLocation.current &&
- currentLocation.current.uuid === locationId
- ) {
+ if (currentLocation.current && currentLocation.current === locationId) {
locations.map((location) => {
if (location.uuid === locationId) {
// location needed evtl. to unwatch many loc. root folders if available
@@ -392,13 +513,13 @@ export const CurrentLocationContextProvider = ({
}
function isCurrentLocation(uuid: string) {
- return currentLocation.current && currentLocation.current.uuid === uuid;
+ return currentLocation.current && currentLocation.current === uuid;
}
const context = useMemo(() => {
return {
- locations,
- currentLocation: currentLocation.current,
+ locations: allLocations.current,
+ currentLocation: location,
readOnlyMode,
skipInitialDirList: skipInitialDirList.current,
persistTagsInSidecarFile,
@@ -408,6 +529,10 @@ export const CurrentLocationContextProvider = ({
changeLocation,
addLocation,
addLocations,
+ deleteLocation,
+ moveLocationUp,
+ moveLocationDown,
+ moveLocation,
editLocation,
openLocation,
closeLocation,
@@ -419,9 +544,10 @@ export const CurrentLocationContextProvider = ({
locationDirectoryContextMenuAnchorEl,
setLocationDirectoryContextMenuAnchorEl,
getLocationPosition,
+ getFirstRWLocation,
};
}, [
- locations,
+ allLocations.current,
currentLocation.current,
selectedLocation.current,
persistTagsInSidecarFile,
diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsx
index f0469d3cd..b9ae5bd8b 100644
--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx
+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx
@@ -63,6 +63,7 @@ import { useEditedKanBanMetaContext } from '-/hooks/useEditedKanBanMetaContext';
import { CommonLocation } from '-/utils/CommonLocation';
import { useCancelable } from '-/utils/useCancelable';
import LoadingLazy from '-/components/LoadingLazy';
+import useFirstRender from '-/utils/useFirstRender';
type DirectoryContentContextData = {
currentLocationPath: string;
@@ -242,7 +243,7 @@ export const DirectoryContentContextProvider = ({
const currentDirectoryPath = useRef<string>(undefined);
const currentDirectoryFiles = useRef<TS.OrderVisibilitySettings[]>([]);
const currentDirectoryDirs = useRef<TS.OrderVisibilitySettings[]>([]);
- // const firstRender = useFirstRender();
+ const firstRender = useFirstRender();
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
useEffect(() => {
@@ -302,7 +303,7 @@ export const DirectoryContentContextProvider = ({
}, [currentLocation]);
useEffect(() => {
- if (metaActions && metaActions.length > 0) {
+ if (!firstRender && metaActions && metaActions.length > 0) {
for (const action of metaActions) {
if (
cleanTrailingDirSeparator(currentDirectoryPath.current) ===
@@ -314,7 +315,7 @@ export const DirectoryContentContextProvider = ({
action.entry.meta.perspective === PerspectiveIDs.UNSPECIFIED
? defaultPerspective
: action.entry.meta.perspective;
- forceUpdate();
+ setDirectoryMeta(action.entry.meta);
}
//setManualDirectoryPerspective(action.entry.meta.perspective);
} else if (
@@ -335,19 +336,17 @@ export const DirectoryContentContextProvider = ({
if (kanbanActions && kanbanActions.length > 0) {
for (const action of kanbanActions) {
if (action.action === 'directoryVisibilityChange') {
- directoryMeta.current = action.meta;
- currentDirectoryDirs.current = [
- ...directoryMeta.current.customOrder.folders,
- ];
- forceUpdate();
+ setDirectoryMeta(action.meta);
}
}
}
}, [kanbanActions]);
useEffect(() => {
- reflectActions(actions).catch(console.error);
- reflectSelection(actions);
+ if (!firstRender) {
+ reflectActions(actions).catch(console.error);
+ reflectSelection(actions);
+ }
}, [actions]);
const reflectActions = async (actions) => {
@@ -686,26 +685,39 @@ export const DirectoryContentContextProvider = ({
}
}
- function loadMetaDirectoryContent(
+ async function loadMetaDirectoryContent(
directoryPath: string,
location: CommonLocation,
- showHiddenEntries = undefined,
+ showHiddenEntries: boolean | undefined = undefined,
): Promise<TS.FileSystemEntry[]> {
+ // Ensure selectedEntries is cleared if not empty
if (selectedEntries.length > 0) {
setSelectedEntries([]);
}
- return getDirMeta(directoryPath, location).then((meta) => {
- if (meta) {
- directoryMeta.current = meta;
- } else {
- directoryMeta.current = getDefaultDirMeta();
- }
- return loadDirectoryContentInt(
- directoryPath,
- location,
- showHiddenEntries,
- );
- });
+
+ // Fetch directory metadata
+ const meta = await getDirMeta(directoryPath, location);
+
+ // Load directory content
+ const entries = await loadDirectoryContentInt(
+ directoryPath,
+ location,
+ showHiddenEntries,
+ );
+
+ // Update directory metadata
+ if (meta) {
+ directoryMeta.current = meta;
+ currentDirectoryDirs.current = meta.customOrder?.folders || [];
+ currentDirectoryFiles.current = meta.customOrder?.files || [];
+ } else {
+ directoryMeta.current = getDefaultDirMeta();
+ }
+
+ // Set current directory entries
+ setCurrentDirectoryEntries(entries);
+
+ return entries;
}
/**
@@ -738,7 +750,10 @@ export const DirectoryContentContextProvider = ({
directoryPath,
currentLocation,
showHiddenEntries,
- );
+ ).then((entries) => {
+ setCurrentDirectoryEntries(entries);
+ return entries;
+ });
});
} else {
isMetaLoaded.current = false;
@@ -747,7 +762,10 @@ export const DirectoryContentContextProvider = ({
directoryPath,
currentLocation,
showHiddenEntries,
- );
+ ).then((entries) => {
+ setCurrentDirectoryEntries(entries);
+ return entries;
+ });
}
}
@@ -867,25 +885,6 @@ export const DirectoryContentContextProvider = ({
dispatch(AppActions.setSearchFilter(undefined));
}
- if (directoryMeta.current) {
- /*if (directoryMeta.current.perspective) {
- currentPerspective.current = directoryMeta.current
- .perspective as TS.PerspectiveType;
- } else {
- currentPerspective.current = 'unspecified';
- }*/
- if (directoryMeta.current.customOrder) {
- if (directoryMeta.current.customOrder.files) {
- currentDirectoryFiles.current =
- directoryMeta.current.customOrder.files;
- }
- if (directoryMeta.current.customOrder.folders) {
- currentDirectoryDirs.current =
- directoryMeta.current.customOrder.folders;
- }
- }
- }
-
const directoryContent = enhanceDirectoryContent(
dirEntries,
location,
@@ -894,12 +893,9 @@ export const DirectoryContentContextProvider = ({
showHiddenEntries,
);
- setCurrentDirectoryEntries(directoryContent);
+ //setCurrentDirectoryEntries(directoryContent);
currentDirectoryPath.current = cleanTrailingDirSeparator(directoryPath);
- updateHistory(
- { ...location, path: currentLocationPath.current },
- directoryPath,
- );
+ updateHistory(location.uuid, currentLocationPath.current, directoryPath);
return directoryContent;
}
@@ -1021,6 +1017,10 @@ export const DirectoryContentContextProvider = ({
function setDirectoryMeta(meta: TS.FileSystemEntryMeta) {
directoryMeta.current = meta;
isMetaLoaded.current = true;
+ currentDirectoryDirs.current =
+ directoryMeta.current?.customOrder?.folders || [];
+ currentDirectoryFiles.current =
+ directoryMeta.current?.customOrder?.files || [];
forceUpdate();
}
@@ -1240,10 +1240,10 @@ export const DirectoryContentContextProvider = ({
);
}
- function setThumbForEntry(
+ async function setThumbForEntry(
entry: TS.FileSystemEntry,
meta: Array<any>, //TS.FileSystemEntryMeta[], -> todo extra path in meta
- ): TS.FileSystemEntry {
+ ): Promise<TS.FileSystemEntry> {
const thumbEntry = { ...entry, tags: [] };
let thumbPath = getThumbFileLocationForFile(
entry.path,
@@ -1261,7 +1261,7 @@ export const DirectoryContentContextProvider = ({
thumbPath = thumbPath.substring(1);
}
- thumbPath = currentLocation.generateURLforPath(thumbPath, 604800);
+ thumbPath = await currentLocation.generateURLforPath(thumbPath, 604800);
if (thumbPath) {
thumbEntry.meta = { id: getUuid(), thumbPath };
}
@@ -1350,7 +1350,7 @@ export const DirectoryContentContextProvider = ({
dirPath: string,
location: CommonLocation,
): Promise<TS.FileSystemEntryMeta> {
- return location.listMetaDirectoryPromise(dirPath).then((meta) => {
+ return location.listMetaDirectoryPromise(dirPath).then(async (meta) => {
const metaFilePath = getMetaFileLocationForDir(
dirPath,
location?.getDirSeparator(),
@@ -1363,7 +1363,7 @@ export const DirectoryContentContextProvider = ({
if (meta.some((metaFile) => thumbDirPath.endsWith(metaFile.path))) {
thumbPath =
location.haveObjectStoreSupport() || location.haveWebDavSupport()
- ? location.getURLforPath(thumbDirPath)
+ ? await location.getURLforPathInt(thumbDirPath)
: thumbDirPath;
}
if (
diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsx
index 4de58c0da..d6edf6e2d 100644
--- a/src/renderer/hooks/IOActionsContextProvider.tsx
+++ b/src/renderer/hooks/IOActionsContextProvider.tsx
@@ -39,7 +39,6 @@ import {
cleanTrailingDirSeparator,
cleanFrontDirSeparator,
generateFileName,
- extractParentDirectoryPath,
} from '@tagspaces/tagspaces-common/paths';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
import { actions as AppActions, AppDispatch } from '-/reducers/app';
@@ -52,7 +51,6 @@ import {
openFileMessage,
} from '-/services/utils-io';
import { TS } from '-/tagspaces.namespace';
-import { Progress } from 'aws-sdk/clients/s3';
import AppConfig from '-/AppConfig';
import {
generateImageThumbnail,
@@ -77,6 +75,7 @@ import { Pro } from '-/pro';
import { useEditedKanBanMetaContext } from '-/hooks/useEditedKanBanMetaContext';
import { CommonLocation } from '-/utils/CommonLocation';
import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';
+import useFirstRender from '-/utils/useFirstRender';
type IOActionsContextData = {
createDirectory: (directoryPath: string) => Promise<boolean>;
@@ -111,12 +110,12 @@ type IOActionsContextData = {
downloadFile: (
url: string,
targetPath: string,
- onDownloadProgress?: (progress: Progress, abort, fileName?) => void,
+ onDownloadProgress?: (progress, abort, fileName?) => void,
) => Promise<TS.FileSystemEntry>;
uploadFilesAPI: (
files: Array<any>,
targetPath: string,
- onUploadProgress?: (progress: Progress, abort, fileName?) => void,
+ onUploadProgress?: (progress, abort, fileName?) => void,
uploadMeta?: boolean,
open?: boolean,
targetLocationId?: string,
@@ -125,7 +124,7 @@ type IOActionsContextData = {
uploadFiles: (
paths: Array<string>,
targetPath: string,
- onUploadProgress?: (progress: Progress, abort, fileName?) => void,
+ onUploadProgress?: (progress, abort, fileName?) => void,
uploadMeta?: boolean,
open?: boolean,
targetLocationId?: string,
@@ -289,9 +288,10 @@ export const IOActionsContextProvider = ({
);
const prefixTagContainer = useSelector(getPrefixTagContainer);
const filenameTagPlacedAtEnd = useSelector(getFileNameTagPlace);
+ const firstRender = useFirstRender();
useEffect(() => {
- if (actions && actions.length > 0) {
+ if (!firstRender && actions && actions.length > 0) {
for (const action of actions) {
if (action.action === 'add') {
// reflect visibility change on new KanBan column add
@@ -779,7 +779,7 @@ export const IOActionsContextProvider = ({
function downloadFile(
url: string,
targetPath: string,
- onDownloadProgress?: (progress: Progress, abort, fileName?) => void,
+ onDownloadProgress?: (progress, abort, fileName?) => void,
): Promise<TS.FileSystemEntry> {
function saveFile(response: Response): Promise<TS.FileSystemEntry> {
if (AppConfig.isElectron && !currentLocation.haveObjectStoreSupport()) {
@@ -817,10 +817,12 @@ export const IOActionsContextProvider = ({
},
fileContent,
true,
- ).then((thumb: TS.FileSystemEntry) => ({
- ...fsEntry,
- thumbPath: currentLocation.getThumbPath(thumb.path),
- }));
+ ).then((thumb: TS.FileSystemEntry) =>
+ currentLocation.getThumbPath(thumb.path).then((thumbPath) => ({
+ ...fsEntry,
+ thumbPath: thumbPath,
+ })),
+ );
}
return fsEntry;
});
@@ -841,7 +843,7 @@ export const IOActionsContextProvider = ({
function uploadFilesAPI(
files: Array<any>,
targetPath: string,
- onUploadProgress?: (progress: Progress, abort, fileName?) => void,
+ onUploadProgress?: (progress, abort, fileName?) => void,
uploadMeta = true,
open = true,
targetLocationId: string = undefined,
@@ -914,8 +916,10 @@ export const IOActionsContextProvider = ({
);
if (fsEntry) {
// Generate Thumbnail
+ const url =
+ await currentLocation.getURLforPathInt(fileTargetPath);
const thumbPath = await generateThumbnailPromise(
- currentLocation.getURLforPath(fileTargetPath),
+ url,
fsEntry.size,
currentLocation.loadTextFilePromise,
currentLocation.getFileContentPromise,
@@ -944,8 +948,9 @@ export const IOActionsContextProvider = ({
console.log('error generateThumbnail:', err);
});
if (thumbPath) {
- fsEntry.meta.thumbPath =
- currentLocation.getURLforPath(thumbPath);
+ const tmbPath =
+ await currentLocation.getURLforPathInt(thumbPath);
+ fsEntry.meta.thumbPath = tmbPath;
}
fsEntries.push(fsEntry);
showNotification(
@@ -982,7 +987,7 @@ export const IOActionsContextProvider = ({
filePath: string,
fileType: string,
fileContent: any,
- onUploadProgress?: (progress: Progress, response: any) => void,
+ onUploadProgress?: (progress, response) => void,
reflect: boolean = true,
locationID: string = undefined,
) {
@@ -1052,7 +1057,7 @@ export const IOActionsContextProvider = ({
function uploadFiles(
paths: Array<string>,
targetPath: string,
- onUploadProgress?: (progress: Progress, response: any) => void,
+ onUploadProgress?: (progress, response) => void,
uploadMeta = true,
open = true,
targetLocationId: string = undefined,
@@ -1176,58 +1181,61 @@ export const IOActionsContextProvider = ({
);
// Enhance entries
- const entriesEnhanced = arrFiles.map((file: TS.FileSystemEntry) => {
- const metaFilePath = getMetaFileLocationForFile(
- file.path,
- AppConfig.dirSeparator,
- );
+ const entriesEnhanced = arrFiles.map(
+ async (file: TS.FileSystemEntry) => {
+ const metaFilePath = getMetaFileLocationForFile(
+ file.path,
+ AppConfig.dirSeparator,
+ );
- const thumbFilePath = getThumbFileLocationForFile(
- file.path,
- AppConfig.dirSeparator,
- );
- if (metaFilePath !== undefined) {
- for (let i = 0; i < arrMeta.length; i += 1) {
- const metaFile = arrMeta[i];
- const metaFilePath = metaFile.path.replace(/[/\\]/g, '');
- if (metaFilePath === metaFilePath.replace(/[/\\]/g, '')) {
- // eslint-disable-next-line no-param-reassign
- file.meta = {
- ...(file.meta && file.meta),
- ...metaFile.meta,
- };
- } else if (
- thumbFilePath &&
- metaFilePath === thumbFilePath.replace(/[/\\]/g, '')
- ) {
- file.meta = {
- ...(file.meta && file.meta),
- thumbPath: currentLocation.getURLforPath(
+ const thumbFilePath = getThumbFileLocationForFile(
+ file.path,
+ AppConfig.dirSeparator,
+ );
+ if (metaFilePath !== undefined) {
+ for (let i = 0; i < arrMeta.length; i += 1) {
+ const metaFile = arrMeta[i];
+ const metaFilePath = metaFile.path.replace(/[/\\]/g, '');
+ if (metaFilePath === metaFilePath.replace(/[/\\]/g, '')) {
+ // eslint-disable-next-line no-param-reassign
+ file.meta = {
+ ...(file.meta && file.meta),
+ ...metaFile.meta,
+ };
+ } else if (
+ thumbFilePath &&
+ metaFilePath === thumbFilePath.replace(/[/\\]/g, '')
+ ) {
+ const thumbPath = await currentLocation.getURLforPathInt(
file.meta.thumbPath,
- ),
- };
+ );
+ file.meta = {
+ ...(file.meta && file.meta),
+ thumbPath: thumbPath,
+ };
+ }
}
}
- }
- if (file.meta) {
- return enhanceEntry(
- file,
- AppConfig.tagDelimiter,
- currentLocation?.getDirSeparator(),
- );
- }
- return file;
- });
- const reflectActions: TS.EditAction[] = entriesEnhanced.map(
- (entry) => ({
+ if (file.meta) {
+ return enhanceEntry(
+ file,
+ AppConfig.tagDelimiter,
+ currentLocation?.getDirSeparator(),
+ );
+ }
+ return file;
+ },
+ );
+ Promise.all(entriesEnhanced).then((entries) => {
+ const reflectActions: TS.EditAction[] = entries.map((entry) => ({
action: 'add',
entry: entry,
open: open,
source: 'upload',
- }),
- );
- setReflectActions(...reflectActions);
- resolve(entriesEnhanced);
+ }));
+ setReflectActions(...reflectActions);
+ resolve(entries);
+ });
} else {
// eslint-disable-next-line prefer-promise-reject-errors
reject('Upload failed');
@@ -1748,8 +1756,15 @@ export const IOActionsContextProvider = ({
entry.path,
currentLocation?.getDirSeparator(),
);
- currentLocation.generateURLforPath(folderBgndPath, 604800);
+ currentLocation
+ .generateURLforPath(folderBgndPath, 604800)
+ .then(() => setBackgroundImageChangeAction(entry));
+ } else {
+ setBackgroundImageChangeAction(entry);
}
+ }
+
+ function setBackgroundImageChangeAction(entry: TS.FileSystemEntry) {
const action: TS.EditMetaAction = {
action: 'bgdImgChange',
entry: {
@@ -1793,8 +1808,14 @@ export const IOActionsContextProvider = ({
entry.path,
currentLocation?.getDirSeparator(),
);
- currentLocation.generateURLforPath(folderThumbPath, 604800);
+ currentLocation
+ .generateURLforPath(folderThumbPath, 604800)
+ .then(() => setThumbnailImageChangeAction(entry));
}
+ setThumbnailImageChangeAction(entry);
+ }
+
+ function setThumbnailImageChangeAction(entry: TS.FileSystemEntry) {
const action: TS.EditMetaAction = {
action: 'thumbChange',
entry: {
diff --git a/src/renderer/hooks/LocationIndexContextProvider.tsx b/src/renderer/hooks/LocationIndexContextProvider.tsx
index cf791b61b..8eb595d8b 100644
--- a/src/renderer/hooks/LocationIndexContextProvider.tsx
+++ b/src/renderer/hooks/LocationIndexContextProvider.tsx
@@ -50,6 +50,7 @@ import { useEditedEntryContext } from '-/hooks/useEditedEntryContext';
import { useFSWatcherContext } from '-/hooks/useFSWatcherContext';
import { CommonLocation } from '-/utils/CommonLocation';
import { Pro } from '-/pro';
+import useFirstRender from '-/utils/useFirstRender';
type LocationIndexContextData = {
//index: TS.FileSystemEntry[];
@@ -109,13 +110,14 @@ export const LocationIndexContextProvider = ({
const index = useRef<TS.FileSystemEntry[]>(undefined);
const indexLoadedOn = useRef<number>(undefined);
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+ const firstRender = useFirstRender();
useEffect(() => {
clearDirectoryIndex();
}, [currentLocation]);
useEffect(() => {
- if (actions && actions.length > 0) {
+ if (!firstRender && actions && actions.length > 0) {
for (const action of actions) {
if (action.action === 'add') {
reflectCreateEntry(action.entry);
@@ -437,11 +439,16 @@ export const LocationIndexContextProvider = ({
if (thumbFilePath) {
return loc.checkFileExist(thumbFilePath).then((exist) => {
if (exist) {
- const thumbPath =
- loc.type === locationType.TYPE_CLOUD
- ? loc.getURLforPath(thumbFilePath)
- : thumbFilePath;
- return { ...entry, meta: { ...entry.meta, thumbPath } };
+ if (loc.type === locationType.TYPE_CLOUD) {
+ return loc.getURLforPathInt(thumbFilePath).then((thumbPath) => ({
+ ...entry,
+ meta: { ...entry.meta, thumbPath },
+ }));
+ }
+ return {
+ ...entry,
+ meta: { ...entry.meta, thumbPath: thumbFilePath },
+ };
}
return undefined;
});
diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsx
index 36a201beb..e38380a9d 100644
--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx
+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx
@@ -211,7 +211,7 @@ export const OpenedEntryContextProvider = ({
}, []);
useEffect(() => {
- if (actions && actions.length > 0) {
+ if (!firstRender && actions && actions.length > 0) {
for (const action of actions) {
if (action.action === 'add') {
if (action.open && action.entry.isFile) {
@@ -239,7 +239,7 @@ export const OpenedEntryContextProvider = ({
}, [actions]);
useEffect(() => {
- if (metaActions && metaActions.length > 0) {
+ if (!firstRender && metaActions && metaActions.length > 0) {
let isChanged = false;
for (const action of metaActions) {
if (
@@ -553,7 +553,7 @@ export const OpenedEntryContextProvider = ({
});
}
- function openFsEntry(
+ async function openFsEntry(
fsEntry?: TS.FileSystemEntry,
showDetails = undefined,
): Promise<boolean> {
@@ -597,7 +597,7 @@ export const OpenedEntryContextProvider = ({
const cleanedPath = fsEntry.path.startsWith('/')
? fsEntry.path.substr(1)
: fsEntry.path;
- entryForOpening.url = loc.getURLforPath(cleanedPath);
+ entryForOpening.url = await loc.getURLforPathInt(cleanedPath);
} else if (fsEntry.url) {
entryForOpening.url = fsEntry.url;
}
@@ -614,7 +614,8 @@ export const OpenedEntryContextProvider = ({
// update history window.location.href - used for shared link generation
updateHistory(
- { ...currentLocation, path: currentLocationPath },
+ currentLocation?.uuid,
+ currentLocationPath,
currentDirectoryPath,
fsEntry.path,
);
diff --git a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
index 5de88fc1b..9d08f48e9 100644
--- a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
+++ b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
@@ -30,6 +30,7 @@ import { useIOActionsContext } from '-/hooks/useIOActionsContext';
import { mergeFsEntryMeta } from '-/services/utils-io';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
+import useFirstRender from '-/utils/useFirstRender';
type PerspectiveSettingsContextData = {
settings: TS.FolderSettings;
@@ -100,6 +101,7 @@ export const PerspectiveSettingsContextProvider = ({
const settings = useRef<TS.FolderSettings>(
getSettings(getPerspective(), directoryMeta),
);
+ const firstRender = useFirstRender();
/*useEffect(() => {
settings.current = getSettings(getPerspective(), directoryMeta);
@@ -107,7 +109,7 @@ export const PerspectiveSettingsContextProvider = ({
}, [perspective, directoryMeta]);*/
useEffect(() => {
- if (metaActions && metaActions.length > 0) {
+ if (!firstRender && metaActions && metaActions.length > 0) {
for (const action of metaActions) {
if (action.action === 'perspectiveChange') {
settings.current = getSettings(getPerspective(), directoryMeta);
diff --git a/src/renderer/hooks/ThumbGenerationContextProvider.tsx b/src/renderer/hooks/ThumbGenerationContextProvider.tsx
index 850c5beff..6b04a365c 100644
--- a/src/renderer/hooks/ThumbGenerationContextProvider.tsx
+++ b/src/renderer/hooks/ThumbGenerationContextProvider.tsx
@@ -52,6 +52,7 @@ import {
} from '-/services/utils-io';
import { CommonLocation } from '-/utils/CommonLocation';
import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
+import useFirstRender from '-/utils/useFirstRender';
type ThumbGenerationContextData = {
generateThumbnails: (dirEntries: TS.FileSystemEntry[]) => Promise<boolean>;
@@ -86,6 +87,7 @@ export const ThumbGenerationContextProvider = ({
const enableWS = useSelector(getEnableWS);
const showUnixHiddenEntries = useSelector(getShowUnixHiddenEntries);
const isGeneratingThumbs = useRef(false);
+ const firstRender = useFirstRender();
function setGenThumbs(isGen: boolean) {
isGeneratingThumbs.current = isGen;
@@ -135,7 +137,7 @@ export const ThumbGenerationContextProvider = ({
}, [currentDirectoryPath, page]); //, isMetaFolderExist]);
useEffect(() => {
- if (metaActions && metaActions.length > 0) {
+ if (!firstRender && metaActions && metaActions.length > 0) {
const entries = [];
for (const action of metaActions) {
if (action.action === 'thumbGenerate') {
diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.json
index b659d7eae..680533ffa 100644
--- a/src/renderer/locales/en/core.json
+++ b/src/renderer/locales/en/core.json
@@ -840,5 +840,6 @@
"title": "Title",
"copyright": "Copyright",
"modificationDate": "Modification Date",
+ "noSelectedEntryError": "No Selected Entries",
"-": "-"
}
diff --git a/src/renderer/perspectives/grid/components/GridCell.tsx b/src/renderer/perspectives/grid/components/GridCell.tsx
index 9fc37df57..ae52fc13f 100644
--- a/src/renderer/perspectives/grid/components/GridCell.tsx
+++ b/src/renderer/perspectives/grid/components/GridCell.tsx
@@ -63,6 +63,7 @@ import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
import i18n from '-/services/i18n';
import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
+import useFirstRender from '-/utils/useFirstRender';
export function urlGetDelim(url) {
return url.indexOf('?') > 0 ? '&' : '?';
@@ -134,56 +135,57 @@ function GridCell(props: Props) {
const { findLocation, readOnlyMode } = useCurrentLocationContext();
const supportedFileTypes = useSelector(getSupportedFileTypes);
const reorderTags: boolean = useSelector(isReorderTags);
- //const locations: Array<CommonLocation> = useSelector(getLocations);
- //const lastThumbnailImageChange = useSelector(getLastThumbnailImageChange);
- // const desktopMode = useSelector(isDesktopMode);
+ const thumbPath = useRef<string>(undefined);
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+ const firstRender = useFirstRender();
const fileSystemEntryColor = findColorForEntry(fsEntry, supportedFileTypes);
const maxHeight = calculateEntryHeight(entrySize);
const entryPath = fsEntry.path;
const isSmall = entrySize === 'tiny' || entrySize === 'small';
+ const gridCellLocation = findLocation(fsEntry.locationID);
+
+ function setThumbPath(update = true): Promise<boolean> {
+ if (gridCellLocation && fsEntry.meta) {
+ if (fsEntry.meta.thumbPath) {
+ return gridCellLocation
+ .getThumbPath(fsEntry.meta.thumbPath, fsEntry.meta?.lastUpdated)
+ .then((tmbPath) => {
+ if (tmbPath !== thumbPath.current) {
+ thumbPath.current = tmbPath;
+ if (update) {
+ forceUpdate();
+ }
+ return true;
+ }
+ return false;
+ });
+ }
+ }
+ return Promise.resolve(false);
+ }
+
+ useEffect(() => {
+ setThumbPath();
+ }, [fsEntry]);
useEffect(() => {
- if (metaActions && metaActions.length > 0) {
+ if (!firstRender && metaActions && metaActions.length > 0) {
for (const action of metaActions) {
if (fsEntry.path === action.entry.path) {
- /*if (action.action === 'thumbChange') {
- if (action.entry.meta.thumbPath) {
- thumbUrl.current = getThumbPath(
- action.entry.meta.thumbPath,
- action.entry.meta?.lastUpdated,
- );
- } else {
- //thumbnail deleted
- thumbUrl.current = undefined;
- if (fsEntry.meta) {
- const { thumbPath, ...meta } = fsEntry.meta;
- fsEntry.meta = meta;
- }
- }
- forceUpdate();
- } else*/
- /*if (action.action === 'bgdColorChange') {
- fileSystemEntryBgColor.current = findBackgroundColorForFolder(
- action.entry,
- );
- forceUpdate();
- } else*/
if (
action.action === 'thumbChange' ||
action.action === 'bgdColorChange' ||
action.action === 'descriptionChange'
) {
fsEntry.meta = { ...action.entry.meta };
- forceUpdate();
+ setThumbPath(false).then(() => forceUpdate());
}
}
}
}
}, [metaActions]);
- const gridCellLocation = findLocation(fsEntry.locationID);
if (!gridCellLocation && fsEntry.locationID) {
// location not exist in locationManager (maybe removed)
return null;
@@ -414,7 +416,7 @@ function GridCell(props: Props) {
<TagsPreview tags={entryTags} />
)}
</Box>
- {fsEntry.meta && fsEntry.meta.thumbPath ? (
+ {fsEntry.meta && fsEntry.meta.thumbPath && thumbPath.current ? (
<CardMedia
component="img"
loading="lazy"
@@ -422,10 +424,7 @@ function GridCell(props: Props) {
onError={(i) => (i.target.style.display = 'none')}
alt="thumbnail image"
height="auto"
- src={gridCellLocation.getThumbPath(
- fsEntry.meta.thumbPath,
- fsEntry.meta?.lastUpdated,
- )}
+ src={thumbPath.current}
style={{
height: maxHeight - 70,
objectFit: thumbnailMode,
diff --git a/src/renderer/perspectives/grid/components/GridPagination.tsx b/src/renderer/perspectives/grid/components/GridPagination.tsx
index cc92bcd31..3c760cee6 100644
--- a/src/renderer/perspectives/grid/components/GridPagination.tsx
+++ b/src/renderer/perspectives/grid/components/GridPagination.tsx
@@ -16,7 +16,7 @@
*
*/
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useReducer, useRef } from 'react';
import { useTheme } from '@mui/material/styles';
import Typography from '@mui/material/Typography';
import Tooltip from '-/components/Tooltip';
@@ -45,6 +45,7 @@ import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsCon
import GridCellsContainer from './GridCellsContainer';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
import { useEntryExistDialogContext } from '-/components/dialogs/hooks/useEntryExistDialogContext';
+import { dataTidFormat } from '-/services/test';
interface Props {
directories: Array<TS.FileSystemEntry>;
@@ -104,6 +105,8 @@ function GridPagination(props: Props) {
const { openDirectory, directoryMeta } = useDirectoryContentContext();
const { sortedDirContent } = useSortedDirContext();
const { page, pageFiles, setCurrentPage } = usePaginationContext();
+ const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+
if (!showDirectories) {
directories = [];
}
@@ -114,13 +117,35 @@ function GridPagination(props: Props) {
? Math.ceil(allFilesCount / gridPageLimit)
: 10;
+ const backgroundImage = useRef<string>('none');
+ const thumbImage = useRef<string>('none');
const containerEl = useRef<HTMLDivElement>(null);
useEffect(() => {
if (containerEl.current) {
containerEl.current.scrollTop = 0;
}
- }, [currentDirectoryPath, containerEl.current]);
+ if (currentLocation) {
+ currentLocation
+ .getFolderBgndPath(currentDirectoryPath, directoryMeta?.lastUpdated)
+ .then((bgPath) => {
+ const bgImage = 'url("' + bgPath + '")';
+ if (bgImage !== backgroundImage.current) {
+ backgroundImage.current = bgImage;
+ forceUpdate();
+ }
+ });
+ currentLocation
+ .getFolderThumbPath(currentDirectoryPath, directoryMeta?.lastUpdated)
+ .then((thumbPath) => {
+ const thbImage = 'url("' + thumbPath + '")';
+ if (thbImage !== thumbImage.current) {
+ thumbImage.current = thbImage;
+ forceUpdate();
+ }
+ });
+ }
+ }, [currentDirectoryPath, containerEl.current, directoryMeta]);
const handleChange = (event, value) => {
setCurrentPage(value);
@@ -148,6 +173,7 @@ function GridPagination(props: Props) {
return (
// eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-noninteractive-element-interactions,jsx-a11y/no-static-element-interactions
<div
+ data-tid="backgroundTID"
style={{
height: '100%',
background: `${dirColor}`,
@@ -164,13 +190,7 @@ function GridPagination(props: Props) {
style={{
height: '100%',
overflowY: 'auto',
- backgroundImage:
- 'url("' +
- currentLocation?.getFolderBgndPath(
- currentDirectoryPath,
- directoryMeta?.lastUpdated,
- ) +
- '")',
+ backgroundImage: backgroundImage.current,
backgroundSize: 'cover',
backgroundRepeat: 'no-repeat',
}}
@@ -212,7 +232,7 @@ function GridPagination(props: Props) {
>
<Tooltip title={t('core:renameDirectory')}>
<ButtonBase
- data-tid={'currentDir_' + folderName}
+ data-tid={'currentDir_' + dataTidFormat(folderName)}
style={{
fontSize: '1.5rem',
filter: `drop-shadow(0px 0px 4px ${theme.palette.background.default})`,
@@ -277,13 +297,7 @@ function GridPagination(props: Props) {
borderRadius: 10,
height: 100,
width: 140,
- backgroundImage:
- 'url("' +
- currentLocation?.getFolderThumbPath(
- currentDirectoryPath,
- directoryMeta?.lastUpdated,
- ) +
- '")',
+ backgroundImage: thumbImage.current,
backgroundSize: 'cover', // cover contain
backgroundRepeat: 'no-repeat',
backgroundPosition: 'center center',
diff --git a/src/renderer/perspectives/grid/components/MainToolbar.tsx b/src/renderer/perspectives/grid/components/MainToolbar.tsx
index a420a0de5..49871037f 100644
--- a/src/renderer/perspectives/grid/components/MainToolbar.tsx
+++ b/src/renderer/perspectives/grid/components/MainToolbar.tsx
@@ -100,8 +100,9 @@ function MainToolbar(props: Props) {
const cleanedPath = entry.path.startsWith('/')
? entry.path.substr(1)
: entry.path;
- const url = currentLocation.generateURLforPath(cleanedPath, 900);
- fetch(url)
+ currentLocation
+ .generateURLforPath(cleanedPath, 900)
+ .then((url) => fetch(url))
.then((res) => res.blob()) // Gets the response and returns it as a blob
.then((blob) => {
saveAs(blob, entry.name);
diff --git a/src/renderer/reducers/locations.ts b/src/renderer/reducers/locations.ts
index 74cd1b206..86768b103 100644
--- a/src/renderer/reducers/locations.ts
+++ b/src/renderer/reducers/locations.ts
@@ -19,6 +19,7 @@
import { immutablySwapItems } from '@tagspaces/tagspaces-common/misc';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
import { CommonLocation } from '-/utils/CommonLocation';
+import { TS } from '-/tagspaces.namespace';
export const types = {
ADD_LOCATION: 'APP/ADD_LOCATION',
@@ -31,16 +32,53 @@ export const types = {
export const initialState = [];
-export default (state: Array<CommonLocation> = initialState, action: any) => {
+function toTsLocation(location: CommonLocation): TS.Location {
+ return {
+ uuid: location.uuid || getUuid(),
+ name: location.name,
+ type: location.type,
+ ...(location.authType && { authType: location.authType }),
+ ...(location.username && { username: location.username }),
+ ...(location.password && { password: location.password }),
+ ...(location.path && { path: location.path }),
+ ...(location.isDefault && { isDefault: location.isDefault }),
+ ...(location.isReadOnly && { isReadOnly: location.isReadOnly }),
+ ...(location.isNotEditable && { isNotEditable: location.isNotEditable }),
+ ...(location.watchForChanges && {
+ watchForChanges: location.watchForChanges,
+ }),
+ ...(location.disableIndexing && {
+ disableIndexing: location.disableIndexing,
+ }),
+ ...(location.disableThumbnailGeneration && {
+ disableThumbnailGeneration: location.disableThumbnailGeneration,
+ }),
+ ...(location.fullTextIndex && { fullTextIndex: location.fullTextIndex }),
+ ...(location.maxIndexAge && { maxIndexAge: location.maxIndexAge }),
+ ...(location.maxLoops && { maxLoops: location.maxLoops }),
+ ...(location.persistTagsInSidecarFile && {
+ persistTagsInSidecarFile: location.persistTagsInSidecarFile,
+ }),
+ ...(location.ignorePatternPaths && {
+ ignorePatternPaths: location.ignorePatternPaths,
+ }),
+ ...(location.autoOpenedFilename && {
+ autoOpenedFilename: location.autoOpenedFilename,
+ }),
+ ...(location.creationDate && { creationDate: location.creationDate }),
+ ...(location.lastEditedDate && { lastEditedDate: location.lastEditedDate }),
+ };
+}
+
+export default (state: Array<TS.Location> = initialState, action: any) => {
switch (action.type) {
case types.ADD_LOCATION: {
const locations = action.location.isDefault
? state.map((location) => ({ ...location, isDefault: false }))
: [...state];
- const newLocation: CommonLocation = {
- ...action.location,
- uuid: action.location.uuid || getUuid(),
+ const newLocation: TS.Location = {
+ ...toTsLocation(action.location),
creationDate: new Date().getTime(),
lastEditedDate: new Date().getTime(),
};
@@ -68,12 +106,11 @@ export default (state: Array<CommonLocation> = initialState, action: any) => {
...state.slice(0, indexForEditing),
{
...state[indexForEditing],
- ...action.location,
+ ...toTsLocation(action.location),
uuid:
action.location.newuuid !== undefined
? action.location.newuuid
: action.location.uuid,
- persistTagsInSidecarFile: action.location.persistTagsInSidecarFile,
lastEditedDate: new Date().getTime(),
},
...state.slice(indexForEditing + 1),
@@ -173,9 +210,13 @@ export const actions = {
};
// Selectors
-export const getLocations = (state: any): Array<CommonLocation> =>
- state.locations.map((l) => new CommonLocation(l));
-export const getLocation = (
+export const getLocations = (state: any): TS.Location[] => state.locations;
+export const getDefaultLocationId = (state: any): string | undefined => {
+ let foundLocation = state.locations.find((location) => location.isDefault);
+ return foundLocation ? foundLocation.uuid : undefined;
+};
+// state.locations.map((l) => new CommonLocation(l));
+/*export const getLocation = (
state: any,
locationId: string,
): CommonLocation | null =>
@@ -185,10 +226,6 @@ export const getLocationByPath = (
path: string,
): CommonLocation | null =>
state.locations.find((location) => location.path === path);
-export const getDefaultLocationId = (state: any): string | undefined => {
- let foundLocation = state.locations.find((location) => location.isDefault);
- return foundLocation ? foundLocation.uuid : undefined;
-};
export const getFirstRWLocation = (state: any): CommonLocation | undefined => {
let foundLocation = state.locations.find(
(location) => location.isDefault && !location.isReadOnly,
@@ -197,4 +234,4 @@ export const getFirstRWLocation = (state: any): CommonLocation | undefined => {
foundLocation = state.locations.find((location) => !location.isReadOnly);
}
return foundLocation;
-};
+}; */
diff --git a/src/renderer/third-party.txt b/src/renderer/third-party.txt
index ca28dace8..2b5626327 100644
--- a/src/renderer/third-party.txt
+++ b/src/renderer/third-party.txt
@@ -429,10 +429,13 @@ The following npm packages may be included in this product:
- @ampproject/[email protected]
- @aws-crypto/[email protected]
- @aws-crypto/[email protected]
+ - @aws-crypto/[email protected]
- @aws-crypto/[email protected]
- @aws-crypto/[email protected]
+ - @aws-crypto/[email protected]
- @aws-crypto/[email protected]
- @aws-crypto/[email protected]
+ - @aws-crypto/[email protected]
These packages each contain the following license and notice below:
@@ -2579,8 +2582,11 @@ The following npm packages may be included in this product:
- @aws-crypto/[email protected]
- @aws-crypto/[email protected]
+ - @aws-crypto/[email protected]
+ - @aws-crypto/[email protected]
- @aws-crypto/[email protected]
- @aws-crypto/[email protected]
+ - @aws-crypto/[email protected]
These packages each contain the following license and notice below:
@@ -2801,8 +2807,12 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
@@ -2810,14 +2820,18 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
@@ -2831,8 +2845,18 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
These packages each contain the following license and notice below:
@@ -3251,6 +3275,216 @@ Apache License
-----------
+The following npm package may be included in this product:
+
+ - @aws-sdk/[email protected]
+
+This package contains the following license and notice below:
+
+Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-----------
+
The following npm packages may be included in this product:
- @aws-sdk/[email protected]
@@ -3266,19 +3500,34 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
These packages each contain the following license and notice below:
@@ -3579,7 +3828,7 @@ MIT License
The following npm package may be included in this product:
- - @tagspacespro/[email protected]
+ - @tagspacespro/[email protected]
This package contains the following license and notice below:
@@ -3596,23 +3845,23 @@ This package contains the following license and notice below:
(MIT License)
Copyright (c) 2014-2016 Matt Zabriskie. All rights reserved.
-
+
Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
-
+
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-----------
@@ -4352,19 +4601,19 @@ This package contains the following license and notice below:
Copyright (c) 2014 TJ Holowaychuk <[email protected]>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the 'Software'), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the 'Software'), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial
+The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------
@@ -5399,7 +5648,7 @@ This package contains the following license and notice below:
[The MIT License (MIT)](http://opensource.org/licenses/MIT)
-Copyright (c) 2009-2013 Jeff Mott
+Copyright (c) 2009-2013 Jeff Mott
Copyright (c) 2013-2016 Evan Vosberg
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -5860,6 +6109,7 @@ The following npm packages may be included in this product:
- @aws-crypto/[email protected]
- @aws-crypto/[email protected]
- @aws-crypto/[email protected]
+ - @aws-crypto/[email protected]
These packages each contain the following license and notice below:
@@ -6077,12 +6327,15 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
@@ -6091,25 +6344,31 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
@@ -6121,7 +6380,9 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
@@ -6134,6 +6395,37 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
These packages each contain the following license and notice below:
@@ -6345,8 +6637,11 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
These packages each contain the following license and notice below:
@@ -6558,9 +6853,12 @@ The following npm packages may be included in this product:
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
- @aws-sdk/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
These packages each contain the following license and notice below:
@@ -6768,11 +7066,14 @@ Apache License
-----------
-The following npm package may be included in this product:
+The following npm packages may be included in this product:
- @aws-sdk/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
+ - @smithy/[email protected]
-This package contains the following license and notice below:
+These packages each contain the following license and notice below:
Apache License
Version 2.0, January 2004
@@ -6980,6 +7281,8 @@ Apache License
The following npm packages may be included in this product:
+ - @aws-sdk/[email protected]
+ - @aws-sdk/[email protected]
@@ -7046,7 +7349,7 @@ exhaustive, and do not form part of our licenses.
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More_considerations
- for the public:
+ for the public:
wiki.creativecommons.org/Considerations_for_licensees
=======================================================================
@@ -7393,21 +7696,6 @@ Creative Commons may be contacted at creativecommons.org.
-----------
-The following npm packages may be included in this product:
-
-
-These packages each contain the following license and notice below:
-
-AWS SDK for JavaScript
-Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-This product includes software developed at
-Amazon Web Services, Inc. (http://aws.amazon.com/).
-
------------
-
The following npm package may be included in this product:
@@ -9236,47 +9524,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
The following npm package may be included in this product:
This package contains the following license and notice below:
-Copyright 2010, 2011, 2012, 2013. All rights reserved.
+Copyright 2012-2018 (c) Mihai Bazon <[email protected]>
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
------------
-
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-Copyright 2012-2018 (c) Mihai Bazon <[email protected]>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above
- copyright notice, this list of conditions and the following
- disclaimer.
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the following
+ disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
@@ -9349,7 +9609,7 @@ The following npm packages may be included in this product:
These packages each contain the following license and notice below:
-Copyright 2013 Thorsten Lorenz.
+Copyright 2013 Thorsten Lorenz.
All rights reserved.
Permission is hereby granted, free of charge, to any person
@@ -9397,28 +9657,6 @@ THIS SOFTWARE.
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-Copyright 2014 James Saryerwinnie
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
------------
-
The following npm package may be included in this product:
- @gorillastack/[email protected]
@@ -9939,33 +10177,6 @@ SOFTWARE.
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
------------
-
The following npm packages may be included in this product:
@@ -10116,7 +10327,6 @@ The following npm packages may be included in this product:
@@ -10833,16 +11043,6 @@ http://mths.be/mit
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-https://github.com/Gozala/enchain/License.md
-
------------
-
The following npm package may be included in this product:
@@ -11054,12 +11254,11 @@ MIT
-----------
-The following npm packages may be included in this product:
+The following npm package may be included in this product:
-These packages each contain the following license and notice below:
+This package contains the following license and notice below:
MIT
@@ -11794,6 +11993,7 @@ The following npm packages may be included in this product:
These packages each contain the following license and notice below:
@@ -12668,36 +12868,6 @@ SOFTWARE.
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-MIT License
-
-Copyright (c) 2020 Inspect JS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------
-
The following npm packages may be included in this product:
@@ -12879,36 +13049,6 @@ SOFTWARE.
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-MIT License
-
-Copyright (c) 2021 Inspect JS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------
-
The following npm package may be included in this product:
@@ -13188,7 +13328,6 @@ The following npm packages may be included in this product:
These packages each contain the following license and notice below:
@@ -13344,6 +13483,35 @@ SOFTWARE.
-----------
+The following npm package may be included in this product:
+
+
+This package contains the following license and notice below:
+
+MIT License
+
+Copyright (c) James Halliday
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----------
+
The following npm packages may be included in this product:
@@ -14225,56 +14393,6 @@ https://creativecommons.org/licenses/by-sa/4.0/
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-====
-
-`String.fromCodePoint` by Mathias Bynens used according to terms of MIT
-License, as follows:
-
- Copyright Mathias Bynens <https://mathiasbynens.be/>
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------------
-
The following npm package may be included in this product:
@@ -14285,25 +14403,25 @@ The MIT License
Copyright (c) 2013 James Halliday ([email protected])
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
subject to the following conditions:
-The above copyright notice and this permission notice
+The above copyright notice and this permission notice
shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------
@@ -14480,36 +14598,6 @@ SOFTWARE.
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright (c) 2010-2020 Robert Kieffer and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------
-
The following npm packages may be included in this product:
@@ -14620,36 +14708,6 @@ THE SOFTWARE.
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright (c) 2012 Raynos.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------
-
The following npm package may be included in this product:
@@ -14914,36 +14972,6 @@ THE SOFTWARE.
-----------
-The following npm packages may be included in this product:
-
-
-These packages each contain the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------------
-
The following npm package may be included in this product:
@@ -15288,12 +15316,12 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------
@@ -15634,38 +15662,6 @@ THE SOFTWARE.
-----------
-The following npm packages may be included in this product:
-
-
-These packages each contain the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------
-
The following npm packages may be included in this product:
@@ -15806,12 +15802,12 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------
@@ -16116,6 +16112,36 @@ SOFTWARE.
-----------
+The following npm package may be included in this product:
+
+
+This package contains the following license and notice below:
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Vitaly Kravtsov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----------
+
The following npm packages may be included in this product:
@@ -16825,6 +16851,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
The following npm packages may be included in this product:
These packages each contain the following license and notice below:
@@ -17166,36 +17193,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright Joyent, Inc. and other Node contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------
-
The following npm package may be included in this product:
@@ -17325,11 +17322,11 @@ SOFTWARE.
The following npm packages may be included in this product:
- - @tagspaces/[email protected]
- - @tagspaces/[email protected]
- - @tagspaces/[email protected]
- - @tagspaces/[email protected]
- - @tagspaces/[email protected]
+ - @tagspaces/[email protected]
+ - @tagspaces/[email protected]
+ - @tagspaces/[email protected]
+ - @tagspaces/[email protected]
+ - @tagspaces/[email protected]
These packages each contain the following license and notice below:
@@ -17344,36 +17341,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-----------
-The following npm package may be included in this product:
-
-
-This package contains the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Ozgur Ozcitak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------
-
The following npm package may be included in this product:
@@ -17612,7 +17579,7 @@ The following npm package may be included in this product:
This package contains the following license and notice below:
-TypeBox: JSON Schema Type Builder with Static Type Resolution for TypeScript
+TypeBox: JSON Schema Type Builder with Static Type Resolution for TypeScript
The MIT License (MIT)
diff --git a/src/renderer/utils/CommonLocation.ts b/src/renderer/utils/CommonLocation.ts
index 55adbffd8..a982a460b 100644
--- a/src/renderer/utils/CommonLocation.ts
+++ b/src/renderer/utils/CommonLocation.ts
@@ -17,11 +17,7 @@ import AppConfig from '-/AppConfig';
//import * as objectStoreAPI from '@tagspaces/tagspaces-common-aws';
import * as cordovaIO from '@tagspaces/tagspaces-common-cordova';
import { TS } from '-/tagspaces.namespace';
-import {
- getDescriptionPreview,
- getFulfilledResults,
- getMimeType,
-} from '-/services/utils-io';
+import { getFulfilledResults, getMimeType } from '-/services/utils-io';
export class CommonLocation implements TS.Location {
uuid: string;
@@ -133,14 +129,20 @@ export class CommonLocation implements TS.Location {
return this.ioAPI ? '/' : AppConfig.dirSeparator;
};
- getEntryThumbPath = (entry: TS.FileSystemEntry, dt = undefined) => {
+ getEntryThumbPath = (
+ entry: TS.FileSystemEntry,
+ dt = undefined,
+ ): Promise<string | undefined> => {
if (entry) {
return this.getThumbPath(this.getThumbEntryPath(entry), dt);
}
- return undefined;
+ return Promise.resolve(undefined);
};
- getThumbEntryPath = (entry: TS.FileSystemEntry, encoded = false) => {
+ getThumbEntryPath = (
+ entry: TS.FileSystemEntry,
+ encoded = false,
+ ): string | undefined => {
if (!entry) {
return undefined;
}
@@ -152,14 +154,17 @@ export class CommonLocation implements TS.Location {
* @param path
* @param dt
*/
- getFolderThumbPath = (path: string, dt = undefined) => {
+ getFolderThumbPath = (
+ path: string,
+ dt = undefined,
+ ): Promise<string | undefined> => {
if (path) {
return this.getThumbPath(
getThumbFileLocationForDirectory(path, this.getDirSeparator()),
dt,
);
}
- return undefined;
+ return Promise.resolve(undefined);
};
/**
@@ -170,21 +175,24 @@ export class CommonLocation implements TS.Location {
getThumbPath = (
thumbPath: string,
dt = undefined,
- // isLocalFile = false, // todo rethink this
- ) => {
+ ): Promise<string | undefined> => {
if (!thumbPath) {
- return undefined;
+ return Promise.resolve(undefined);
}
+
if (this.haveObjectStoreSupport() || this.haveWebDavSupport()) {
if (this.isSignedURL(thumbPath)) {
- return thumbPath;
+ return Promise.resolve(thumbPath);
}
- return this.getURLforPath(thumbPath);
+
+ return this.getURLforPathInt(thumbPath);
}
- return this.normalizeUrl(thumbPath) + (dt ? '?' + dt : '');
+
+ const normalizedUrl = this.normalizeUrl(thumbPath) + (dt ? '?' + dt : '');
+ return Promise.resolve(normalizedUrl);
};
- isSignedURL = (signedUrl) => {
+ isSignedURL = (signedUrl): boolean => {
try {
// const query = url.parse(signedUrl, true).query;
return signedUrl.indexOf('Signature=') !== -1;
@@ -192,24 +200,37 @@ export class CommonLocation implements TS.Location {
return false;
};
- getFolderBgndPath = (path: string, dt = undefined) => {
+ getFolderBgndPath = (
+ path: string,
+ dt = undefined,
+ ): Promise<string | undefined> => {
if (path !== undefined) {
return this.getBgndPath(
getBgndFileLocationForDirectory(path, this.getDirSeparator()),
dt,
);
}
- return undefined;
+ return Promise.resolve(undefined);
};
- getBgndPath = (bgndPath: string, dt = undefined) => {
+ getBgndPath = (
+ bgndPath: string,
+ dt = undefined,
+ ): Promise<string | undefined> => {
if (!bgndPath) {
- return undefined;
+ return Promise.resolve(undefined);
}
+
if (this.haveObjectStoreSupport() || this.haveWebDavSupport()) {
- return this.getURLforPath(bgndPath);
+ if (this.isSignedURL(bgndPath)) {
+ return Promise.resolve(bgndPath);
+ }
+
+ return this.getURLforPathInt(bgndPath);
}
- return this.normalizeUrl(bgndPath) + (dt ? '?' + dt : '');
+
+ const normalizedUrl = this.normalizeUrl(bgndPath) + (dt ? '?' + dt : '');
+ return Promise.resolve(normalizedUrl);
};
listDirectoryPromise = (
@@ -331,7 +352,10 @@ export class CommonLocation implements TS.Location {
return Promise.reject(new Error('checkDirExist: not implemented'));
};
- getURLforPath = (path: string, expirationInSeconds: number = 900): string => {
+ getURLforPathInt = async (
+ path: string,
+ expirationInSeconds: number = 900,
+ ): Promise<string> => {
const currentTime = new Date().getTime();
// Check if URL is cached and not expired
@@ -342,11 +366,12 @@ export class CommonLocation implements TS.Location {
return this.urlCache[path].url;
} else {
// Generate new URL and cache it with expiration time
- return this.generateURLforPath(path, expirationInSeconds);
+ const url = await this.generateURLforPath(path, expirationInSeconds);
+ return url;
}
};
- generateURLforPath = (path, expirationInSeconds) => {
+ generateURLforPath = async (path, expirationInSeconds) => {
let url;
if (this.ioAPI) {
if (this.haveObjectStoreSupport()) {
@@ -355,7 +380,7 @@ export class CommonLocation implements TS.Location {
bucketName: this.bucketName,
location: this,
};
- url = this.ioAPI.getURLforPath(param, expirationInSeconds);
+ url = await this.ioAPI.getURLforPath(param, expirationInSeconds);
} else if (this.haveWebDavSupport()) {
url = this.ioAPI.getURLforPath(path);
}
diff --git a/src/renderer/utils/dom.ts b/src/renderer/utils/dom.ts
index b5c827f95..992c18e2a 100644
--- a/src/renderer/utils/dom.ts
+++ b/src/renderer/utils/dom.ts
@@ -36,7 +36,8 @@ export function clearURLParam(paramName) {
}
export function updateHistory(
- newLocation: CommonLocation,
+ locationUUID: string,
+ locationPath: string,
newDirectoryPath: string,
newEntryPath?: string,
) {
@@ -50,19 +51,14 @@ export function updateHistory(
let diffFolderPath = false;
let diffEntryPath = false;
- if (newLocation) {
+ if (locationUUID) {
let urlParams = '?';
- if (newLocation && newLocation.uuid) {
- const newEncLocationID = encodeURIComponent(newLocation.uuid);
- urlParams += 'tslid=' + newEncLocationID;
- diffLocation = newLocation.uuid !== currentLocationID;
- }
+ const newEncLocationID = encodeURIComponent(locationUUID);
+ urlParams += 'tslid=' + newEncLocationID;
+ diffLocation = locationUUID !== currentLocationID;
if (newDirectoryPath && newDirectoryPath.length > 0) {
- const newRelDir = getRelativeEntryPath(
- newLocation.path,
- newDirectoryPath,
- );
+ const newRelDir = getRelativeEntryPath(locationPath, newDirectoryPath);
if (newRelDir) {
const newEncRelDir = encodeURIComponent(newRelDir);
urlParams += '&tsdpath=' + newEncRelDir;
@@ -71,7 +67,7 @@ export function updateHistory(
}
if (newEntryPath && newEntryPath.length > 0) {
- const entryRelPath = getRelativeEntryPath(newLocation.path, newEntryPath);
+ const entryRelPath = getRelativeEntryPath(locationPath, newEntryPath);
if (entryRelPath) {
const newEncEntryPath = encodeURIComponent(entryRelPath);
urlParams += '&tsepath=' + newEncEntryPath;
diff --git a/tests/e2e/file.properties.helpers.js b/tests/e2e/file.properties.helpers.js
index be3c86304..84b6a397f 100644
--- a/tests/e2e/file.properties.helpers.js
+++ b/tests/e2e/file.properties.helpers.js
@@ -1,9 +1,12 @@
/* Copyright (c) 2020-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */
import { expect } from '@playwright/test';
import {
+ clickOn,
expectElementExist,
getElementText,
+ isDisplayed,
removeTagFromTagMenu,
+ selectorFile,
setInputKeys,
} from './general.helpers';
@@ -38,7 +41,7 @@ export async function AddRemovePropertiesTags(
const tagName = tagNames[i];
const propsTags = await getPropertiesTags();
expect(propsTags.includes(tagName)).toBe(false);
- await setInputKeys('PropertiesTagsSelectTID', tagName);
+ await setInputKeys('PropertiesTagsSelectTID', tagName, 20);
//await setInputValue('[data-tid=PropertiesTagsSelectTID] input', tagName);
// await clickOn('[data-tid=PropertiesTagsSelectTID]');
await global.client.keyboard.press('Enter');
@@ -84,10 +87,11 @@ export async function AddRemovePropertiesTags(
export async function getPropertiesFileName() {
let fileName;
-
- fileName = await global.client.inputValue(
- '[data-tid=fileNameProperties] input',
- ); // https://github.com/microsoft/playwright/issues/3265
+ const selectorFileProps = '[data-tid=fileNameProperties] input';
+ if (await isDisplayed(selectorFileProps, false, 3000)) {
+ await clickOn('[data-tid=detailsTabTID]');
+ }
+ fileName = await global.client.inputValue(selectorFileProps); // https://github.com/microsoft/playwright/issues/3265
/*.getAttribute(
'[data-tid=fileNameProperties] input',
'value'
diff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.js
index fe8b2e155..705acfb6a 100644
--- a/tests/e2e/fileopener.pw.e2e.js
+++ b/tests/e2e/fileopener.pw.e2e.js
@@ -1,9 +1,11 @@
-import { expect, test } from '@playwright/test';
+// import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
createPwMinioLocation,
createPwLocation,
defaultLocationName,
defaultLocationPath,
+ createS3Location,
} from './location.helpers';
import {
checkSettings,
@@ -15,6 +17,7 @@ import {
getGridFileName,
getGridFileSelector,
getRevision,
+ openFolder,
selectorFile,
selectorFolder,
setInputKeys,
@@ -31,42 +34,54 @@ import {
} from './file.properties.helpers';
import { openContextEntryMenu } from './test-utils';
import { createFile, startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { dataTidFormat } from '../../src/renderer/services/test';
+import { stopServices } from '../setup-functions';
-/*test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- // await clearDataStorage();
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
});
test.afterAll(async () => {
- await stopApp();
- // await testDataRefresh();
-});*/
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
+ await testDataRefresh(s3ServerInstance);
await clearDataStorage();
await stopApp();
- await testDataRefresh();
});
test.beforeEach(async () => {
- await startTestingApp('extconfig.js');
+ await startTestingApp(
+ global.isMinio || global.isS3 ? undefined : 'extconfig.js',
+ );
if (global.isMinio) {
+ await closeWelcomePlaywright();
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await closeWelcomePlaywright();
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
test.describe('TST08 - File folder properties', () => {
- test('TST0801 - Arrow keys select next prev file (keybindings) [web,electron]', async () => {
+ test('TST0801 - Arrow keys select next prev file (keybindings) [web,s3,electron]', async () => {
// open fileProperties
await clickOn(selectorFile);
//Toggle Properties
@@ -177,10 +192,10 @@ test.describe('TST08 - File folder properties', () => {
const propsNewFileName = await getPropertiesFileName();
expect(propsNewFileName).toBe(newTitle);
- const arrayMeta =
- global.isWeb || global.isMinio
+ const arrayMeta = [propsNewFileName + '.json'];
+ /*global.isWeb || global.isMinio
? [propsNewFileName + '.json'] // check meta file renamed, thumbnails are not created on web or minio
- : [propsNewFileName + '.json', propsNewFileName + '.jpg']; // check meta and thumbnail renamed
+ : [propsNewFileName + '.json', propsNewFileName + '.jpg'];*/ // check meta and thumbnail renamed
await expectMetaFilesExist(arrayMeta);
await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);
@@ -326,12 +341,9 @@ test.describe('TST08 - File folder properties', () => {
stroke="#bbbbbb22"
><path d="M6 2 L6 30 26 30 26 10 18 2 Z M18 2 L18 10 26 10" />
</svg>`;
+ await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);
await createFile(fileName, svg);
- await openContextEntryMenu(
- getGridFileSelector('empty_folder'),
- 'showProperties',
- );
- await global.client.dblclick(getGridFileSelector('empty_folder'));
+ await openFolder('empty_folder');
await expectElementExist(getGridFileSelector(fileName));
//await clickOn(getGridFileSelector(fileName));
await openContextEntryMenu(
@@ -339,18 +351,15 @@ test.describe('TST08 - File folder properties', () => {
'showPropertiesTID', //'fileMenuOpenFile'
);
- //Toggle Properties
- //await clickOn('[data-tid=fileContainerToggleProperties]');
// add meta json to file
- await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);
await AddRemovePropertiesTags(['test-tag1', 'test-tag2'], {
add: true,
remove: false,
});
- const arrayMeta =
- global.isWeb || global.isMinio
+ const arrayMeta = [fileName + '.json'];
+ /*global.isWeb || global.isMinio || global.isS3
? [fileName + '.json'] // check meta, thumbnails are not created on web or minio
- : [fileName + '.json', fileName + '.jpg']; // check meta and thumbnail
+ : [fileName + '.json', fileName + '.jpg'];*/ // check meta and thumbnail
await expectMetaFilesExist(arrayMeta, true);
diff --git a/tests/e2e/fixtures.js b/tests/e2e/fixtures.js
new file mode 100644
index 000000000..1444ea649
--- /dev/null
+++ b/tests/e2e/fixtures.js
@@ -0,0 +1,44 @@
+import { test as base, expect } from '@playwright/test';
+import { runS3Server, startMinio, startWebServer } from '../setup-functions';
+import { uploadTestDirectory } from '../s3rver/S3DataRefresh';
+import { removeExtConfig } from './hook';
+
+// Extend base test with a fixture for the S3 server
+const test = base.extend({
+ webServer: async ({}, use) => {
+ if (global.isWeb) {
+ await removeExtConfig();
+ const webserver = await startWebServer();
+ await use(webserver);
+ } else {
+ // If the test does not require the S3 server, just use a dummy value
+ await use(null);
+ }
+ },
+ s3Server: async ({}, use, testInfo) => {
+ if (global.isS3) {
+ //testInfo.title.includes('web')) {
+ const s3Server = await runS3Server();
+ await uploadTestDirectory();
+ await use(s3Server);
+ //await s3Server.close();
+ } else {
+ // If the test does not require the S3 server, just use a dummy value
+ await use(null);
+ }
+ },
+ minioServer: async ({}, use, testInfo) => {
+ if (global.isMinio) {
+ const minioProcess = await startMinio();
+ await use(minioProcess);
+ } else {
+ // If the test does not require the S3 server, just use a dummy value
+ await use(null);
+ }
+ },
+});
+
+module.exports = {
+ test,
+ expect,
+};
diff --git a/tests/e2e/folder.pw.e2e.js b/tests/e2e/folder.pw.e2e.js
index af04ecfd0..c90564ce3 100644
--- a/tests/e2e/folder.pw.e2e.js
+++ b/tests/e2e/folder.pw.e2e.js
@@ -1,12 +1,13 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
reloadDirectory,
@@ -22,38 +23,57 @@ import {
waitForNotification,
expectAllFileSelected,
selectAllFiles,
+ openFolder,
} from './general.helpers';
import { openContextEntryMenu, renameFolder } from './test-utils';
import { createFile, startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { emptyFolderName } from './search.helpers';
import { AddRemovePropertiesTags } from './file.properties.helpers';
import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
+import { stopServices } from '../setup-functions';
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- // await clearDataStorage();
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
+ await closeWelcomePlaywright();
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
@@ -88,7 +108,7 @@ test.describe('TST01 - Folder management', () => {
test('TST0103 - Rename folder [web,electron]', async () => {
const testFolder = await createNewDirectory();
- await global.client.dblclick('[data-tid=fsEntryName_' + testFolder + ']');
+ await openFolder(testFolder);
const newDirectoryName = await renameFolder();
await clickOn('[data-tid=gridPerspectiveOnBackButton]');
await expectElementExist(
@@ -97,9 +117,7 @@ test.describe('TST01 - Folder management', () => {
5000,
);
// cleanup
- await global.client.dblclick(
- '[data-tid=fsEntryName_' + newDirectoryName + ']',
- );
+ await openFolder(newDirectoryName);
await deleteDirectory();
await expectElementExist(
'[data-tid=fsEntryName_' + newDirectoryName + ']',
@@ -163,14 +181,10 @@ test.describe('TST01 - Folder management', () => {
await clickOn('[data-tid=confirmMoveFiles]');
await clickOn('[data-tid=uploadCloseAndClearTID]');
await clickOn('[data-tid=location_' + defaultLocationName + ']');
- await expectElementExist(
- '[data-tid=fsEntryName_empty_folder]',
- false,
- 5000,
- );
+ await expectElementExist(getGridFileSelector('empty_folder'), false, 5000);
await global.client.dblclick('[data-tid=fsEntryName_' + folderToMove + ']');
await expectElementExist('[data-tid=fsEntryName_empty_folder]', true, 5000);
- await testDataRefresh();
+ await testDataRefresh(s3ServerInstance);
});
test('TST0109 - Copy folder [web,electron]', async () => {
@@ -187,10 +201,10 @@ test.describe('TST01 - Folder management', () => {
await clickOn('[data-tid=confirmCopyFiles]');
await clickOn('[data-tid=uploadCloseAndClearTID]');
await clickOn('[data-tid=location_' + defaultLocationName + ']');
- await expectElementExist('[data-tid=fsEntryName_empty_folder]', true, 5000);
- await global.client.dblclick('[data-tid=fsEntryName_' + folderToCopy + ']');
- await expectElementExist('[data-tid=fsEntryName_empty_folder]', true, 5000);
- await testDataRefresh();
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 5000);
+ await global.client.dblclick(getGridFileSelector(folderToCopy));
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 5000);
+ await testDataRefresh(s3ServerInstance);
});
test('TST0110 - Tag folder [web,electron]', async () => {
diff --git a/tests/e2e/folderprops.pw.e2e.js b/tests/e2e/folderprops.pw.e2e.js
index aaa5ab104..577f9a1ac 100644
--- a/tests/e2e/folderprops.pw.e2e.js
+++ b/tests/e2e/folderprops.pw.e2e.js
@@ -1,12 +1,13 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
@@ -18,40 +19,60 @@ import {
dnd,
setInputKeys,
getElementScreenshot,
+ checkSettings,
+ openFolder,
+ waitUntilChanged,
} from './general.helpers';
import { openContextEntryMenu } from './test-utils';
import { createFile, startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import {
AddRemovePropertiesTags,
getPropertiesFileName,
getPropertiesTags,
} from './file.properties.helpers';
-
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
+import { stopServices } from '../setup-functions';
+
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
// await clearDataStorage();
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
await openContextEntryMenu(
'[data-tid=fsEntryName_empty_folder]',
@@ -120,7 +141,7 @@ test.describe('TST02 - Folder properties', () => {
await clickOn('[data-tid=confirmSaveBeforeCloseDialog]');
await expectElementExist('OpenedTIDempty_folder', false, 5000);
await expectElementExist(getGridFileSelector('empty_folder'), false, 5000);
- await testDataRefresh();
+ await testDataRefresh(s3ServerInstance);
});
test('TST0206 - Rename folder [web,electron]', async () => {
@@ -136,7 +157,7 @@ test.describe('TST02 - Folder properties', () => {
);
const propsNewFolderName = await getPropertiesFileName();
expect(propsFolderName).not.toBe(propsNewFolderName);
- await testDataRefresh();
+ await testDataRefresh(s3ServerInstance);
//turn folderName back
/*await clickOn('[data-tid=fileNameProperties] input');
@@ -153,18 +174,19 @@ test.describe('TST02 - Folder properties', () => {
});
test('TST0207 - Move folder [web,electron]', async () => {
- const newFolder = await createNewDirectory('targetFolder');
+ const targetFolder = 'empty_folder';
+ const newFolder = await createNewDirectory('srcFolder');
// select folder to move
- await clickOn(getGridFileSelector('empty_folder'));
+ //await clickOn(getGridFileSelector('empty_folder'));
await clickOn('[data-tid=gridPerspectiveCopySelectedFiles]'); //todo moveCopyEntryTID
- await clickOn('[data-tid=MoveTarget' + newFolder + ']');
- await clickOn('[data-tid=MoveTarget' + newFolder + ']'); // todo double clickOn
+ await clickOn('[data-tid=MoveTarget' + targetFolder + ']');
+ //await clickOn('[data-tid=MoveTarget' + targetFolder + ']');
await clickOn('[data-tid=confirmMoveFiles]');
await clickOn('[data-tid=uploadCloseAndClearTID]');
- await expectElementExist(getGridFileSelector('empty_folder'), false, 5000);
- await global.client.dblclick('[data-tid=fsEntryName_' + newFolder + ']');
- await expectElementExist(getGridFileSelector('empty_folder'), true, 5000);
- await testDataRefresh();
+ await expectElementExist(getGridFileSelector(newFolder), false, 5000);
+ await global.client.dblclick('[data-tid=fsEntryName_' + targetFolder + ']');
+ await expectElementExist(getGridFileSelector(newFolder), true, 5000);
+ //await testDataRefresh(s3ServerInstance);
});
test('TST0210 - Add and remove tag to folder with dropdown menu [web,electron]', async () => {
@@ -291,16 +313,20 @@ test.describe('TST02 - Folder properties', () => {
getGridFileSelector('empty_folder'),
'showProperties',
);
- await openContextEntryMenu(
- getGridFileSelector('empty_folder'),
- 'openDirectory',
- );
+ await openFolder('empty_folder');
+ await checkSettings('[data-tid=settingsSetShowUnixHiddenEntries]', false);
const initScreenshot = await getElementScreenshot(
'[data-tid=perspectiveGridFileTable]',
);
await clickOn('[data-tid=changeBackgroundColorTID]');
await clickOn('[data-tid=backgroundTID1]');
+ await waitUntilChanged(
+ '[data-tid=backgroundTID]',
+ 'height: 100%; background: rgba(0, 0, 0, 0.267);',
+ 'style',
+ );
+
const withBgnColorScreenshot = await getElementScreenshot(
'[data-tid=perspectiveGridFileTable]',
);
@@ -310,10 +336,19 @@ test.describe('TST02 - Folder properties', () => {
await clickOn('[data-tid=backgroundClearTID]');
await clickOn('[data-tid=confirmConfirmResetColorDialog]');
- const bgnRemovedScreenshot = await getElementScreenshot(
- '[data-tid=perspectiveGridFileTable]',
+ await waitUntilChanged(
+ '[data-tid=backgroundTID]',
+ 'height: 100%; background: transparent;',
+ 'style',
);
- expect(initScreenshot).toBe(bgnRemovedScreenshot);
+
+ if (!global.isWeb) {
+ //todo screenshots are diff in web
+ const bgnRemovedScreenshot = await getElementScreenshot(
+ '[data-tid=perspectiveGridFileTable]',
+ );
+ expect(initScreenshot).toBe(bgnRemovedScreenshot);
+ }
});
test('TST0219 - Set and remove predefined folder thumbnail [web,electron,_pro]', async () => {
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index a71215188..a6d9ccb26 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -2,7 +2,7 @@
import path from 'path';
import { expect } from '@playwright/test';
import { delay } from './hook';
-import { firstFile, toContainTID } from './test-utils';
+import { firstFile, openContextEntryMenu, toContainTID } from './test-utils';
import AppConfig from '../../src/renderer/AppConfig';
import { dataTidFormat } from '../../src/renderer/services/test';
@@ -78,27 +78,29 @@ export async function rightClickOn(selector) {
/**
*
* @param selector
- * @param className
+ * @param propValue
+ * @param attribute
+ * @param timeout
* @returns {Promise<void>} newClassName
*/
-export async function waitUntilClassChanged(selector, className) {
- const element = await global.client.$(selector);
- await element.waitUntil(
- async function () {
- const newClassName = await this.getAttribute('class');
- return newClassName !== className;
- },
- {
- timeout: 5000,
- timeoutMsg:
- 'waitUntilClassChanged selector ' +
- selector +
- ' className:' +
- className +
- ' to changed after 5s',
- },
- );
- return await element.getAttribute('class');
+export async function waitUntilChanged(
+ selector,
+ propValue,
+ attribute = 'class',
+ timeout = 5000,
+) {
+ const element = global.client.locator(selector);
+ await expect
+ .poll(
+ async () => {
+ const value = await element.getAttribute(attribute);
+ return value;
+ },
+ { timeout },
+ )
+ .not.toBe(propValue);
+
+ return await element.getAttribute(attribute);
}
export async function setInputValue(selector, value) {
@@ -354,8 +356,8 @@ export async function expectAudioPlay() {
await expect
.poll(
async () => {
- if (!global.isWin) {
- //todo remove this - currently video do not start playing on mac
+ if (!global.isWin || global.isWeb) {
+ //todo remove this - currently video do not start playing on mac and web
return true;
}
const fLocator = await frameLocator();
@@ -801,6 +803,26 @@ export async function waitForNotification(
} */
}
+export async function openFolder(folderName) {
+ await openContextEntryMenu(getGridFileSelector(folderName), 'openDirectory');
+ await expectElementExist(
+ '[data-tid=currentDir_' + dataTidFormat(folderName) + ']',
+ true,
+ 8000,
+ );
+}
+
+export async function openFile(fileName) {
+ await openContextEntryMenu(
+ getGridFileSelector(fileName), // perspectiveGridTable + firstFile,
+ 'fileMenuOpenFile',
+ );
+ await expectElementExist(
+ '[data-tid=OpenedTID' + dataTidFormat(fileName) + ']',
+ true,
+ 8000,
+ );
+}
/**
* for check settings use checkSettings instead
* @param selector
@@ -901,7 +923,8 @@ export async function createNewDirectory(dirName = testFolder) {
// set new dir name
await setInputKeys('directoryName', dirName);
await clickOn('[data-tid=confirmCreateNewDirectory]');
- await waitForNotification();
+ await expectElementExist(getGridFileSelector(dirName), true, 5000);
+ // await waitForNotification();
return dirName;
}
diff --git a/tests/e2e/general.pw.e2e.js b/tests/e2e/general.pw.e2e.js
index 81b9037e9..5ffcf9ca5 100644
--- a/tests/e2e/general.pw.e2e.js
+++ b/tests/e2e/general.pw.e2e.js
@@ -1,13 +1,14 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import AppConfig from '../../src/renderer/AppConfig';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
createNewDirectory,
@@ -18,15 +19,16 @@ import {
clickOn,
expectElementExist,
selectorFile,
- takeScreenshot,
createTxtFile,
expectMetaFilesExist,
getGridFileSelector,
isDisplayed,
+ openFolder,
} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
+import { stopServices } from '../setup-functions';
export const firstFile = '/span';
export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';
@@ -36,20 +38,32 @@ const subFolderContentExtractionPath =
const subFolderThumbnailsPath = defaultLocationPath + '/thumbnails';
const testFolder = 'testFolder';
-test.beforeAll(async () => {
- await startTestingApp(global.isMinio ? undefined : 'extconfig.js');
- // await clearDataStorage();
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ //await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
@@ -57,10 +71,14 @@ test.beforeEach(async () => {
if (global.isMinio) {
await closeWelcomePlaywright();
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await closeWelcomePlaywright();
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
@@ -72,9 +90,9 @@ test.describe('TST51 - Perspective Grid', () => {
await expectElementExist(
'[data-tid=fsEntryName_' + testFolder + ']',
true,
- 2000,
+ 4000,
);
- await global.client.dblclick('[data-tid=fsEntryName_' + testFolder + ']');
+ await openFolder(testFolder);
// create new file
await newHTMLFile();
await closeOpenedFile();
@@ -144,7 +162,7 @@ test.describe('TST51 - Perspective Grid', () => {
test('TST0510 - Generate thumbnail from Images [electron,minio]', async () => {
const filtered = ['ico', 'tiff', 'tif'];
- if (global.isMinio) {
+ if (global.isMinio || global.isS3) {
filtered.push('svg');
}
const metaFiles = AppConfig.ThumbGenSupportedFileTypes.image
diff --git a/tests/e2e/hook.js b/tests/e2e/hook.js
index 6902b4a08..963d7e4a7 100644
--- a/tests/e2e/hook.js
+++ b/tests/e2e/hook.js
@@ -1,7 +1,7 @@
/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */
import pathLib from 'path';
import fse from 'fs-extra';
-// import { execSync } from 'child_process';
+import { uploadFile } from '../s3rver/S3DataRefresh';
// Spectron API https://github.com/electron/spectron
// Webdriver.io http://webdriver.io/api.html
@@ -72,7 +72,13 @@ export async function clearLocalStorage() {
export async function copyExtConfig(extconfig = 'extconfig-with-welcome.js') {
let srcDir;
if (global.isWeb) {
- srcDir = pathLib.join(__dirname, '..', '..', 'scripts', 'web' + extconfig);
+ srcDir = pathLib.join(
+ __dirname,
+ '..',
+ '..',
+ 'scripts',
+ 'web' + (global.isS3 ? 's3' : '') + extconfig,
+ );
if (!fse.existsSync(srcDir)) {
srcDir = pathLib.join(__dirname, '..', '..', 'scripts', extconfig);
@@ -91,15 +97,17 @@ export async function copyExtConfig(extconfig = 'extconfig-with-welcome.js') {
}
export async function removeExtConfig() {
- await fse.remove(
- pathLib.join(
- __dirname,
- '..',
- '..',
- global.isWeb ? 'web' : 'release/app/dist/renderer',
- 'extconfig.js',
- ),
- );
+ if (!global.isWeb) {
+ await fse.remove(
+ pathLib.join(
+ __dirname,
+ '..',
+ '..',
+ global.isWeb ? 'web' : 'release/app/dist/renderer',
+ 'extconfig.js',
+ ),
+ );
+ }
}
export async function startTestingApp(extconfig) {
@@ -194,19 +202,37 @@ export async function stopApp() {
}
}
-export async function testDataRefresh() {
- const src = pathLib.join(
- __dirname,
- '..',
- 'testdata',
- 'file-structure',
- 'supported-filestypes',
- );
- const dst = pathLib.join(__dirname, '..', 'testdata-tmp', 'file-structure');
+export async function testDataRefresh(s3ServerInstance) {
+ if (global.isS3) {
+ /*if(s3ServerInstance) {
+ s3ServerInstance.reset();
+ await uploadTestDirectory();
+ }*/
+ } else {
+ await deleteTestData();
+ const src = pathLib.join(
+ __dirname,
+ '..',
+ 'testdata',
+ 'file-structure',
+ 'supported-filestypes',
+ );
+ const dst = pathLib.join(__dirname, '..', 'testdata-tmp', 'file-structure');
+ let newPath = pathLib.join(dst, pathLib.basename(src));
+ await fse.copy(src, newPath); //, { overwrite: true });
+ }
+}
- let newPath = pathLib.join(dst, pathLib.basename(src));
- await fse.emptyDir(newPath);
- await fse.copy(src, newPath); //, { overwrite: true });
+export async function deleteTestData() {
+ await fse.emptyDir(
+ pathLib.join(
+ __dirname,
+ '..',
+ 'testdata-tmp',
+ 'file-structure',
+ 'supported-filestypes',
+ ),
+ );
}
export async function createFile(
@@ -223,16 +249,19 @@ export async function createFile(
rootFolder,
fileName,
);
-
- try {
- if (fileContent) {
- await fse.outputFile(filePath, fileContent);
- } else {
- await fse.createFile(filePath);
- console.log('Empty file created!');
+ if (global.isS3) {
+ await uploadFile(filePath, fileContent || 'test content');
+ } else {
+ try {
+ if (fileContent) {
+ await fse.outputFile(filePath, fileContent);
+ } else {
+ await fse.createFile(filePath);
+ console.log('Empty file created!');
+ }
+ } catch (err) {
+ console.error(err);
}
- } catch (err) {
- console.error(err);
}
}
diff --git a/tests/e2e/key-bindings.pw.e2e.js b/tests/e2e/key-bindings.pw.e2e.js
index 43feb3151..e80a44c1e 100644
--- a/tests/e2e/key-bindings.pw.e2e.js
+++ b/tests/e2e/key-bindings.pw.e2e.js
@@ -1,32 +1,48 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { extractFileNameWithoutExt } from '@tagspaces/tagspaces-common/paths';
+import { test, expect } from './fixtures';
import { defaultLocationName } from './location.helpers';
import {
clickOn,
expectElementExist,
+ getGridFileSelector,
selectorFile,
- setInputValue,
- takeScreenshot,
+ setInputKeys,
} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
-
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- // await clearDataStorage();
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
+import { stopServices } from '../setup-functions';
+
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+const testFileName = 'sample.pdf';
+const isMac = /^darwin/.test(process.platform);
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
@@ -37,13 +53,13 @@ test.beforeEach(async () => {
// await createPwLocation(defaultLocationPath, defaultLocationName, true);
// }
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
test.describe('TST13 - Settings Key Bindings [electron]', () => {
test('TST1311 - Test show search [electron]', async () => {
- const isMac = /^darwin/.test(process.platform);
await clickOn(selectorFile);
if (isMac) {
await global.client.keyboard.press('Meta+KeyK');
@@ -54,28 +70,41 @@ test.describe('TST13 - Settings Key Bindings [electron]', () => {
});
test('TST1312 - Test rename file [electron]', async () => {
- const newTitle = 'renamed.txt';
- await clickOn(selectorFile);
+ const newTitle = 'renamed';
+ await clickOn(getGridFileSelector(testFileName));
+ await global.client.keyboard.press('F2');
+ //await setInputValue('[data-tid=renameEntryDialogInput] input', newTitle);
+ const oldName = await setInputKeys('renameEntryDialogInput', newTitle);
+ await clickOn('[data-tid=confirmRenameEntry]');
+ //await expectElementExist('[data-tid=detailsTabTID]', true);
+ await expectElementExist(getGridFileSelector(newTitle + '.pdf'));
+ //rename back
+ const name = extractFileNameWithoutExt(oldName, '/');
await global.client.keyboard.press('F2');
- await setInputValue('[data-tid=renameEntryDialogInput] input', newTitle);
- await clickOn('[data-tid=closeRenameEntryDialog]');
+ await setInputKeys('renameEntryDialogInput', name);
+ await clickOn('[data-tid=confirmRenameEntry]');
+ await expectElementExist(getGridFileSelector(oldName));
});
test('TST1313 - Test open file [electron]', async () => {
- await clickOn(selectorFile);
+ await clickOn(getGridFileSelector(testFileName));
await global.client.keyboard.press('Enter');
await expectElementExist('[data-tid=detailsTabTID]', true);
});
test('TST1315 - Test delete file [electron]', async () => {
- await clickOn(selectorFile);
- await global.client.keyboard.press('Delete');
+ await clickOn(getGridFileSelector(testFileName));
+ if (isMac) {
+ await global.client.keyboard.press('F8');
+ } else {
+ await global.client.keyboard.press('Delete');
+ }
await clickOn('[data-tid=confirmDeleteFileDialog]');
- // await expectElementExist('[data-tid=confirmDeleteFileDialog]', true);
+ await expectElementExist(getGridFileSelector(testFileName), false);
});
test('TST1316 - Show help and feedback panel in the left [electron]', async () => {
- await clickOn(selectorFile);
+ await clickOn(getGridFileSelector('sample.txt'));
await global.client.keyboard.press('F1');
await expectElementExist('[data-tid=aboutDialog]', true);
});
diff --git a/tests/e2e/location.helpers.js b/tests/e2e/location.helpers.js
index 42aa505bf..a933ae40e 100644
--- a/tests/e2e/location.helpers.js
+++ b/tests/e2e/location.helpers.js
@@ -70,6 +70,39 @@ export async function createPwMinioLocation(
}
}
+export async function createS3Location(
+ locationPath,
+ locationName,
+ isDefault = false,
+) {
+ const lastLocationTID = await getPwLocationTid(-1);
+ // Check if location not exist (from extconfig.js)
+ if (locationName !== lastLocationTID) {
+ await clickOn('[data-tid=locationManagerMenu]');
+ await clickOn('[data-tid=locationManagerMenuCreateLocation]');
+ await clickOn('[data-tid=locationTypeTID]');
+ await clickOn('[data-tid=cloudLocationTID]');
+
+ await setInputKeys(
+ 'locationName',
+ locationName || 'Test Location' + new Date().getTime(),
+ 20,
+ );
+ await setInputKeys('locationPath', locationPath, 20);
+ await setInputKeys('accessKeyId', 'S3RVER', 20);
+ await setInputKeys('secretAccessKey', 'S3RVER', 20);
+ await setInputKeys('bucketName', 'supported-filestypes', 20);
+ await setInputKeys('endpointURL', 'http://localhost:4569', 20);
+ //await setInputKeys('regionTID', 'eu-central-1', 20);
+
+ if (isDefault) {
+ await clickOn('[data-tid=switchAdvancedModeTID]');
+ await global.client.check('[data-tid=locationIsDefault] input');
+ }
+ await clickOn('[data-tid=confirmLocationCreation]');
+ }
+}
+
export async function createPwLocation(
locationPath,
locationName,
diff --git a/tests/e2e/location.pw.e2e.js b/tests/e2e/location.pw.e2e.js
index 08e65c3eb..250cc52fc 100644
--- a/tests/e2e/location.pw.e2e.js
+++ b/tests/e2e/location.pw.e2e.js
@@ -1,5 +1,5 @@
/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
openLocationMenu,
@@ -7,6 +7,8 @@ import {
getPwLocationTid,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
+ defaultLocationName,
} from './location.helpers';
import {
clickOn,
@@ -16,33 +18,42 @@ import {
} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
import { clearDataStorage } from './welcome.helpers';
+import { stopServices } from '../setup-functions';
export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';
export const newLocationName = 'Location_Name_Changed';
let testLocationName;
-test.beforeAll(async () => {
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
await startTestingApp('extconfig-without-locations.js');
//await clearDataStorage();
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
test.beforeEach(async () => {
testLocationName = '' + new Date().getTime();
- if (global.isMinio) {
+ if (global.isMinio || global.isS3) {
await createPwMinioLocation('', testLocationName, true);
} else {
await createPwLocation(defaultLocationPath, testLocationName, true);
@@ -54,11 +65,6 @@ test.beforeEach(async () => {
test.describe('TST03 - Testing locations:', () => {
test('TST0301 - Should create a location [web,electron]', async () => {
- // const allLocations = await global.client.$$('[data-tid=locationTitleElement]');
- // expect(allLocations.length).toBeGreaterThan(0);
- // const lastLocation = allLocations[allLocations.length - 1];
- // const lastLocationNameInDom = (await global.client.elementIdText(lastLocation.ELEMENT)).value;
- // const addedLocation = await global.client.getText('//button[contains(., "' + testTagName + '")]');
await expectElementExist(
'[data-tid=location_' + testLocationName + ']',
true,
@@ -67,12 +73,11 @@ test.describe('TST03 - Testing locations:', () => {
});
test('TST0302 - Should remove a location [web,electron]', async () => {
- // await global.client.waitForVisible('[data-tid=locationList]');
- // const allLocations = await global.client.$$('[data-tid=locationList]');
- // await delay(500);
- // expect(allLocations.length).toBeGreaterThan(0);
- // const lastLocation = allLocations[allLocations.length - 1];
- // await global.client.elementIdClick(lastLocation.ELEMENT);
+ await expectElementExist(
+ '[data-tid=location_' + testLocationName + ']',
+ true,
+ 4500,
+ );
await openLocationMenu(testLocationName);
await clickOn('[data-tid=removeLocation]');
await clickOn('[data-tid=confirmDeleteLocationDialog]');
@@ -90,13 +95,6 @@ test.describe('TST03 - Testing locations:', () => {
await global.client.dblclick('[data-tid=locationName] input');
await setInputKeys('locationName', newLocationName);
await clickOn('[data-tid=confirmLocationCreation]');
- /*await delay(500);
- await global.client.$('[data-tid=locationList]');
- const allLocationsList = await global.client.getText(
- '[data-tid=locationList]'
- );*/
- //await delay(500);
- //expect(allLocationsList.indexOf(newLocationName) >= 0).toBe(true);
await expectElementExist(
'[data-tid=location_' + newLocationName + ']',
@@ -126,11 +124,12 @@ test.describe('TST03 - Testing locations:', () => {
test('TST0307 - Move location Up and Down [web,electron]', async () => {
if (global.isWeb) {
- /*await takeScreenshot(
- 'TST0307 Move location Up and Down before create dummyLocation'
- );*/
// in web there is no other locations
- await createPwMinioLocation('', 'dummyLocation', false);
+ if (global.isMinio) {
+ await createPwMinioLocation('', 'dummyLocation', false);
+ } else if (global.isS3) {
+ await createS3Location('empty_folder');
+ }
}
await openLocationMenu(testLocationName);
await clickOn('[data-tid=moveLocationUp]');
diff --git a/tests/e2e/markdown-editor.pw.e2e.js b/tests/e2e/markdown-editor.pw.e2e.js
index 2646f2271..c8277f2e8 100644
--- a/tests/e2e/markdown-editor.pw.e2e.js
+++ b/tests/e2e/markdown-editor.pw.e2e.js
@@ -1,15 +1,17 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { test, expect } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
+ expectElementExist,
frameLocator,
getGridFileSelector,
isDisplayed,
@@ -18,21 +20,30 @@ import {
import { startTestingApp, stopApp, testDataRefresh } from './hook';
import { openContextEntryMenu, toContainTID } from './test-utils';
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
+import { stopServices } from '../setup-functions';
-test.beforeAll(async () => {
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
await startTestingApp();
// await clearDataStorage();
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
@@ -40,10 +51,13 @@ test.beforeEach(async () => {
await closeWelcomePlaywright();
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
diff --git a/tests/e2e/objectstore.pw.e2e.js b/tests/e2e/objectstore.pw.e2e.js
index 74cba4187..9f7515062 100644
--- a/tests/e2e/objectstore.pw.e2e.js
+++ b/tests/e2e/objectstore.pw.e2e.js
@@ -1,12 +1,13 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
@@ -18,33 +19,49 @@ import {
takeScreenshot,
} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
-import { createSavedSearch, searchEngine } from './search.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../src/renderer/services/test';
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
-import { startMinio } from '../setup-functions';
+import { stopServices } from '../setup-functions';
-test.beforeAll(async () => {
- await startTestingApp('extconfig-objectstore-location.js');
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig-objectstore-location.js');
+ }
//await clearDataStorage();
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
test.beforeEach(async () => {
- await closeWelcomePlaywright();
- await clickOn('[data-tid=locationManager]');
- await clickOn('[data-tid=location_' + defaultLocationName + '-s3]');
+ if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
+ } else {
+ await closeWelcomePlaywright();
+ await clickOn('[data-tid=locationManager]');
+ await clickOn('[data-tid=location_' + defaultLocationName + '-s3]');
+ }
});
test.describe('TST09 - ObjectStore location', () => {
diff --git a/tests/e2e/perspective-gallery.pw.e2e.js b/tests/e2e/perspective-gallery.pw.e2e.js
index cb34fc648..8219722a4 100644
--- a/tests/e2e/perspective-gallery.pw.e2e.js
+++ b/tests/e2e/perspective-gallery.pw.e2e.js
@@ -1,12 +1,13 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
@@ -16,34 +17,50 @@ import {
takeScreenshot,
} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../src/renderer/services/test';
+import { stopServices } from '../setup-functions';
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- //await clearDataStorage();
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
await stopApp();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
+ await testDataRefresh(s3ServerInstance);
await clearDataStorage();
- await testDataRefresh();
});
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
await clickOn('[data-tid=openGalleryPerspective]');
});
diff --git a/tests/e2e/perspective-grid-right-button.pw.e2e.js b/tests/e2e/perspective-grid-right-button.pw.e2e.js
index ac8694314..b0e45fbb1 100644
--- a/tests/e2e/perspective-grid-right-button.pw.e2e.js
+++ b/tests/e2e/perspective-grid-right-button.pw.e2e.js
@@ -2,7 +2,7 @@
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import { generateFileName } from '@tagspaces/tagspaces-common/paths';
import {
defaultLocationPath,
@@ -11,6 +11,7 @@ import {
deleteFileFromMenu,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import AppConfig from '../../src/renderer/AppConfig';
import { searchEngine } from './search.helpers';
@@ -33,37 +34,55 @@ import {
takeScreenshot,
expectMetaFilesExist,
setSettings,
+ openFolder,
+ openFile,
} from './general.helpers';
import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
+import { stopServices } from '../setup-functions';
const testTagName = 'testTag'; // TODO fix camelCase tag name
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- // await clearDataStorage();
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
@@ -71,16 +90,11 @@ test.beforeEach(async () => {
// Scenarios for right button on a file
test.describe('TST50** - Right button on a file', () => {
test('TST5016 - Open file [web,electron]', async () => {
- // await searchEngine('txt');
- await openContextEntryMenu(
- getGridFileSelector('sample.txt'), // perspectiveGridTable + firstFile,
- 'fileMenuOpenFile',
- );
- // await takeScreenshot('fileMenuOpenFile');
+ await openFile('sample.txt');
await expect
.poll(
async () => {
- const fLocator = await frameLocator();
+ const fLocator = await frameLocator('#root iframe');
const bodyTxt = await fLocator.locator('body').innerText();
return toContainTID(bodyTxt);
},
@@ -91,30 +105,6 @@ test.describe('TST50** - Right button on a file', () => {
},
)
.toBe(true);
- // await takeScreenshot('bodyTxt_fileMenuOpenFile');
-
- /*const containTID = toContainTID(bodyTxt);
- if (!containTID) {
- console.debug('no containTID in:' + bodyTxt);
- }
- expect(containTID).toBe(true);*/
- // Check if the file is opened
- // await delay(1500);
- /*await expectElementExist('#FileViewer', true, 2000);
- const webViewer = await global.client.waitForSelector('#FileViewer');
- // await webViewer.waitForDisplayed();
- // await delay(5000);
- // expect(await webViewer.isDisplayed()).toBe(true);
- const iframe = await webViewer.contentFrame();
- // await global.client.switchToFrame(webViewer);
- // await isElementDisplayed(iframeBody,'body');
- const iframeBody = await iframe.waitForSelector('body');
- const bodyTxt = await iframeBody.innerText();
- const containTID = toContainTID(bodyTxt);
- if (!containTID) {
- console.debug('no containTID in:' + bodyTxt);
- }
- expect(containTID).toBe(true);*/
});
test('TST5017 - Rename file and check thumbnail exist [web,electron]', async () => {
@@ -195,7 +185,7 @@ test.describe('TST50** - Right button on a file', () => {
8000,
'[data-tid=perspectiveGridFileTable]',
);
- await testDataRefresh();
+ await testDataRefresh(s3ServerInstance);
// cleanup
/*await clickOn(selectorFile);
await AddRemoveTagsToSelectedFiles('grid', [testTagName + 'Edited'], false);
@@ -401,22 +391,24 @@ test.describe('TST50** - Right button on a file', () => {
test.skip('TST5029 - Add file from file manager with dnd [manual]', async () => {});
test('TST5033 - Open directory (directory menu) [web,electron]', async () => {
+ await expectElementExist(selectorFile, true, 5000);
// open empty_folder
await openContextEntryMenu(selectorFolder, 'openDirectory');
- // await global.client.screenshot({ path: 'screenshotTST5033.png' });
- await expectElementExist(selectorFile, false);
- // const firstFileName = await getGridFileName(0);
- // expect(firstFileName).toBe(undefined); //'sample.eml');
+ await expectElementExist(selectorFile, false, 5000);
});
test('TST5034 - Rename directory (directory menu) [web,electron]', async () => {
const newDirName = 'new_dir_name';
- await openContextEntryMenu(selectorFolder, 'renameDirectory');
+ const folder = getGridFileSelector('empty_folder');
+ await openContextEntryMenu(folder, 'renameDirectory');
const oldDirName = await setInputKeys('renameEntryDialogInput', newDirName);
await clickOn('[data-tid=confirmRenameEntry]');
// turn dir name back
- await openContextEntryMenu(selectorFolder, 'renameDirectory');
+ await openContextEntryMenu(
+ getGridFileSelector(newDirName),
+ 'renameDirectory',
+ );
const renamedDir = await setInputKeys('renameEntryDialogInput', oldDirName);
await clickOn('[data-tid=confirmRenameEntry]');
expect(renamedDir).toBe(newDirName);
@@ -517,6 +509,7 @@ test.describe('TST50** - Right button on a file', () => {
// '[data-tid=' + listDefaultSettings.testID + ']',
'[data-tid=listPerspectiveContainer]',
true,
+ 5000,
);
});
diff --git a/tests/e2e/perspective-grid-sort.pw.e2e.js b/tests/e2e/perspective-grid-sort.pw.e2e.js
index bbf05f322..da41a7eb7 100644
--- a/tests/e2e/perspective-grid-sort.pw.e2e.js
+++ b/tests/e2e/perspective-grid-sort.pw.e2e.js
@@ -1,42 +1,65 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
-import { clickOn, getGridFileName, takeScreenshot } from './general.helpers';
+import {
+ clickOn,
+ expectElementExist,
+ getGridFileName,
+ getGridFileSelector,
+ takeScreenshot,
+} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { closeWelcomePlaywright } from './welcome.helpers';
import { getDirEntries } from './perspective-grid.helpers';
-
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- // await clearDataStorage();
+import { stopServices } from '../setup-functions';
+
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
-test.afterEach(async ({ page }, testInfo) => {
+/*test.afterEach(async ({ page }, testInfo) => {
if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
}
-});
+});*/
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
await clickOn('[data-tid=gridPerspectiveSortMenu]');
diff --git a/tests/e2e/perspective-grid.pw.e2e.js b/tests/e2e/perspective-grid.pw.e2e.js
index ab61d83c0..c643c9b05 100644
--- a/tests/e2e/perspective-grid.pw.e2e.js
+++ b/tests/e2e/perspective-grid.pw.e2e.js
@@ -1,13 +1,14 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
deleteFileFromMenu,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
@@ -33,33 +34,51 @@ import {
getPropertiesFileName,
} from './file.properties.helpers';
import { createFile, startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
-
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- //await clearDataStorage();
+import { stopServices } from '../setup-functions';
+import { dataTidFormat } from '../../src/renderer/services/test';
+
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
await stopApp();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
+ await testDataRefresh(s3ServerInstance);
await clearDataStorage();
- await testDataRefresh();
});
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
@@ -170,10 +189,10 @@ test.describe('TST50 - Perspective Grid', () => {
await global.client.dblclick(getGridFileSelector('empty_folder'));
await expectElementExist(getGridFileSelector(fileName));
- const arrayMeta =
- global.isWeb || global.isMinio
+ const arrayMeta = [fileName + '.json'];
+ /*global.isWeb || global.isMinio
? [fileName + '.json'] // check meta, thumbnails are not created on web or minio
- : [fileName + '.json', fileName + '.jpg']; // check meta and thumbnail
+ : [fileName + '.json', fileName + '.jpg'];*/ // check meta and thumbnail
await expectMetaFilesExist(arrayMeta, true);
@@ -209,10 +228,10 @@ test.describe('TST50 - Perspective Grid', () => {
await global.client.dblclick(getGridFileSelector('empty_folder'));
await expectElementExist(getGridFileSelector(fileName));
- const arrayMeta =
- global.isWeb || global.isMinio
+ const arrayMeta = [fileName + '.json'];
+ /*global.isWeb || global.isMinio
? [fileName + '.json'] // check meta, thumbnails are not created on web or minio
- : [fileName + '.json', fileName + '.jpg']; // check meta and thumbnail
+ : [fileName + '.json', fileName + '.jpg'];*/ // check meta and thumbnail
await expectMetaFilesExist(arrayMeta, true);
diff --git a/tests/e2e/perspective-kanban.pw.e2e.js b/tests/e2e/perspective-kanban.pw.e2e.js
index c39b09118..023a5b2e5 100644
--- a/tests/e2e/perspective-kanban.pw.e2e.js
+++ b/tests/e2e/perspective-kanban.pw.e2e.js
@@ -1,12 +1,13 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
@@ -16,34 +17,50 @@ import {
takeScreenshot,
} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
-import { clearDataStorage } from './welcome.helpers';
+import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../src/renderer/services/test';
+import { stopServices } from '../setup-functions';
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- //await clearDataStorage();
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
await stopApp();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
+ await testDataRefresh(s3ServerInstance);
await clearDataStorage();
- await testDataRefresh();
});
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
await clickOn('[data-tid=openKanbanPerspective]');
});
@@ -76,16 +93,19 @@ test.describe('TST49 - Perspective KanBan', () => {
await expectElementExist(
'[data-tid=OpenedTID' + dataTidFormat(fileName) + ']',
true,
+ 5000,
);
await clickOn('[data-tid=fileContainerNextFile]');
await expectElementExist(
'[data-tid=OpenedTID' + dataTidFormat(nextFileName) + ']',
true,
+ 5000,
);
await clickOn('[data-tid=fileContainerPrevFile]');
await expectElementExist(
'[data-tid=OpenedTID' + dataTidFormat(fileName) + ']',
true,
+ 5000,
);
});
});
diff --git a/tests/e2e/quick-access.pw.e2e.js b/tests/e2e/quick-access.pw.e2e.js
index dc483a1ad..6dfea3a88 100644
--- a/tests/e2e/quick-access.pw.e2e.js
+++ b/tests/e2e/quick-access.pw.e2e.js
@@ -1,12 +1,13 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
@@ -23,21 +24,30 @@ import { createSavedSearch, searchEngine } from './search.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../src/renderer/services/test';
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
+import { stopServices } from '../setup-functions';
-test.beforeAll(async () => {
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
await startTestingApp();
//await clearDataStorage();
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
@@ -46,10 +56,13 @@ test.beforeEach(async () => {
await clickOn('[data-tid=locationManager]');
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
diff --git a/tests/e2e/search.pw.e2e.js b/tests/e2e/search.pw.e2e.js
index a9fbddbfe..361312e7e 100644
--- a/tests/e2e/search.pw.e2e.js
+++ b/tests/e2e/search.pw.e2e.js
@@ -1,4 +1,4 @@
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
clickOn,
expectElementExist,
@@ -22,6 +22,7 @@ import {
closeLocation,
createPwLocation,
createPwMinioLocation,
+ createS3Location,
defaultLocationName,
defaultLocationPath,
getPwLocationTid,
@@ -38,21 +39,30 @@ import { clearDataStorage } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../src/renderer/services/test';
import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
+import { stopServices } from '../setup-functions';
-test.beforeAll(async () => {
- await startTestingApp('extconfig-two-locations.js'); //'extconfig-with-welcome.js');
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ await startTestingApp('extconfig-two-locations.js');
// await startTestingApp('extconfig-without-locations.js');
// await clearDataStorage();
await createFile();
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
const localStorage = await global.client.evaluate(() =>
JSON.stringify(window.localStorage),
@@ -61,7 +71,7 @@ test.afterEach(async ({ page }, testInfo) => {
testInfo.outputPath(testInfo.title + '_localstorage.json'),
localStorage,
);
- }
+ }*/
await clearDataStorage();
});
@@ -69,10 +79,13 @@ test.beforeEach(async () => {
// await closeWelcomePlaywright();
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
diff --git a/tests/e2e/tag.pw.e2e.js b/tests/e2e/tag.pw.e2e.js
index cedcc96df..ee8642148 100644
--- a/tests/e2e/tag.pw.e2e.js
+++ b/tests/e2e/tag.pw.e2e.js
@@ -1,5 +1,5 @@
/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';
import {
checkSettings,
@@ -16,6 +16,7 @@ import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import {
createPwLocation,
createPwMinioLocation,
+ createS3Location,
defaultLocationName,
defaultLocationPath,
} from './location.helpers';
@@ -31,21 +32,34 @@ import {
testTagName,
} from './tag.helpers';
import { dataTidFormat } from '../../src/renderer/services/test';
-
-test.beforeAll(async () => {
- await startTestingApp('extconfig.js');
- //await clearDataStorage();
+import { stopServices } from '../setup-functions';
+
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
+ if (global.isS3) {
+ await startTestingApp();
+ await closeWelcomePlaywright();
+ } else {
+ await startTestingApp('extconfig.js');
+ }
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await stopApp();
- await testDataRefresh();
});
test.afterEach(async ({ page }, testInfo) => {
- if (testInfo.status !== testInfo.expectedStatus) {
+ /*if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
- }
+ }*/
await clearDataStorage();
});
@@ -282,6 +296,8 @@ test.describe('TST04 - Testing the tag library:', () => {
await clickOn('[data-tid=locationManager]');
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
@@ -330,10 +346,11 @@ test.describe('TST04 - Testing the tag library:', () => {
'[data-tid=tagContainer_' + tagName + ']',
getGridFileSelector('sample.txt'),
);
+ await clickOn('[data-tid=showTimeTID]');
await clickOn('[data-tid=confirmEditTagEntryDialog]');
await expectElementExist(
- '[data-tid=tagContainer_' + formatDateTime4Tag(new Date(), true) + ']',
+ '[data-tid=tagContainer_' + formatDateTime4Tag(new Date(), false) + ']',
true,
8000,
'[data-tid=perspectiveGridFileTable]',
diff --git a/tests/e2e/test-utils.js b/tests/e2e/test-utils.js
index ebe5cb06a..65ae345b3 100644
--- a/tests/e2e/test-utils.js
+++ b/tests/e2e/test-utils.js
@@ -1,6 +1,6 @@
/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */
import { expect } from '@playwright/test';
-import { clickOn, setInputKeys } from './general.helpers';
+import { clickOn, expectElementExist, setInputKeys } from './general.helpers';
const newDirectoryName = 'newDirectory';
export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';
@@ -45,5 +45,10 @@ export async function renameFolder() {
// set new dir name
await setInputKeys('renameEntryDialogInput', newDirectoryName);
await clickOn('[data-tid=confirmRenameEntry]');
+ await expectElementExist(
+ '[data-tid=currentDir_' + newDirectoryName + ']',
+ true,
+ 5000,
+ );
return newDirectoryName;
}
diff --git a/tests/e2e/viewer-audiovideo.pw.e2e.js b/tests/e2e/viewer-audiovideo.pw.e2e.js
index 5cc058de5..b4a55f327 100644
--- a/tests/e2e/viewer-audiovideo.pw.e2e.js
+++ b/tests/e2e/viewer-audiovideo.pw.e2e.js
@@ -2,16 +2,18 @@
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { expect, test } from '@playwright/test';
+import { test, expect } from './fixtures';
import {
defaultLocationPath,
defaultLocationName,
createPwMinioLocation,
createPwLocation,
+ createS3Location,
} from './location.helpers';
import {
clickOn,
expectAudioPlay,
+ expectElementExist,
getGridFileSelector,
isDisplayed,
takeScreenshot,
@@ -19,29 +21,42 @@ import {
import { startTestingApp, stopApp, testDataRefresh } from './hook';
import { openContextEntryMenu } from './test-utils';
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
+import { stopServices } from '../setup-functions';
+
+let s3ServerInstance;
+let webServerInstance;
+let minioServerInstance;
+
+test.beforeAll(async ({ s3Server, webServer, minioServer }) => {
+ s3ServerInstance = s3Server;
+ webServerInstance = webServer;
+ minioServerInstance = minioServer;
-test.beforeAll(async () => {
await startTestingApp();
await closeWelcomePlaywright();
});
test.afterAll(async () => {
+ await stopServices(s3ServerInstance, webServerInstance, minioServerInstance);
+ await testDataRefresh(s3ServerInstance);
await clearDataStorage();
await stopApp();
- await testDataRefresh();
});
-test.afterEach(async ({ page }, testInfo) => {
+/*test.afterEach(async ({ page }, testInfo) => {
if (testInfo.status !== testInfo.expectedStatus) {
await takeScreenshot(testInfo);
}
-});
+});*/
test.beforeEach(async () => {
if (global.isMinio) {
await createPwMinioLocation('', defaultLocationName, true);
+ } else if (global.isS3) {
+ await createS3Location('', defaultLocationName, true);
} else {
await createPwLocation(defaultLocationPath, defaultLocationName, true);
}
await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);
// If its have opened file
// await closeFileProperties();
});
diff --git a/tests/global-setup-minio.js b/tests/global-setup-minio.js
deleted file mode 100644
index 3aa7555e4..000000000
--- a/tests/global-setup-minio.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { startMinio } from './setup-functions';
-import { removeExtConfig } from './e2e/hook';
-
-module.exports = async function () {
- await removeExtConfig();
-
- global.minio = await startMinio();
-};
diff --git a/tests/global-setup-web.js b/tests/global-setup-web.js
deleted file mode 100644
index 4eefb91b3..000000000
--- a/tests/global-setup-web.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { startMinio, startWebServer } from './setup-functions';
-import { removeExtConfig } from './e2e/hook';
-
-module.exports = async function () {
- await removeExtConfig();
-
- global.webserver = await startWebServer();
- // global.chromeDriver = await startChromeDriver();
- global.minio = await startMinio();
-};
diff --git a/tests/global-setup.js b/tests/global-setup.js
index 2814fdd49..b1fa94af3 100644
--- a/tests/global-setup.js
+++ b/tests/global-setup.js
@@ -1,22 +1,28 @@
-module.exports = async function () {
- // await globalSetup();
-
+module.exports = async function (config) {
// copy extconfig
- const fse = require('fs-extra');
+ const fs = require('fs');
const path = require('path');
+ // console.log(JSON.stringify(config));
let srcDir = path.join(
__dirname,
'..',
'scripts',
- 'extconfig-with-welcome.js',
+ config.configFile.endsWith('playwright.config.web.js')
+ ? 'extconfig-s3-location.js'
+ : 'extconfig-with-welcome.js',
);
let destDir = path.join(
__dirname,
'..',
- 'release/app/dist/renderer',
+ config.configFile.endsWith('playwright.config.web.js')
+ ? 'web'
+ : 'release/app/dist/renderer',
'extconfig.js',
);
-
- fse.copySync(srcDir, destDir);
+ try {
+ fs.copyFileSync(srcDir, destDir);
+ } catch (err) {
+ console.error('Error copying file:', err);
+ }
};
diff --git a/tests/global-teardown-minio.js b/tests/global-teardown-minio.js
deleted file mode 100644
index 8142ecb9e..000000000
--- a/tests/global-teardown-minio.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { stopMinio } from './setup-functions';
-
-module.exports = function () {
- stopMinio(global.minio);
-};
diff --git a/tests/global-teardown-web.js b/tests/global-teardown-web.js
deleted file mode 100644
index a6e7a3e70..000000000
--- a/tests/global-teardown-web.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { stopChromeDriver, stopMinio, stopWebServer } from './setup-functions';
-
-module.exports = async function () {
- // await stopChromeDriver(global.chromeDriver);
- await stopWebServer(global.webserver);
-
- stopMinio(global.minio);
-};
diff --git a/tests/s3rver/S3DataRefresh.js b/tests/s3rver/S3DataRefresh.js
new file mode 100644
index 000000000..b38aacae1
--- /dev/null
+++ b/tests/s3rver/S3DataRefresh.js
@@ -0,0 +1,132 @@
+const fs = require('fs');
+const path = require('path');
+const {
+ S3Client,
+ PutObjectCommand,
+ DeleteObjectsCommand,
+ ListObjectsV2Command,
+} = require('@aws-sdk/client-s3');
+const bucketName = 'supported-filestypes';
+const directoryPath = path.resolve(
+ __dirname,
+ '..',
+ 'testdata',
+ 'file-structure',
+ 'supported-filestypes',
+);
+
+function getFilesRecursive(dirPath) {
+ let files = [];
+
+ const traverse = (currentPath) => {
+ const items = fs.readdirSync(currentPath);
+
+ items.forEach((item) => {
+ const itemPath = path.join(currentPath, item);
+ const stat = fs.statSync(itemPath);
+
+ if (stat.isDirectory()) {
+ traverse(itemPath); // Recursively traverse directories
+ } else {
+ files.push(itemPath); // Add file path to the list
+ }
+ });
+ };
+
+ traverse(dirPath);
+ return files;
+}
+
+function getS3Client() {
+ return new S3Client({
+ region: 'eu-central-1',
+ endpoint: 'http://localhost:4569', // Adjust endpoint as needed
+ credentials: {
+ accessKeyId: 'S3RVER',
+ secretAccessKey: 'S3RVER',
+ },
+ // Force path style required for local S3rver
+ forcePathStyle: true,
+ //logger: console,
+ });
+}
+
+async function deleteAllObjects(bucketName) {
+ try {
+ // List objects in the bucket
+ const listParams = {
+ Bucket: bucketName,
+ MaxKeys: 10, // Limit the number of keys to 10 per request
+ };
+
+ const s3Client = getS3Client();
+ let listedObjects;
+ do {
+ listedObjects = await s3Client.send(new ListObjectsV2Command(listParams));
+
+ if (!listedObjects.Contents || listedObjects.Contents.length === 0) break;
+
+ // Prepare the list of objects to delete
+ const deleteParams = {
+ Bucket: bucketName,
+ Delete: {
+ Objects: listedObjects.Contents.map((object) => ({
+ Key: object.Key,
+ })),
+ },
+ };
+
+ // Delete objects
+ await s3Client.send(new DeleteObjectsCommand(deleteParams));
+
+ // If the list is truncated, set the continuation token to get the next batch of objects
+ listParams.ContinuationToken = listedObjects.NextContinuationToken;
+ } while (listedObjects.IsTruncated);
+
+ console.log(`All objects in bucket "${bucketName}" have been deleted.`);
+ } catch (error) {
+ console.error('Error deleting objects:', error);
+ }
+}
+
+function uploadFile(filePath, content = undefined) {
+ const fileContent = content ? content : fs.readFileSync(filePath);
+
+ const key = path.relative(directoryPath, filePath).replace(/\\/g, '/'); // Normalize path separators
+
+ const params = {
+ Bucket: bucketName,
+ Key: key,
+ Body: fileContent,
+ };
+
+ try {
+ //console.log(`Uploaded ${filePath} to ${bucketName}/${key}`);
+ const s3Client = getS3Client();
+ return s3Client.send(new PutObjectCommand(params));
+ } catch (err) {
+ console.error(`Error uploading ${filePath}:`, err);
+ return Promise.reject(err);
+ }
+}
+
+function uploadTestDirectory() {
+ try {
+ const files = getFilesRecursive(directoryPath);
+ console.log(`All files in ${directoryPath} uploaded to ${bucketName}`);
+ return Promise.all(files.map((file) => uploadFile(file)));
+ } catch (err) {
+ console.error(`Error uploading directory ${directoryPath}:`, err);
+ }
+}
+
+async function refreshS3testData() {
+ await deleteAllObjects('supported-filestypes');
+ await uploadTestDirectory();
+}
+
+module.exports = {
+ uploadTestDirectory,
+ //refreshS3testData,
+ uploadFile,
+};
diff --git a/tests/s3rver/cors.xml b/tests/s3rver/cors.xml
new file mode 100644
index 000000000..3939a5483
--- /dev/null
+++ b/tests/s3rver/cors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CORSConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+ <CORSRule>
+ <AllowedOrigin>*</AllowedOrigin>
+ <AllowedMethod>GET</AllowedMethod>
+ <AllowedMethod>PUT</AllowedMethod>
+ <AllowedMethod>POST</AllowedMethod>
+ <AllowedMethod>DELETE</AllowedMethod>
+ <AllowedMethod>HEAD</AllowedMethod>
+ <MaxAgeSeconds>3000</MaxAgeSeconds>
+ <AllowedHeader>*</AllowedHeader>
+ </CORSRule>
+</CORSConfiguration>
diff --git a/tests/setup-functions.js b/tests/setup-functions.js
index 7d1fdec72..2a5b56462 100644
--- a/tests/setup-functions.js
+++ b/tests/setup-functions.js
@@ -1,5 +1,8 @@
import pathLib from 'path';
+import fs from 'fs';
import sh from 'shelljs';
+const S3rver = require('s3rver');
+//const corsConfig = require.resolve('./s3rver/cors.xml');
export async function globalSetup() {
// global.isWin = /^win/.test(process.platform);
@@ -40,10 +43,12 @@ export async function startMinio() {
return minioProcess;
}
export function stopMinio(process) {
- // Send SIGHUP to process.
- console.log('stopMinio');
- process.stdin.pause();
- process.kill(); //'SIGHUP');
+ if (process) {
+ // Send SIGHUP to process.
+ console.log('stopMinio');
+ process.stdin.pause();
+ process.kill(); //'SIGHUP');
+ }
}
export async function startChromeDriver() {
@@ -92,7 +97,54 @@ export async function startWebServer() {
return app;
}
+export async function stopServices(s3Server, webServer, minioServer) {
+ await stopS3Server(s3Server);
+ await stopWebServer(webServer);
+ await stopMinio(minioServer);
+}
+
export async function stopWebServer(app) {
- await app.server.close();
- app = null;
+ if (app) {
+ await app.server.close();
+ app = null;
+ }
+}
+
+export async function stopS3Server(server) {
+ if (server) {
+ await server.close();
+ server = null;
+ }
+}
+
+export async function runS3Server(silent = true) {
+ // Set NODE_OPTIONS environment variable to use openssl-legacy-provider
+ process.env.NODE_OPTIONS = '--openssl-legacy-provider';
+
+ const directoryTargetPath = pathLib.resolve(
+ __dirname,
+ 'testdata-tmp',
+ 'file-structure',
+ );
+ const corsConfig = pathLib.resolve(__dirname, 's3rver', 'cors.xml');
+ const instance = new S3rver({
+ port: 4569,
+ address: 'localhost',
+ silent: silent,
+ directory: directoryTargetPath,
+ resetOnClose: true,
+ sslEnabled: false,
+ configureBuckets: [
+ {
+ name: 'supported-filestypes',
+ configs: [fs.readFileSync(corsConfig)],
+ },
+ ],
+ });
+ try {
+ await instance.run();
+ } catch (e) {
+ console.log('S3rver run', e);
+ }
+ return instance;
}