From 024a3ec4c38fee44624f4014a2be45e6dc7566e9 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Mon, 4 Apr 2022 13:39:24 +0200 Subject: [PATCH 001/176] Add filter for rank --- src/components/navigation-drawers/Toolbar.vue | 22 +++--- src/components/taxon/TaxaBrowser.vue | 72 +++++++++++++------ .../ncbi/CachedNcbiResponseCommunicator.ts | 13 ++-- 3 files changed, 71 insertions(+), 36 deletions(-) diff --git a/src/components/navigation-drawers/Toolbar.vue b/src/components/navigation-drawers/Toolbar.vue index 88e8f757..408a178a 100644 --- a/src/components/navigation-drawers/Toolbar.vue +++ b/src/components/navigation-drawers/Toolbar.vue @@ -60,17 +60,17 @@ Single peptide analysis - - - - - - - - - - - + + + mdi-database-cog + + + Custom databases + + - +
+ + + + mdi-magnify + + +
+ + +
+ +
@@ -38,7 +53,7 @@ + + diff --git a/src/logic/communication/taxonomic/ncbi/CachedNcbiResponseCommunicator.ts b/src/logic/communication/taxonomic/ncbi/CachedNcbiResponseCommunicator.ts index 8560a425..d10f7a7e 100644 --- a/src/logic/communication/taxonomic/ncbi/CachedNcbiResponseCommunicator.ts +++ b/src/logic/communication/taxonomic/ncbi/CachedNcbiResponseCommunicator.ts @@ -124,9 +124,9 @@ export default class CachedNcbiResponseCommunicator extends NcbiResponseCommunic sortDescending: boolean = true ): NcbiId[] { return this.db.prepare( - `SELECT id, name, rank FROM taxons WHERE name LIKE ? AND rank LIKE ? ORDER BY ${sortBy} ${ sortDescending ? "ASC": "DESC" } LIMIT ? OFFSET ?` + `SELECT id, name, rank FROM taxons WHERE name LIKE ? AND rank = ? ORDER BY ${sortBy} ${ sortDescending ? "ASC": "DESC" } LIMIT ? OFFSET ?` ) - .all(`%${nameFilter}%`, `%${rankFilter.toLowerCase()}%`, end - start, start) + .all(`%${nameFilter}%`, rankFilter.toLowerCase(), end - start, start) .map((item: any) => item.id); } } From 166c97804f3f77e40eabdf1722066d83e6d36dd3 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 4 May 2022 10:34:30 +0200 Subject: [PATCH 003/176] Fix metadata not written properly --- src/components/pages/CustomDatabasePage.vue | 50 ++++++-- .../docker/DockerCommunicator.ts | 72 ++++++----- .../docker/CustomDatabaseManager.ts | 23 ++-- src/state/DockerStore.ts | 115 +++++++++--------- 4 files changed, 156 insertions(+), 104 deletions(-) diff --git a/src/components/pages/CustomDatabasePage.vue b/src/components/pages/CustomDatabasePage.vue index c1b9dc6b..1bc2b5f1 100644 --- a/src/components/pages/CustomDatabasePage.vue +++ b/src/components/pages/CustomDatabasePage.vue @@ -25,19 +25,48 @@