TagSpaces is an offline, open source, document manager with tagging support
fix platform version and change tags or delimiter to | (#1542)
Stanimir9cd0f0836b26
diff --git a/app/components/SearchInline.tsx b/app/components/SearchInline.tsxindex 959b6aece..833d71cb5 100644--- a/app/components/SearchInline.tsx+++ b/app/components/SearchInline.tsx@@ -184,7 +184,7 @@ const SearchInline = (props: Props) => {}if (props.searchQuery.tagsOR && props.searchQuery.tagsOR.length > 0) {props.searchQuery.tagsOR.forEach(tag => {- textQueryMask.current += ' ?' + tag.title;+ textQueryMask.current += ' |' + tag.title;});emptySearch = false;}@@ -320,8 +320,8 @@ const SearchInline = (props: Props) => {let query = textQuery.current;const tagsAND = parseTextQuery(textQuery.current, '+');query = removeTagsFromQuery(tagsAND, query, '+');- const tagsOR = parseTextQuery(textQuery.current, '?');- query = removeTagsFromQuery(tagsOR, query, '?');+ const tagsOR = parseTextQuery(textQuery.current, '|');+ query = removeTagsFromQuery(tagsOR, query, '|');const tagsNOT = parseTextQuery(textQuery.current, '-');query = removeTagsFromQuery(tagsNOT, query, '-');const searchQuery: TS.SearchQuery = {diff --git a/app/components/SearchPopover.tsx b/app/components/SearchPopover.tsxindex 30566ba9e..74a972050 100644--- a/app/components/SearchPopover.tsx+++ b/app/components/SearchPopover.tsx@@ -430,7 +430,7 @@ const SearchPopover = (props: Props) => {const tagsOR = mergeWithExtractedTags(textQuery.current,props.searchQuery.tagsOR,- '?'+ '|');const tagsNOT = mergeWithExtractedTags(textQuery.current,@@ -490,7 +490,7 @@ const SearchPopover = (props: Props) => {const tagsOR = mergeWithExtractedTags(textQuery.current,props.searchQuery.tagsOR,- '?'+ '|');const tagsNOT = mergeWithExtractedTags(textQuery.current,diff --git a/package.json b/package.jsonindex d209a14bd..5cd13aeb2 100644--- a/package.json+++ b/package.json@@ -22,9 +22,6 @@"email": "[email protected]","url": "https://www.tagspaces.org"},- "config": {- "platform": "1.0.59"- },"scripts": {"browserslist:update": "npx browserslist@latest --update-db","bs": "yarn build && yarn start",@@ -84,11 +81,11 @@"paste-android-linux": "adb shell input text '$(xclip -selection c -o)'","paste-android-macos": "adb shell input text \"'$(pbpaste)'\"","playwright-show-trace": "npx playwright show-trace \"tests/test-reports/TST0813 - Delete file [web,minio,electron].zip\"",- "postinstall-cordova": "cross-env PD_PLATFORM=cordova yarn upgrade @tagspaces/tagspaces-platforms@$npm_package_config_platform",+ "postinstall-cordova": "cross-env PD_PLATFORM=cordova yarn upgrade @tagspaces/tagspaces-platforms@$ts_platform_version","postinstall-cordova-check": "cross-env PD_PLATFORM=cordova node scripts/postinstall.js",- "postinstall-node": "cross-env PD_PLATFORM=node yarn upgrade @tagspaces/tagspaces-platforms@$npm_package_config_platform",+ "postinstall-node": "cross-env PD_PLATFORM=node yarn upgrade @tagspaces/tagspaces-platforms@$ts_platform_version","postinstall-node-check": "cross-env PD_PLATFORM=node node scripts/postinstall.js",- "postinstall-web": "cross-env PD_PLATFORM=web yarn upgrade @tagspaces/tagspaces-platforms@$npm_package_config_platform",+ "postinstall-web": "cross-env PD_PLATFORM=web yarn upgrade @tagspaces/tagspaces-platforms@$ts_platform_version","postinstall-web-check": "cross-env PD_PLATFORM=web node scripts/postinstall.js","precommit": "lint-staged","prepare-cordova": "yarn install-ext-web && yarn postinstall-cordova-check && rimraf cordova/www/dist && rimraf cordova/www/node_modules && shx cp -rL app/node_modules cordova/www && shx cp LICENSE.txt cordova/www",diff --git a/scripts/postinstall.js b/scripts/postinstall.jsindex c75a7aeb2..c44360999 100644--- a/scripts/postinstall.js+++ b/scripts/postinstall.js@@ -1,6 +1,10 @@const fs = require('fs-extra');const pathLib = require('path');const npm = require('npm');+const packageJson = require('../package.json');++process.env.ts_platform_version =+ packageJson.dependencies['@tagspaces/tagspaces-platforms'];function isInstalled(npmPackage) {// TODO check installed version