TagSpaces is an offline, open source, document manager with tagging support
fix KanBan defaultColumnsToShow (#2331)
Stanimir785e6d1d9311
diff --git a/package-lock.json b/package-lock.jsonindex eeae2fe91..b3e7b6372 100644--- a/package-lock.json+++ b/package-lock.json@@ -121,7 +121,6 @@"adm-zip": "0.5.16","browserslist-config-erb": "^0.0.3","chalk": "^4.1.2",- "chromedriver": "^90.0.0","concat-licenses": "^2.0.1","concurrently": "^8.2.1","core-js": "^3.32.2",@@ -165,7 +164,7 @@"jest-environment-jsdom": "^29.7.0","jsdom": "^11.0.0","json-loader": "^0.5.7",- "jsonwebtoken": "^8.5.1",+ "jsonwebtoken": "^9.0.2","less": "^4.1.3","less-loader": "^11.0.0","mini-css-extract-plugin": "^2.7.6",@@ -208,7 +207,7 @@"yarn": "please-use-npm"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.164"+ "@tagspacespro/tagspacespro": "5.0.165-alpha.3"}},"node_modules/@adobe/css-tools": {@@ -19293,9 +19292,9 @@}},"node_modules/@tagspacespro/tagspacespro": {- "version": "5.0.164",- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.164/6e9745623b4255c775077c49faddfce0a3ff2c76",- "integrity": "sha512-ZjJ2oBjFhK5VNpOoj9zJP5xejYYHWSbH6PGusfLHlzHNFyRECwNLoBjcxPIh3UNXRQo0v0W0nLj989g9rZkJWA==",+ "version": "5.0.165-alpha.3",+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.165-alpha.3/a0323bcfbaf8b293869f43e36781013532a75540",+ "integrity": "sha512-dg8aN0hEUj/++JJ/+2u8PrykHtariuI/3QUbeg3QFDMmud/tEKqQXqhEHjKTttHH8ETSB7bXIs/uLZBzamAnbw==","license": "Proprietary","optional": true},@@ -19371,13 +19370,6 @@"url": "https://opencollective.com/webpack"}},- "node_modules/@testim/chrome-version": {- "version": "1.1.4",- "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",- "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g==",- "dev": true,- "license": "MIT"- },"node_modules/@testing-library/dom": {"version": "9.3.4","resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz",@@ -23595,40 +23587,6 @@"node": ">=6.0"}},- "node_modules/chromedriver": {- "version": "90.0.1",- "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-90.0.1.tgz",- "integrity": "sha512-jvyhin0I/Bacxfet7eg29B1j+5mKR35XwWGbgcCOUALeE3mqcCKJY8xUW9cVrqVqTK9/iUOq8/kar7qrTVshPA==",- "deprecated": "Chromedriver download url has changed. Use version 114.0.2 or newer.",- "dev": true,- "hasInstallScript": true,- "license": "Apache-2.0",- "dependencies": {- "@testim/chrome-version": "^1.0.7",- "axios": "^0.21.1",- "del": "^6.0.0",- "extract-zip": "^2.0.1",- "https-proxy-agent": "^5.0.0",- "proxy-from-env": "^1.1.0",- "tcp-port-used": "^1.0.1"- },- "bin": {- "chromedriver": "bin/chromedriver"- },- "engines": {- "node": ">=10"- }- },- "node_modules/chromedriver/node_modules/axios": {- "version": "0.21.4",- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",- "dev": true,- "license": "MIT",- "dependencies": {- "follow-redirects": "^1.14.0"- }- },"node_modules/chromium-edge-launcher": {"version": "0.2.0","resolved": "https://registry.npmjs.org/chromium-edge-launcher/-/chromium-edge-launcher-0.2.0.tgz",@@ -25717,92 +25675,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/del": {- "version": "6.1.1",- "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",- "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",- "dev": true,- "license": "MIT",- "dependencies": {- "globby": "^11.0.1",- "graceful-fs": "^4.2.4",- "is-glob": "^4.0.1",- "is-path-cwd": "^2.2.0",- "is-path-inside": "^3.0.2",- "p-map": "^4.0.0",- "rimraf": "^3.0.2",- "slash": "^3.0.0"- },- "engines": {- "node": ">=10"- },- "funding": {- "url": "https://github.com/sponsors/sindresorhus"- }- },- "node_modules/del/node_modules/brace-expansion": {- "version": "1.1.12",- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",- "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",- "dev": true,- "license": "MIT",- "dependencies": {- "balanced-match": "^1.0.0",- "concat-map": "0.0.1"- }- },- "node_modules/del/node_modules/glob": {- "version": "7.2.3",- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",- "deprecated": "Glob versions prior to v9 are no longer supported",- "dev": true,- "license": "ISC",- "dependencies": {- "fs.realpath": "^1.0.0",- "inflight": "^1.0.4",- "inherits": "2",- "minimatch": "^3.1.1",- "once": "^1.3.0",- "path-is-absolute": "^1.0.0"- },- "engines": {- "node": "*"- },- "funding": {- "url": "https://github.com/sponsors/isaacs"- }- },- "node_modules/del/node_modules/minimatch": {- "version": "3.1.2",- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",- "dev": true,- "license": "ISC",- "dependencies": {- "brace-expansion": "^1.1.7"- },- "engines": {- "node": "*"- }- },- "node_modules/del/node_modules/rimraf": {- "version": "3.0.2",- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",- "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",- "deprecated": "Rimraf versions prior to v4 are no longer supported",- "dev": true,- "license": "ISC",- "dependencies": {- "glob": "^7.1.3"- },- "bin": {- "rimraf": "bin.js"- },- "funding": {- "url": "https://github.com/sponsors/isaacs"- }- },"node_modules/delayed-stream": {"version": "1.0.0","resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",@@ -32135,16 +32007,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/is-path-cwd": {- "version": "2.2.0",- "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",- "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",- "dev": true,- "license": "MIT",- "engines": {- "node": ">=6"- }- },"node_modules/is-path-inside": {"version": "3.0.3","resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",@@ -32309,13 +32171,6 @@"url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/is-url": {- "version": "1.2.4",- "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",- "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",- "dev": true,- "license": "MIT"- },"node_modules/is-weakmap": {"version": "2.0.2","resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",@@ -32381,21 +32236,6 @@"node": ">=8"}},- "node_modules/is2": {- "version": "2.0.9",- "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz",- "integrity": "sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==",- "dev": true,- "license": "MIT",- "dependencies": {- "deep-is": "^0.1.3",- "ip-regex": "^4.1.0",- "is-url": "^1.2.4"- },- "engines": {- "node": ">=v0.10.0"- }- },"node_modules/isarray": {"version": "2.0.5","resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",@@ -34184,9 +34024,9 @@"license": "MIT"},"node_modules/jsonwebtoken": {- "version": "8.5.1",- "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",- "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",+ "version": "9.0.2",+ "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",+ "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==","dev": true,"license": "MIT","dependencies": {@@ -34199,21 +34039,11 @@"lodash.isstring": "^4.0.1","lodash.once": "^4.0.0","ms": "^2.1.1",- "semver": "^5.6.0"+ "semver": "^7.5.4"},"engines": {- "node": ">=4",- "npm": ">=1.4.28"- }- },- "node_modules/jsonwebtoken/node_modules/semver": {- "version": "5.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",- "dev": true,- "license": "ISC",- "bin": {- "semver": "bin/semver"+ "node": ">=12",+ "npm": ">=6"}},"node_modules/jsprim": {@@ -42993,13 +42823,6 @@"node": ">= 0.10"}},- "node_modules/proxy-from-env": {- "version": "1.1.0",- "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",- "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",- "dev": true,- "license": "MIT"- },"node_modules/prr": {"version": "1.0.1","resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",@@ -47446,42 +47269,6 @@"dev": true,"license": "ISC"},- "node_modules/tcp-port-used": {- "version": "1.0.2",- "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",- "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==",- "dev": true,- "license": "MIT",- "dependencies": {- "debug": "4.3.1",- "is2": "^2.0.6"- }- },- "node_modules/tcp-port-used/node_modules/debug": {- "version": "4.3.1",- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",- "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",- "dev": true,- "license": "MIT",- "dependencies": {- "ms": "2.1.2"- },- "engines": {- "node": ">=6.0"- },- "peerDependenciesMeta": {- "supports-color": {- "optional": true- }- }- },- "node_modules/tcp-port-used/node_modules/ms": {- "version": "2.1.2",- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",- "dev": true,- "license": "MIT"- },"node_modules/temp": {"version": "0.9.4","resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",diff --git a/package.json b/package.jsonindex 6618a4328..1a9ed9619 100644--- a/package.json+++ b/package.json@@ -245,7 +245,7 @@"zod-to-json-schema": "^3.24.1"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.164"+ "@tagspacespro/tagspacespro": "5.0.165-alpha.3"},"devDependencies": {"@electron/notarize": "^2.5.0",@@ -275,7 +275,6 @@"adm-zip": "0.5.16","browserslist-config-erb": "^0.0.3","chalk": "^4.1.2",- "chromedriver": "^90.0.0","concat-licenses": "^2.0.1","concurrently": "^8.2.1","core-js": "^3.32.2",@@ -319,7 +318,7 @@"jest-environment-jsdom": "^29.7.0","jsdom": "^11.0.0","json-loader": "^0.5.7",- "jsonwebtoken": "^8.5.1",+ "jsonwebtoken": "^9.0.2","less": "^4.1.3","less-loader": "^11.0.0","mini-css-extract-plugin": "^2.7.6",diff --git a/playwright.config.js b/playwright.config.jsindex 539088ccc..e8c369f75 100644--- a/playwright.config.js+++ b/playwright.config.js@@ -6,8 +6,9 @@ const isWin = /win32|mswin(?!ce)|mingw|bccwin|cygwin/i.test(process.platform);function projectTagGrep(name) {// \b ensures we match whole words (so “web” doesn’t match “webhook”)- return new RegExp(`\\[.*\\b${name}\\b.*\\]`);- //return new RegExp('(?:TST0108|TST0109|TST0114|TST5025|TST0419|TST0216|TST0218)'); // return new RegExp(`TST01.*`);+ return new RegExp(`\\[(?=[^\\]]*\\b${name}\\b)[^\\]]*\\]`);+ //return new RegExp(`\\[.*\\b${name}\\b.*\\]`);+ //return new RegExp('(?:TST4901|TST4902|TST4903|TST4909)'); // return new RegExp(`TST01.*`);}export default defineConfig({diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex 173afcb73..c4a16e351 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -13,7 +13,7 @@"@elife/pm2": "3.6.1","@tagspaces/extensions": "1.0.195","@tagspaces/tagspaces-common-node": "4.5.86",- "@tagspaces/tagspaces-ws": "4.5.86",+ "@tagspaces/tagspaces-ws": "4.5.87","sharp": "0.32.6","ws": "8.18.1"},@@ -221,21 +221,41 @@}},"node_modules/@tagspaces/tagspaces-ws": {- "version": "4.5.86",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.86.tgz",- "integrity": "sha512-ZoCzmCc2RWef/tYgXvWKur5NJ5oiJ1lgjgBy3QnDTJzMsML27cDpVbv3zEpQBQlt0BNz0yp9UFnRCG720z16Ng==",+ "version": "4.5.87",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.87.tgz",+ "integrity": "sha512-dr+cyOywc1GGHHIw4Ll7fcsMYecy5IBGu6fB/qV9kb9myGCQOK8igbVUPhSBJqb+9cZ33zkn8Uv2+H9wDLjBdA==","dependencies": {"@tagspaces/tagspaces-indexer": "^4.5.86","@tagspaces/tagspaces-pdf-extraction": "^4.5.53","@tagspaces/tagspaces-workers": "^4.5.86","find-free-ports": "^3.1.1",- "jsonwebtoken": "^8.5.1",- "ws": "^8.15.1"+ "jsonwebtoken": "^9.0.2",+ "ws": "^8.18.3"},"peerDependencies": {"sharp": ">=0.32.0"}},+ "node_modules/@tagspaces/tagspaces-ws/node_modules/ws": {+ "version": "8.18.3",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",+ "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",+ "engines": {+ "node": ">=10.0.0"+ },+ "peerDependencies": {+ "bufferutil": "^4.0.1",+ "utf-8-validate": ">=5.0.2"+ },+ "peerDependenciesMeta": {+ "bufferutil": {+ "optional": true+ },+ "utf-8-validate": {+ "optional": true+ }+ }+ },"node_modules/@tagspacespro/extensions": {"version": "2.0.5","resolved": "https://npm.pkg.github.com/download/@tagspacespro/extensions/2.0.5/e65ec6d2b410217d09a61de03f33fb4a9278449a",@@ -1039,9 +1059,9 @@}},"node_modules/jsonwebtoken": {- "version": "8.5.1",- "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",- "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",+ "version": "9.0.2",+ "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",+ "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==","dependencies": {"jws": "^3.2.2","lodash.includes": "^4.3.0",@@ -1052,11 +1072,11 @@"lodash.isstring": "^4.0.1","lodash.once": "^4.0.0","ms": "^2.1.1",- "semver": "^5.6.0"+ "semver": "^7.5.4"},"engines": {- "node": ">=4",- "npm": ">=1.4.28"+ "node": ">=12",+ "npm": ">=6"}},"node_modules/jwa": {@@ -1220,17 +1240,6 @@"node": ">=10"}},- "node_modules/node-abi/node_modules/semver": {- "version": "7.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",- "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",- "bin": {- "semver": "bin/semver.js"- },- "engines": {- "node": ">=10"- }- },"node_modules/node-addon-api": {"version": "6.1.0","resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",@@ -1461,11 +1470,14 @@}},"node_modules/semver": {- "version": "5.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",+ "version": "7.7.2",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==","bin": {- "semver": "bin/semver"+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"}},"node_modules/sharp": {@@ -1490,17 +1502,6 @@"url": "https://opencollective.com/libvips"}},- "node_modules/sharp/node_modules/semver": {- "version": "7.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",- "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",- "bin": {- "semver": "bin/semver.js"- },- "engines": {- "node": ">=10"- }- },"node_modules/shelljs": {"version": "0.8.5","resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",@@ -1951,16 +1952,24 @@}},"@tagspaces/tagspaces-ws": {- "version": "4.5.86",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.86.tgz",- "integrity": "sha512-ZoCzmCc2RWef/tYgXvWKur5NJ5oiJ1lgjgBy3QnDTJzMsML27cDpVbv3zEpQBQlt0BNz0yp9UFnRCG720z16Ng==",+ "version": "4.5.87",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.87.tgz",+ "integrity": "sha512-dr+cyOywc1GGHHIw4Ll7fcsMYecy5IBGu6fB/qV9kb9myGCQOK8igbVUPhSBJqb+9cZ33zkn8Uv2+H9wDLjBdA==","requires": {"@tagspaces/tagspaces-indexer": "^4.5.86","@tagspaces/tagspaces-pdf-extraction": "^4.5.53","@tagspaces/tagspaces-workers": "^4.5.86","find-free-ports": "^3.1.1",- "jsonwebtoken": "^8.5.1",- "ws": "^8.15.1"+ "jsonwebtoken": "^9.0.2",+ "ws": "^8.18.3"+ },+ "dependencies": {+ "ws": {+ "version": "8.18.3",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",+ "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",+ "requires": {}+ }}},"@tagspacespro/extensions": {@@ -2532,9 +2541,9 @@}},"jsonwebtoken": {- "version": "8.5.1",- "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",- "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",+ "version": "9.0.2",+ "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",+ "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==","requires": {"jws": "^3.2.2","lodash.includes": "^4.3.0",@@ -2545,7 +2554,7 @@"lodash.isstring": "^4.0.1","lodash.once": "^4.0.0","ms": "^2.1.1",- "semver": "^5.6.0"+ "semver": "^7.5.4"}},"jwa": {@@ -2674,13 +2683,6 @@"integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==","requires": {"semver": "^7.3.5"- },- "dependencies": {- "semver": {- "version": "7.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",- "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="- }}},"node-addon-api": {@@ -2850,9 +2852,9 @@}},"semver": {- "version": "5.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="+ "version": "7.7.2",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="},"sharp": {"version": "0.32.6",@@ -2867,13 +2869,6 @@"simple-get": "^4.0.1","tar-fs": "^3.0.4","tunnel-agent": "^0.6.0"- },- "dependencies": {- "semver": {- "version": "7.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",- "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="- }}},"shelljs": {diff --git a/release/app/package.json b/release/app/package.jsonindex 2472c35b7..7ae2be0c7 100644--- a/release/app/package.json+++ b/release/app/package.json@@ -20,7 +20,7 @@"@elife/pm2": "3.6.1","@tagspaces/extensions": "1.0.195","@tagspaces/tagspaces-common-node": "4.5.86",- "@tagspaces/tagspaces-ws": "4.5.86",+ "@tagspaces/tagspaces-ws": "4.5.87","sharp": "0.32.6","ws": "8.18.1"},diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsxindex bcbecb1fe..ccc4d4956 100644--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx@@ -261,12 +261,12 @@ export const DirectoryContentContextProvider = ({//const isMetaFolderExist = useRef<boolean>(undefined);const currentDirectory = useRef<TS.FileSystemEntry>(undefined);const currentDirectoryFiles = useRef<TS.OrderVisibilitySettings[]>([]);- const currentDirectoryDirs = useRef<TS.OrderVisibilitySettings[]>(undefined);+ const currentDirectoryDirs = useRef<TS.OrderVisibilitySettings[]>([]);const firstRender = useFirstRender();const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);const broadcast = new BroadcastChannel('ts-directory-channel');- const defaultColumnsToShow = 3;+ const defaultColumnsToShow = 3; //KanBanuseEffect(() => {if (AppConfig.isElectron) {@@ -807,6 +807,18 @@ export const DirectoryContentContextProvider = ({}}+ function getDefaultColumnsToShow(+ entries: TS.FileSystemEntry[],+ ): TS.OrderVisibilitySettings[] {+ return entries+ .filter((entry) => !entry.isFile)+ .slice(0, defaultColumnsToShow)+ .map((dir) => ({+ uuid: dir.uuid,+ name: dir.name,+ }));+ }+async function loadMetaDirectoryContent(directoryPath: string,location: CommonLocation,@@ -834,14 +846,8 @@ export const DirectoryContentContextProvider = ({// set default directory metadataif (!meta) {currentDirectoryFiles.current = [];- // add defaultColumnsToShow- const columnsToShow = entries- .filter((entry) => !entry.isFile)- .slice(0, defaultColumnsToShow);- currentDirectoryDirs.current = columnsToShow.map((dir) => ({- uuid: dir.uuid,- name: dir.name,- }));+ // add defaultColumnsToShow for KanBan+ currentDirectoryDirs.current = getDefaultColumnsToShow(entries);const meta = cleanMetaData(mergeFsEntryMeta({...getDefaultDirMeta(),@@ -1573,7 +1579,10 @@ export const DirectoryContentContextProvider = ({currentDirectoryPath: currentDirectory.current?.path,currentDirectory: currentDirectory.current,currentDirectoryFiles: currentDirectoryFiles.current,- currentDirectoryDirs: currentDirectoryDirs.current,+ currentDirectoryDirs:+ currentDirectoryDirs.current?.length > 0+ ? currentDirectoryDirs.current+ : getDefaultColumnsToShow(currentDirectoryEntries.current),//isMetaFolderExist: isMetaFolderExist.current,searchQuery: searchQuery.current,isSearchMode: isSearchMode.current,diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsxindex 77e582768..ce1d9c4dc 100644--- a/src/renderer/hooks/IOActionsContextProvider.tsx+++ b/src/renderer/hooks/IOActionsContextProvider.tsx@@ -16,7 +16,7 @@**/-import React, { createContext, useEffect, useMemo } from 'react';+import React, { createContext, useMemo } from 'react';import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';import { useTranslation } from 'react-i18next';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';@@ -37,7 +37,6 @@ import {normalizePath,extractTags,cleanTrailingDirSeparator,- cleanFrontDirSeparator,generateFileName,getMetaContentFileLocation,getFileLocationFromMetaFile,@@ -77,7 +76,6 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { Pro } from '-/pro';import { CommonLocation } from '-/utils/CommonLocation';import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';-import useFirstRender from '-/utils/useFirstRender';import { usePerspectiveActionsContext } from '-/hooks/usePerspectiveActionsContext';type IOActionsContextData = {@@ -304,7 +302,7 @@ export const IOActionsContextProvider = ({deleteEntriesPromise,} = usePlatformFacadeContext();const { setActions } = usePerspectiveActionsContext();- const { actions, setReflectActions } = useEditedEntryContext();+ const { setReflectActions } = useEditedEntryContext();const { setReflectMetaActions } = useEditedEntryMetaContext();const {currentDirectoryPath,@@ -319,10 +317,10 @@ export const IOActionsContextProvider = ({);const prefixTagContainer = useSelector(getPrefixTagContainer);const filenameTagPlacedAtEnd = useSelector(getFileNameTagPlace);- const firstRender = useFirstRender();+ //const firstRender = useFirstRender();const currentLocation = findLocation();- useEffect(() => {+ /* useEffect(() => {if (!firstRender && actions && actions.length > 0) {for (const action of actions) {if (action.action === 'add') {@@ -347,29 +345,10 @@ export const IOActionsContextProvider = ({);}}- } /* else if (action.action === 'update') {- // reflect visibility change on renamed KanBan column- if (- action.entry &&- !action.entry.isFile &&- action.entry.meta?.perspective === 'kanban'- ) {- const dirPath = extractContainingDirectoryPath(- action.entry.path,- currentLocation?.getDirSeparator(),- );- if (- cleanTrailingDirSeparator(- cleanFrontDirSeparator(currentDirectoryPath),- ) === cleanTrailingDirSeparator(cleanFrontDirSeparator(dirPath))- ) {- reflectRenameVisibility(action.oldEntryPath, action.entry.path);- }- }- }*/+ }}}- }, [actions]);+ }, [actions]);*/function createDirectory(directoryPath: string) {return createDirectoryPromise(directoryPath)diff --git a/tests/e2e/hook.js b/tests/e2e/hook.jsindex 001fb4791..c0658ec7e 100644--- a/tests/e2e/hook.js+++ b/tests/e2e/hook.js@@ -400,7 +400,7 @@ export async function createFolderS3(folderName = 'empty_local_folder',rootFolder = 'empty_folder',) {- const folderPath = pathLib.join(rootFolder, folderName);+ const folderPath = (rootFolder ? rootFolder + '/' : '') + folderName; //pathLib.join(rootFolder, folderName);try {await createDir(folderPath);diff --git a/tests/e2e/perspective-kanban.pw.e2e.js b/tests/e2e/perspective-kanban.pw.e2e.jsindex f3fb10a6c..2a8909a4c 100644--- a/tests/e2e/perspective-kanban.pw.e2e.js+++ b/tests/e2e/perspective-kanban.pw.e2e.js@@ -16,6 +16,7 @@ import {openFolder,setPerspectiveSetting,takeScreenshot,+ typeInputValue,} from './general.helpers';import {createFileS3,@@ -61,7 +62,7 @@ test.beforeEach(async ({ isMinio, isS3, testDataDir }) => {await createPwLocation(testDataDir, defaultLocationName, true);}await clickOn('[data-tid=location_' + defaultLocationName + ']');- await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);+ //await expectElementExist(getGridFileSelector('empty_folder'), true, 10000);await clickOn('[data-tid=openKanbanPerspective]');await expectElementExist('[data-tid=kanbanSettingsDialogOpenTID]',@@ -71,11 +72,16 @@ test.beforeEach(async ({ isMinio, isS3, testDataDir }) => {});test.describe('TST49 - Perspective KanBan', () => {- test('TST4901 - Folder which is opened in kanban for the first time []', async ({+ test('TST4901 - Folder which is opened in kanban for the first time [web,minio,electron,_pro]', async ({isS3,testDataDir,}) => {// Open max 3 sub-folders as columns on fresh folder+ await expectElementExist(+ '[data-tid=kanbanSettingsDialogOpenTID]',+ true,+ 5000,+ );if (isS3) {await createFolderS3('test_kanban_column1');await createFolderS3('test_kanban_column2');@@ -87,17 +93,67 @@ test.describe('TST49 - Perspective KanBan', () => {await createLocalFolder(testDataDir, 'test_kanban_column3');await createLocalFolder(testDataDir, 'test_kanban_column4');}- await clickOn('[data-tid=openGridPerspective]');- await openFolder('empty_folder');- await clickOn('[data-tid=openKanbanPerspective]');++ await global.client.dblclick('[data-tid=empty_folderKanBanColumnTID]');await expectElementExist(- '[data-tid=kanbanSettingsDialogOpenTID]',+ '[data-tid=test_kanban_column1KanBanColumnTID]',+ true,+ 5000,+ );+ await expectElementExist(+ '[data-tid=test_kanban_column2KanBanColumnTID]',+ true,+ 5000,+ );+ await expectElementExist(+ '[data-tid=test_kanban_column3KanBanColumnTID]',true,5000,);- await expectElementExist('[data-tid=test_kanban_column1]', true, 50000);+ await expectElementExist(+ '[data-tid=test_kanban_column4KanBanColumnTID]',+ false,+ 5000,+ );});+ test('TST4902 - Show current folder [web,minio,electron,_pro]', async () => {+ await expectElementExist(+ '[data-tid=empty_folderKanBanColumnTID]',+ true,+ 5000,+ );+ await expectElementExist(+ '[data-tid=currentFolderKanBanColumnTID]',+ false,+ 5000,+ );++ await clickOn('[data-tid=showFolderContentTID]');++ await expectElementExist(+ '[data-tid=currentFolderKanBanColumnTID]',+ true,+ 5000,+ );+ });++ test('TST4903 - Create new columns(sub-folder) [web,minio,electron,_pro]', async () => {+ const columnName = 'testFolder';+ await clickOn('[data-tid=createKanBanColumnTID]');++ await typeInputValue('[data-tid=directoryName] input', columnName, 0);+ await clickOn('[data-tid=confirmCreateNewDirectory]');++ await expectElementExist(+ '[data-tid=' + columnName + 'KanBanColumnTID]',+ true,+ 5000,+ );+ });++ test('TST4904 - Rename column [web,minio,electron,_pro]', async () => {});+test('TST4909 - move with copy/move file dialog [web,minio,electron,_pro]', async () => {const fileName = 'sample.bmp';@@ -115,10 +171,10 @@ test.describe('TST49 - Perspective KanBan', () => {await clickOn('[data-tid=confirmMoveFiles]');// hide empty_folder in order to expect moved file is not shown- await clickOn('[data-tid=empty_folderKanBanColumnActionTID]');+ /* await clickOn('[data-tid=empty_folderKanBanColumnActionTID]');await clickOn('[data-tid=columnVisibilityTID]');+ await expectElementExist(getGridFileSelector(fileName), false, 5000);*/- await expectElementExist(getGridFileSelector(fileName), false, 5000);await openContextEntryMenu(getGridFileSelector('empty_folder'),'openDirectory',@@ -129,7 +185,7 @@ test.describe('TST49 - Perspective KanBan', () => {await clickOn('[data-tid=showFolderContentTID]');}*/await clickOn('[data-tid=openDefaultPerspective]');- await expectElementExist(getGridFileSelector(fileName), true, 55000);+ await expectElementExist(getGridFileSelector(fileName), true, 5000);await clickOn('[data-tid=openKanbanPerspective]');});diff --git a/tests/s3rver/S3DataRefresh.js b/tests/s3rver/S3DataRefresh.jsindex d31924a4c..c6d587e81 100644--- a/tests/s3rver/S3DataRefresh.js+++ b/tests/s3rver/S3DataRefresh.js@@ -151,10 +151,8 @@ function uploadFile(filePath, content = undefined) {}}function createDir(dirPath) {- const key = path- .relative(directoryPath, dirPath)- .replace(/\\/g, '/')- .replace(/\/?$/, '/'); // Ensure trailing slash+ const key = //path.relative(directoryPath, dirPath)+ dirPath.replace(/\\/g, '/').replace(/\/?$/, '/'); // Ensure trailing slashconst params = {Bucket: bucketName,diff --git a/tests/setup-functions.js b/tests/setup-functions.jsindex 63b21c154..495b55eb3 100644--- a/tests/setup-functions.js+++ b/tests/setup-functions.js@@ -54,31 +54,6 @@ export async function startMinio(isWin, testWorkerDir) {}}*/-export async function startChromeDriver() {- //const childProcess = await require('child_process');- const chromeDriver = await require('chromedriver');- //const binPath = chromedriver.path;-- const args = ['--url-base=/', '--port=9515'];-- await chromeDriver.start(args);- /*const process = await childProcess.execFile(binPath, args, function (err, stdout, stderr) {- // handle results- console.log('err: ' + err);- console.log('stdout: ' + stdout);- console.log('stderr: ' + stderr);- });*/- return chromeDriver;-}--export async function stopChromeDriver(chromeDriver) {- chromeDriver.stop();- // Send SIGHUP to process.- /*console.log('stopChromeDriver');- process.stdin.pause();- process.kill(); //'SIGHUP');*/-}-/*** Start a static file server on a free port.*