Merge pull request #55 from gogepp/dev

mboudet · web-flow · commit be5e811da60d · 2023-12-07T16:21:24.000+01:00
Release 0.4.12
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## [0.4.12] 2023-12-07
+
+### Fixed
+
+- Fixed filtering when using ES search
+
 ## [0.4.11] 2023-11-29
 
 ### Added
diff --git a/imports/api/publications.js b/imports/api/publications.js
@@ -115,7 +115,8 @@ Meteor.publish({
           }
         })
       }
-      transformedQuery = {genomeId: { $in: queryGenomeIds }, $or: geneResults}
+      delete query.query
+      transformedQuery = {...query, genomeId: { $in: queryGenomeIds }, $or: geneResults}
     } else {
       transformedQuery = { ...query, genomeId: { $in: queryGenomeIds } };
     }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "genoboo",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "repository": "https://github.com/gogepp/genoboo",
   "description": "A portable website for browsing and querying genome sequences and annotations. Forked from genenotebook",
   "license": "AGPL-3.0",

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,8 @@ Meteor.publish({`
`115`	`115`	`}`
`116`	`116`	`})`
`117`	`117`	`}`
`118`		`- transformedQuery = {genomeId: { $in: queryGenomeIds }, $or: geneResults}`
	`118`	`+ delete query.query`
	`119`	`+ transformedQuery = {...query, genomeId: { $in: queryGenomeIds }, $or: geneResults}`
`119`	`120`	`} else {`
`120`	`121`	`transformedQuery = { ...query, genomeId: { $in: queryGenomeIds } };`
`121`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "genoboo",`
`3`		`- "version": "0.4.11",`
	`3`	`+ "version": "0.4.12",`
`4`	`4`	`"repository": "https://github.com/gogepp/genoboo",`
`5`	`5`	`"description": "A portable website for browsing and querying genome sequences and annotations. Forked from genenotebook",`
`6`	`6`	`"license": "AGPL-3.0",`