Skip to content

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

fix filter && e2e

sytolk327803abc481
diff --git a/app/perspectives/grid-perspective/hooks/SortedDirContextProvider.tsx b/app/perspectives/grid-perspective/hooks/SortedDirContextProvider.tsx
index 39ee1b7e6..e1e8ce0e6 100644
--- a/app/perspectives/grid-perspective/hooks/SortedDirContextProvider.tsx
+++ b/app/perspectives/grid-perspective/hooks/SortedDirContextProvider.tsx
@@ -89,10 +89,20 @@ export const SortedDirContextProvider = ({
}
function getSortedDirContent() {
- if (!lastSearchTimestamp) {
- // not in search mode
- return sortByCriteria(directoryContent, sortBy, orderBy);
- } else {
+ if (searchFilter) {
+ if (lastSearchTimestamp) {
+ return GlobalSearch.getInstance()
+ .getResults()
+ .filter(entry =>
+ entry.name.toLowerCase().includes(searchFilter.toLowerCase())
+ );
+ } else {
+ return sortByCriteria(directoryContent, sortBy, orderBy).filter(entry =>
+ entry.name.toLowerCase().includes(searchFilter.toLowerCase())
+ );
+ }
+ }
+ if (lastSearchTimestamp) {
if (sortBy === 'byRelevance') {
// initial search results is sorted by relevance
if (orderBy) {
@@ -102,18 +112,14 @@ export const SortedDirContextProvider = ({
}
} else {
return sortByCriteria(
- searchFilter
- ? GlobalSearch.getInstance()
- .getResults()
- .filter(entry =>
- entry.name.toLowerCase().includes(searchFilter.toLowerCase())
- )
- : GlobalSearch.getInstance().getResults(),
+ GlobalSearch.getInstance().getResults(),
sortBy,
orderBy
);
}
}
+ // not in search mode
+ return sortByCriteria(directoryContent, sortBy, orderBy);
}
const context = useMemo(() => {
diff --git a/package-lock.json b/package-lock.json
index ab31c19d8..dbaf8ac40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,7 +106,7 @@
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/register": "^7.17.7",
- "@playwright/test": "1.35.1",
+ "@playwright/test": "1.38.0",
"@tagspaces/dynamic-packages-loading": "^2.0.5",
"@types/leaflet": "^1.9.4",
"@types/react": "^18.2.18",
@@ -165,7 +165,7 @@
"mini-css-extract-plugin": "^2.6.1",
"node-polyfill-webpack-plugin": "^2.0.1",
"npm": "^8.5.5",
- "playwright": "1.35.1",
+ "playwright": "1.38.0",
"prettier": "1.19.1",
"properties-reader": "^2.2.0",
"raw-loader": "^4.0.2",
@@ -10368,22 +10368,18 @@
}
},
"node_modules/@playwright/test": {
- "version": "1.35.1",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.35.1.tgz",
- "integrity": "sha512-b5YoFe6J9exsMYg0pQAobNDR85T1nLumUYgUTtKm4d21iX2L7WqKq9dW8NGJ+2vX0etZd+Y7UeuqsxDXm9+5ZA==",
+ "version": "1.38.0",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.0.tgz",
+ "integrity": "sha512-xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw==",
"dev": true,
"dependencies": {
- "@types/node": "*",
- "playwright-core": "1.35.1"
+ "playwright": "1.38.0"
},
"bin": {
"playwright": "cli.js"
},
"engines": {
"node": ">=16"
- },
- "optionalDependencies": {
- "fsevents": "2.3.2"
}
},
"node_modules/@polka/url": {
@@ -33381,25 +33377,27 @@
}
},
"node_modules/playwright": {
- "version": "1.35.1",
- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.35.1.tgz",
- "integrity": "sha512-NbwBeGJLu5m7VGM0+xtlmLAH9VUfWwYOhUi/lSEDyGg46r1CA9RWlvoc5yywxR9AzQb0mOCm7bWtOXV7/w43ZA==",
+ "version": "1.38.0",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz",
+ "integrity": "sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==",
"dev": true,
- "hasInstallScript": true,
"dependencies": {
- "playwright-core": "1.35.1"
+ "playwright-core": "1.38.0"
},
"bin": {
"playwright": "cli.js"
},
"engines": {
"node": ">=16"
+ },
+ "optionalDependencies": {
+ "fsevents": "2.3.2"
}
},
"node_modules/playwright-core": {
- "version": "1.35.1",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz",
- "integrity": "sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg==",
+ "version": "1.38.0",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz",
+ "integrity": "sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==",
"dev": true,
"bin": {
"playwright-core": "cli.js"
@@ -50754,14 +50752,12 @@
}
},
"@playwright/test": {
- "version": "1.35.1",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.35.1.tgz",
- "integrity": "sha512-b5YoFe6J9exsMYg0pQAobNDR85T1nLumUYgUTtKm4d21iX2L7WqKq9dW8NGJ+2vX0etZd+Y7UeuqsxDXm9+5ZA==",
+ "version": "1.38.0",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.0.tgz",
+ "integrity": "sha512-xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw==",
"dev": true,
"requires": {
- "@types/node": "*",
- "fsevents": "2.3.2",
- "playwright-core": "1.35.1"
+ "playwright": "1.38.0"
}
},
"@polka/url": {
@@ -68319,18 +68315,19 @@
}
},
"playwright": {
- "version": "1.35.1",
- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.35.1.tgz",
- "integrity": "sha512-NbwBeGJLu5m7VGM0+xtlmLAH9VUfWwYOhUi/lSEDyGg46r1CA9RWlvoc5yywxR9AzQb0mOCm7bWtOXV7/w43ZA==",
+ "version": "1.38.0",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz",
+ "integrity": "sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==",
"dev": true,
"requires": {
- "playwright-core": "1.35.1"
+ "fsevents": "2.3.2",
+ "playwright-core": "1.38.0"
}
},
"playwright-core": {
- "version": "1.35.1",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz",
- "integrity": "sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg==",
+ "version": "1.38.0",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz",
+ "integrity": "sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==",
"dev": true
},
"please-upgrade-node": {
diff --git a/package.json b/package.json
index 36ac126e7..ff0c0ca14 100644
--- a/package.json
+++ b/package.json
@@ -235,7 +235,7 @@
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/register": "^7.17.7",
- "@playwright/test": "1.35.1",
+ "@playwright/test": "1.38.0",
"@tagspaces/dynamic-packages-loading": "^2.0.5",
"@types/leaflet": "^1.9.4",
"@types/react": "^18.2.18",
@@ -294,7 +294,7 @@
"mini-css-extract-plugin": "^2.6.1",
"node-polyfill-webpack-plugin": "^2.0.1",
"npm": "^8.5.5",
- "playwright": "1.35.1",
+ "playwright": "1.38.0",
"prettier": "1.19.1",
"properties-reader": "^2.2.0",
"raw-loader": "^4.0.2",
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index 537183215..ba763b831 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -487,6 +487,7 @@ export async function selectFilesByID(arrEntryIds = []) {
* @returns {Promise<*>}
*/
export async function selectRowFiles(arrIndex = []) {
+ await global.client.waitForSelector('[data-tid=openListPerspective]');
await clickOn('[data-tid=openListPerspective]');
await setGridOptions('list', false, 'gridPerspectiveEntrySizeNormal');
// const filesList = await global.client.$('[data-tid=perspectiveGridFileTable]');
@@ -746,7 +747,7 @@ export async function expectFileContain(
await expect
.poll(
async () => {
- const fLocator = await frameLocator();
+ const fLocator = await frameLocator('iframe[allowfullscreen]');
const bodyTxt = await fLocator.locator('body').innerText();
return toContainTID(bodyTxt, [txtToContain]);
},