Skip to content

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

add e2e tests for KanBan perspective (#2333)

Stanimir3c7df207a3d7
diff --git a/package-lock.json b/package-lock.json
index 33209ec26..6368885bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,10 +21,10 @@
"@mui/lab": "7.0.0-beta.14",
"@mui/material": "^7.1.2",
"@mui/x-date-pickers": "^8.6.0",
- "@tagspaces/tagspaces-common": "4.5.86",
- "@tagspaces/tagspaces-common-aws3": "4.5.86",
- "@tagspaces/tagspaces-common-cordova": "4.5.86",
- "@tagspaces/tagspaces-indexer": "4.5.86",
+ "@tagspaces/tagspaces-common": "4.5.88",
+ "@tagspaces/tagspaces-common-aws3": "4.5.88",
+ "@tagspaces/tagspaces-common-cordova": "4.5.88",
+ "@tagspaces/tagspaces-indexer": "4.5.88",
"aws-amplify": "^4.3.8",
"clone": "^2.1.2",
"coordinate-parser": "^1.0.7",
@@ -207,7 +207,7 @@
"yarn": "please-use-npm"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.165"
+ "@tagspacespro/tagspacespro": "5.0.167-alpha.2"
}
},
"node_modules/@adobe/css-tools": {
@@ -19044,9 +19044,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.86.tgz",
- "integrity": "sha512-K5cC/iqWhaJ7Rw4VqPVmblQRn0kp4/jFpLpuexRZnrJ4QMl1v01oflKBUGCRaP3hkrQT2AjdiKG9Eky23AsWuQ==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.88.tgz",
+ "integrity": "sha512-WpDHK9zBcVtRW8iIRgLE5tFg/LWLArQ05g/K3E+2huCntJBan7VAknsWDZokxeXsgpmC/2d7ckQGnw5cpO5ofA==",
"license": "MIT",
"dependencies": {
"dompurify": "^3.2.3",
@@ -19058,25 +19058,25 @@
}
},
"node_modules/@tagspaces/tagspaces-common-aws3": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.86.tgz",
- "integrity": "sha512-Wx1e+YWTwHfnMIGcrN20RCE0XRQo3e9kKcxYBGCOG4/BH8+MLFuojJSFbXC2oZoJt2mWs6JkC1XJ5zUE5f43ww==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.88.tgz",
+ "integrity": "sha512-rgGukodtpHpQRRhTZEl85N8NOAJCOwNstsgDcpjA+BOHfyatzY9dcywaekQt40wUc9PcSZrX8WdWP96EkeOJ+g==",
"license": "MIT",
"dependencies": {
"@aws-sdk/client-s3": "^3.665.0",
"@aws-sdk/lib-storage": "^3.665.0",
"@aws-sdk/s3-request-presigner": "^3.665.0",
- "@tagspaces/tagspaces-common": "^4.5.86",
+ "@tagspaces/tagspaces-common": "^4.5.88",
"crypto-js": "^4.2.0"
}
},
"node_modules/@tagspaces/tagspaces-common-cordova": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.86.tgz",
- "integrity": "sha512-/W90KAAS6SYb0AuiiVm22cSFUV3ilBD3YKsidj1OO1FR00p0rwbNfR1sHpmsha8ji/N9kwdwHLouFq+HN4hedQ==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.88.tgz",
+ "integrity": "sha512-ffBa7SLmha49uoGx+Zi4BZhaBXKmeUV/t5VakVgbXzZZnRUgrx8LEVSAgMtUrK4iBJVS58SdlUCm5Z55oWNOVw==",
"license": "MIT",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.86"
+ "@tagspaces/tagspaces-common": "^4.5.88"
}
},
"node_modules/@tagspaces/tagspaces-common/node_modules/cssstyle": {
@@ -19283,18 +19283,18 @@
}
},
"node_modules/@tagspaces/tagspaces-indexer": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.86.tgz",
- "integrity": "sha512-zOvdcmW2BPyIp/7IxNTMOdATLoyg1HMoImFMLz4RFz8GZyU8CevDY0rq2trIM56tgMfg/QE2tZkU4ECaaMjY0A==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.88.tgz",
+ "integrity": "sha512-PtiN3ZlXrORieJR9pRonV2DLOcwvsjRu6/yNkHHwAmvQm2TRp6dymmoY0DraUFw28UnJNBorFmd0gOdb5fh59w==",
"license": "MIT",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.86"
+ "@tagspaces/tagspaces-common": "^4.5.88"
}
},
"node_modules/@tagspacespro/tagspacespro": {
- "version": "5.0.165",
- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.165/c858c1921edcc65348508821c1b948549a6145dd",
- "integrity": "sha512-skA0U+r80xnzIV4g0Pc4M7Et5aSiiFuhm0IiODEzuYrwro4TvLSJ2mz7/rhEUab8bcV90DroZG52/dpMDDA9YA==",
+ "version": "5.0.167-alpha.2",
+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.167-alpha.2/59e6dede555b0863493b56008900f05f77adcb33",
+ "integrity": "sha512-TGB3KxyVuiMyVts/UMm9FJ9jqTN7ClSItmOpXoUWFKDprLvSVOv6HJIBf9Ragh3f63YgOJZnE+LKFQLMJhIDYA==",
"license": "Proprietary",
"optional": true
},
diff --git a/package.json b/package.json
index cd2de996f..ed3e58711 100644
--- a/package.json
+++ b/package.json
@@ -172,10 +172,10 @@
"@mui/lab": "7.0.0-beta.14",
"@mui/material": "^7.1.2",
"@mui/x-date-pickers": "^8.6.0",
- "@tagspaces/tagspaces-common": "4.5.86",
- "@tagspaces/tagspaces-common-aws3": "4.5.86",
- "@tagspaces/tagspaces-common-cordova": "4.5.86",
- "@tagspaces/tagspaces-indexer": "4.5.86",
+ "@tagspaces/tagspaces-common": "4.5.88",
+ "@tagspaces/tagspaces-common-aws3": "4.5.88",
+ "@tagspaces/tagspaces-common-cordova": "4.5.88",
+ "@tagspaces/tagspaces-indexer": "4.5.88",
"aws-amplify": "^4.3.8",
"clone": "^2.1.2",
"coordinate-parser": "^1.0.7",
@@ -245,7 +245,7 @@
"zod-to-json-schema": "^3.24.1"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.166"
+ "@tagspacespro/tagspacespro": "5.0.167-alpha.2"
},
"devDependencies": {
"@electron/notarize": "^2.5.0",
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 6dfb85515..9ca3b0b28 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -12,8 +12,8 @@
"dependencies": {
"@elife/pm2": "3.6.1",
"@tagspaces/extensions": "1.0.196",
- "@tagspaces/tagspaces-common-node": "4.5.86",
- "@tagspaces/tagspaces-ws": "4.5.87",
+ "@tagspaces/tagspaces-common-node": "4.5.88",
+ "@tagspaces/tagspaces-ws": "4.5.88",
"sharp": "0.32.6",
"ws": "8.18.1"
},
@@ -160,9 +160,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.86.tgz",
- "integrity": "sha512-K5cC/iqWhaJ7Rw4VqPVmblQRn0kp4/jFpLpuexRZnrJ4QMl1v01oflKBUGCRaP3hkrQT2AjdiKG9Eky23AsWuQ==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.88.tgz",
+ "integrity": "sha512-WpDHK9zBcVtRW8iIRgLE5tFg/LWLArQ05g/K3E+2huCntJBan7VAknsWDZokxeXsgpmC/2d7ckQGnw5cpO5ofA==",
"dependencies": {
"dompurify": "^3.2.3",
"dotenv": "^16.0.2",
@@ -173,22 +173,22 @@
}
},
"node_modules/@tagspaces/tagspaces-common-node": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.86.tgz",
- "integrity": "sha512-ymzguGOfZb593tFh5Bo76BOkut4QUqVy2hTOJFaYD7YPWncXvN0JoK6VJQxE0+2Ws48DjTP8XILSQX7bU/ZMrQ==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.88.tgz",
+ "integrity": "sha512-vaRT6VB4jV8gHVTG4//UdJUKHT2YHAoULHcq5m35O1mHwgWs4LJiqmK5mrDJKljMk8qgOPUVA0ztHwZiKB5tJA==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.86",
+ "@tagspaces/tagspaces-common": "^4.5.88",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0"
}
},
"node_modules/@tagspaces/tagspaces-indexer": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.86.tgz",
- "integrity": "sha512-zOvdcmW2BPyIp/7IxNTMOdATLoyg1HMoImFMLz4RFz8GZyU8CevDY0rq2trIM56tgMfg/QE2tZkU4ECaaMjY0A==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.88.tgz",
+ "integrity": "sha512-PtiN3ZlXrORieJR9pRonV2DLOcwvsjRu6/yNkHHwAmvQm2TRp6dymmoY0DraUFw28UnJNBorFmd0gOdb5fh59w==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.86"
+ "@tagspaces/tagspaces-common": "^4.5.88"
}
},
"node_modules/@tagspaces/tagspaces-pdf-extraction": {
@@ -209,25 +209,25 @@
}
},
"node_modules/@tagspaces/tagspaces-workers": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.86.tgz",
- "integrity": "sha512-ToDKL980IYBoZ3NDOU5pAwOXiXA+JoGUPrMHsjn/08g94K3QgJESDdhX39zEIeiKyuI8OX+V4hmPV5T57fyyyw==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.88.tgz",
+ "integrity": "sha512-S/BgdSklocuvUDt1uYuz5bozyHsmKGBerKe85Zf+5ffAAZbwcFTYZ95A/caisAjOwlBcXRt8Os2VjTwAO7pdjg==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.86",
- "@tagspaces/tagspaces-common-node": "^4.5.86",
+ "@tagspaces/tagspaces-common": "^4.5.88",
+ "@tagspaces/tagspaces-common-node": "^4.5.88",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
"@tagspaces/tagspaces-thumbgen-image": "^4.5.60",
"fswin": "^3.24.829"
}
},
"node_modules/@tagspaces/tagspaces-ws": {
- "version": "4.5.87",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.87.tgz",
- "integrity": "sha512-dr+cyOywc1GGHHIw4Ll7fcsMYecy5IBGu6fB/qV9kb9myGCQOK8igbVUPhSBJqb+9cZ33zkn8Uv2+H9wDLjBdA==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.88.tgz",
+ "integrity": "sha512-M+fN/kAY3w6Aqmx9L8kZ/x4LcEMiRfuZOgT9PYTYXPJCkXxhcvML1Qq3SXF8Y/2iZq3LoMKm2+ZjZw46A1LLiQ==",
"dependencies": {
- "@tagspaces/tagspaces-indexer": "^4.5.86",
+ "@tagspaces/tagspaces-indexer": "^4.5.88",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
- "@tagspaces/tagspaces-workers": "^4.5.86",
+ "@tagspaces/tagspaces-workers": "^4.5.88",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^9.0.2",
"ws": "^8.18.3"
@@ -616,9 +616,9 @@
}
},
"node_modules/dotenv": {
- "version": "16.6.0",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.0.tgz",
- "integrity": "sha512-Omf1L8paOy2VJhILjyhrhqwLIdstqm1BvcDPKg4NGAlkwEu9ODyrFbvk8UymUOMCT+HXo31jg1lArIrVAAhuGA==",
+ "version": "16.6.1",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+ "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
"engines": {
"node": ">=12"
},
@@ -1891,9 +1891,9 @@
}
},
"@tagspaces/tagspaces-common": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.86.tgz",
- "integrity": "sha512-K5cC/iqWhaJ7Rw4VqPVmblQRn0kp4/jFpLpuexRZnrJ4QMl1v01oflKBUGCRaP3hkrQT2AjdiKG9Eky23AsWuQ==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.88.tgz",
+ "integrity": "sha512-WpDHK9zBcVtRW8iIRgLE5tFg/LWLArQ05g/K3E+2huCntJBan7VAknsWDZokxeXsgpmC/2d7ckQGnw5cpO5ofA==",
"requires": {
"dompurify": "^3.2.3",
"dotenv": "^16.0.2",
@@ -1904,22 +1904,22 @@
}
},
"@tagspaces/tagspaces-common-node": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.86.tgz",
- "integrity": "sha512-ymzguGOfZb593tFh5Bo76BOkut4QUqVy2hTOJFaYD7YPWncXvN0JoK6VJQxE0+2Ws48DjTP8XILSQX7bU/ZMrQ==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.88.tgz",
+ "integrity": "sha512-vaRT6VB4jV8gHVTG4//UdJUKHT2YHAoULHcq5m35O1mHwgWs4LJiqmK5mrDJKljMk8qgOPUVA0ztHwZiKB5tJA==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.86",
+ "@tagspaces/tagspaces-common": "^4.5.88",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0"
}
},
"@tagspaces/tagspaces-indexer": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.86.tgz",
- "integrity": "sha512-zOvdcmW2BPyIp/7IxNTMOdATLoyg1HMoImFMLz4RFz8GZyU8CevDY0rq2trIM56tgMfg/QE2tZkU4ECaaMjY0A==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.88.tgz",
+ "integrity": "sha512-PtiN3ZlXrORieJR9pRonV2DLOcwvsjRu6/yNkHHwAmvQm2TRp6dymmoY0DraUFw28UnJNBorFmd0gOdb5fh59w==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.86"
+ "@tagspaces/tagspaces-common": "^4.5.88"
}
},
"@tagspaces/tagspaces-pdf-extraction": {
@@ -1940,25 +1940,25 @@
}
},
"@tagspaces/tagspaces-workers": {
- "version": "4.5.86",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.86.tgz",
- "integrity": "sha512-ToDKL980IYBoZ3NDOU5pAwOXiXA+JoGUPrMHsjn/08g94K3QgJESDdhX39zEIeiKyuI8OX+V4hmPV5T57fyyyw==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.88.tgz",
+ "integrity": "sha512-S/BgdSklocuvUDt1uYuz5bozyHsmKGBerKe85Zf+5ffAAZbwcFTYZ95A/caisAjOwlBcXRt8Os2VjTwAO7pdjg==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.86",
- "@tagspaces/tagspaces-common-node": "^4.5.86",
+ "@tagspaces/tagspaces-common": "^4.5.88",
+ "@tagspaces/tagspaces-common-node": "^4.5.88",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
"@tagspaces/tagspaces-thumbgen-image": "^4.5.60",
"fswin": "^3.24.829"
}
},
"@tagspaces/tagspaces-ws": {
- "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==",
+ "version": "4.5.88",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.88.tgz",
+ "integrity": "sha512-M+fN/kAY3w6Aqmx9L8kZ/x4LcEMiRfuZOgT9PYTYXPJCkXxhcvML1Qq3SXF8Y/2iZq3LoMKm2+ZjZw46A1LLiQ==",
"requires": {
- "@tagspaces/tagspaces-indexer": "^4.5.86",
+ "@tagspaces/tagspaces-indexer": "^4.5.88",
"@tagspaces/tagspaces-pdf-extraction": "^4.5.53",
- "@tagspaces/tagspaces-workers": "^4.5.86",
+ "@tagspaces/tagspaces-workers": "^4.5.88",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^9.0.2",
"ws": "^8.18.3"
@@ -2226,9 +2226,9 @@
}
},
"dotenv": {
- "version": "16.6.0",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.0.tgz",
- "integrity": "sha512-Omf1L8paOy2VJhILjyhrhqwLIdstqm1BvcDPKg4NGAlkwEu9ODyrFbvk8UymUOMCT+HXo31jg1lArIrVAAhuGA=="
+ "version": "16.6.1",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+ "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow=="
},
"dunder-proto": {
"version": "1.0.1",
diff --git a/release/app/package.json b/release/app/package.json
index c419f9a3a..573b06e51 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -19,8 +19,8 @@
"dependencies": {
"@elife/pm2": "3.6.1",
"@tagspaces/extensions": "1.0.196",
- "@tagspaces/tagspaces-common-node": "4.5.86",
- "@tagspaces/tagspaces-ws": "4.5.87",
+ "@tagspaces/tagspaces-common-node": "4.5.88",
+ "@tagspaces/tagspaces-ws": "4.5.88",
"sharp": "0.32.6",
"ws": "8.18.1"
},
diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsx
index ccc4d4956..b232770cf 100644
--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx
+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx
@@ -1533,11 +1533,17 @@ export const DirectoryContentContextProvider = ({
location?.getDirSeparator(),
);
let thumbPath;
- if (meta.some((metaFile) => thumbDirPath.endsWith(metaFile.path))) {
- thumbPath =
- location.haveObjectStoreSupport() || location.haveWebDavSupport()
+ const metaFile = meta.find((metaFile) =>
+ thumbDirPath.endsWith(metaFile.path),
+ );
+ if (metaFile) {
+ thumbPath = await location.getThumbPath(
+ thumbDirPath,
+ metaFile.lmdt, //? metaFile.lmdt : new Date().getTime(),
+ );
+ /*location.haveObjectStoreSupport() || location.haveWebDavSupport()
? await location.getURLforPathInt(thumbDirPath)
- : thumbDirPath;
+ : thumbDirPath;*/
}
if (
meta.some((metaFile) => metaFilePath.endsWith(metaFile.path)) &&
diff --git a/src/renderer/utils/CommonLocation.ts b/src/renderer/utils/CommonLocation.ts
index 01086994e..b86cdbca9 100644
--- a/src/renderer/utils/CommonLocation.ts
+++ b/src/renderer/utils/CommonLocation.ts
@@ -156,20 +156,28 @@ export class CommonLocation implements TS.Location {
* normalize path for URL is always '/'
*/
normalizeUrl = (url: string) => {
- let normalizedUrl = url;
- if (this.getDirSeparator() !== '/') {
- if (url) {
- normalizedUrl = url.replaceAll(this.getDirSeparator(), '/');
- }
- }
- if (
- !normalizedUrl.startsWith('http') &&
- !AppConfig.isWin &&
- !normalizedUrl.startsWith('/')
- ) {
- normalizedUrl = '/' + normalizedUrl;
+ if (!url) return '';
+
+ // 1) swap out Windows separators for '/'
+ let normalized =
+ this.getDirSeparator() !== '/'
+ ? url.replaceAll(this.getDirSeparator(), '/')
+ : url;
+
+ // 2) pull off any leading protocol so we don't collapse its "://"
+ const protocolMatch = normalized.match(/^[a-z]+:\/\//i);
+ const protocol = protocolMatch?.[0] || '';
+ let rest = protocol ? normalized.slice(protocol.length) : normalized;
+
+ // 3) collapse any sequence of 2+ slashes into one
+ rest = rest.replace(/\/{2,}/g, '/');
+
+ // 4) ensure a leading slash for non‑HTTP URLs on non‑Windows
+ if (!protocol && !AppConfig.isWin && !rest.startsWith('/')) {
+ rest = '/' + rest;
}
- return normalizedUrl;
+
+ return protocol + rest;
};
haveObjectStoreSupport = (): boolean => this.type === locationType.TYPE_CLOUD;
diff --git a/tests/e2e/perspective-kanban.helpers.js b/tests/e2e/perspective-kanban.helpers.js
new file mode 100644
index 000000000..a89413f93
--- /dev/null
+++ b/tests/e2e/perspective-kanban.helpers.js
@@ -0,0 +1,23 @@
+/* Copyright (c) 2016-present - TagSpaces GmbH. All rights reserved. */
+
+import { clickOn, expectElementExist, typeInputValue } from './general.helpers';
+
+export async function createColumn(columnName) {
+ 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,
+ );
+}
+
+export async function createMdCard(cardName, column = 'empty_folder') {
+ await clickOn('[data-tid=createCard_' + column + ']');
+ await typeInputValue('[data-tid=newEntryDialogInputTID] input', cardName, 0);
+ await clickOn('[data-tid=createMarkdownButton]');
+
+ await expectElementExist('[data-tid=fsEntryName_' + cardName + '_md]', true);
+}
diff --git a/tests/e2e/perspective-kanban.pw.e2e.js b/tests/e2e/perspective-kanban.pw.e2e.js
index 2a8909a4c..c48672c25 100644
--- a/tests/e2e/perspective-kanban.pw.e2e.js
+++ b/tests/e2e/perspective-kanban.pw.e2e.js
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2016-present - TagSpaces GmbH. All rights reserved.
*/
-import { test, expect } from './fixtures';
+import { expect, test } from './fixtures';
import {
defaultLocationName,
createPwMinioLocation,
@@ -11,17 +11,17 @@ import {
import {
clickOn,
expectElementExist,
+ getAttribute,
+ getElementScreenshot,
getGridFileSelector,
isDisplayed,
- openFolder,
+ rightClickOn,
setPerspectiveSetting,
- takeScreenshot,
typeInputValue,
+ waitUntilChanged,
} from './general.helpers';
import {
- createFileS3,
createFolderS3,
- createLocalFile,
createLocalFolder,
startTestingApp,
stopApp,
@@ -29,6 +29,8 @@ import {
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../src/renderer/services/test';
+import { createColumn, createMdCard } from './perspective-kanban.helpers';
+import { AddRemovePropertiesTags } from './file.properties.helpers';
test.beforeAll(async ({ isWeb, isS3, webServerPort }, testInfo) => {
if (isS3) {
@@ -118,6 +120,9 @@ test.describe('TST49 - Perspective KanBan', () => {
});
test('TST4902 - Show current folder [web,minio,electron,_pro]', async () => {
+ if (await isDisplayed('[data-tid=hideFolderContentTID]')) {
+ await clickOn('[data-tid=hideFolderContentTID]');
+ }
await expectElementExist(
'[data-tid=empty_folderKanBanColumnTID]',
true,
@@ -139,20 +144,93 @@ test.describe('TST49 - Perspective KanBan', () => {
});
test('TST4903 - Create new columns(sub-folder) [web,minio,electron,_pro]', async () => {
- const columnName = 'testFolder';
- await clickOn('[data-tid=createKanBanColumnTID]');
+ await createColumn('testFolder');
+ });
+
+ test('TST4904 - Rename column [web,minio,electron,_pro]', async () => {
+ const columnName = 'testFolderTmp';
+ const newColumnName = 'testFolderRenamed';
+ //create new folder
+ await createColumn(columnName);
- await typeInputValue('[data-tid=directoryName] input', columnName, 0);
- await clickOn('[data-tid=confirmCreateNewDirectory]');
+ //rename folder
+ await clickOn('[data-tid=' + columnName + 'KanBanColumnActionTID]');
+ await clickOn('[data-tid=renameDirectory]');
+ await typeInputValue(
+ '[data-tid=renameEntryDialogInput] input',
+ newColumnName,
+ 0,
+ );
+ await clickOn('[data-tid=confirmRenameEntry]');
await expectElementExist(
- '[data-tid=' + columnName + 'KanBanColumnTID]',
+ '[data-tid=' + newColumnName + 'KanBanColumnTID]',
true,
5000,
);
});
- test('TST4904 - Rename column [web,minio,electron,_pro]', async () => {});
+ test('TST4905 - Create card in column [web,minio,electron,_pro]', async () => {
+ await createMdCard('testCard');
+ });
+
+ test('TST4906 - Rename card in column [web,minio,electron,_pro]', async () => {
+ const cardName = 'testCard1';
+ const newCardName = 'testCard2';
+ await createMdCard(cardName);
+
+ await rightClickOn('[data-tid=fsEntryName_' + cardName + '_md]');
+ await clickOn('[data-tid=fileMenuRenameFile]');
+ await typeInputValue(
+ '[data-tid=renameEntryDialogInput] input',
+ newCardName,
+ 0,
+ );
+ await clickOn('[data-tid=confirmRenameEntry]');
+
+ await expectElementExist(
+ '[data-tid=fsEntryName_' + newCardName + '_md]',
+ true,
+ );
+ });
+
+ test('TST4907 - Add and show tag to column [web,minio,electron,_pro]', async () => {
+ const columnName = 'tagsColumn';
+
+ await setPerspectiveSetting(
+ 'kanban',
+ '[data-tid=kanBanPerspectiveToggleShowDetails]',
+ );
+ //create new folder
+ await createColumn(columnName);
+ await clickOn('[data-tid=' + columnName + 'KanBanColumnActionTID]');
+ await clickOn('[data-tid=showProperties]');
+ await AddRemovePropertiesTags(['test-tag1', 'test-tag2'], {
+ add: true,
+ remove: false,
+ });
+ });
+
+ test('TST4908 - Add and show tag to board [web,minio,electron,_pro]', async () => {
+ if (await isDisplayed('[data-tid=hideFolderContentTID]')) {
+ await clickOn('[data-tid=hideFolderContentTID]');
+ }
+ await setPerspectiveSetting(
+ 'kanban',
+ '[data-tid=kanBanPerspectiveToggleShowDetails]',
+ );
+ await clickOn('[data-tid=folderContainerOpenDirMenu]');
+ await clickOn('[data-tid=showProperties]');
+ await expectElementExist(
+ '[data-tid=OpenedTID' + dataTidFormat(defaultLocationName) + ']',
+ true,
+ 8000,
+ );
+ await AddRemovePropertiesTags(['test-tag1', 'test-tag2'], {
+ add: true,
+ remove: false,
+ });
+ });
test('TST4909 - move with copy/move file dialog [web,minio,electron,_pro]', async () => {
const fileName = 'sample.bmp';
@@ -215,4 +293,49 @@ test.describe('TST49 - Perspective KanBan', () => {
5000,
);
});
+
+ test('TST4911 - Load folder color [web,minio,electron,_pro]', async () => {
+ const columnName = 'testColorColumn';
+
+ //create new folder
+ await createColumn(columnName);
+ await clickOn('[data-tid=' + columnName + 'KanBanColumnActionTID]');
+ await clickOn('[data-tid=showProperties]');
+
+ const targetSelector =
+ 'xpath=(//div[@data-tid="' +
+ columnName +
+ 'KanBanColumnTID"]//parent::div)[1]';
+ const initScreenshot = await getElementScreenshot(targetSelector);
+ const initStyle = await getAttribute(targetSelector, 'style');
+ //console.log(initStyle);
+ await clickOn('[data-tid=changeBackgroundColorTID]');
+ await clickOn('[data-tid=backgroundTID1]');
+
+ await waitUntilChanged(
+ targetSelector,
+ initStyle, //'height: 100%; background: rgba(0, 0, 0, 0.267);',
+ 'style',
+ 10000,
+ );
+
+ const withBgnColorScreenshot = await getElementScreenshot(targetSelector);
+ const bgStyle = await getAttribute(targetSelector, 'style');
+ //console.log(bgStyle);
+ expect(initScreenshot).not.toBe(withBgnColorScreenshot);
+
+ // remove background
+ await clickOn('[data-tid=backgroundClearTID]');
+ await clickOn('[data-tid=confirmConfirmResetColorDialog]');
+
+ await waitUntilChanged(
+ targetSelector,
+ bgStyle, //'height: 100%; background: transparent;',
+ 'style',
+ 10000,
+ );
+
+ //const bgnRemovedScreenshot = await getElementScreenshot(targetSelector);
+ //expect(initScreenshot).toBe(bgnRemovedScreenshot);
+ });
});