From 4cc02ffb3127f38d99f1972994dfadb6b467f1c2 Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 2 Jul 2021 23:22:10 +0200 Subject: [PATCH] fix search --- package-lock.json | 40 ++++++++++++------------- package.json | 8 ++--- src/public/app/services/froca.js | 4 +-- src/public/app/widgets/quick_search.js | 4 +-- src/public/app/widgets/search_result.js | 1 + 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index d32440d19..b130394da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2970,9 +2970,9 @@ } }, "electron": { - "version": "13.1.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.4.tgz", - "integrity": "sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q==", + "version": "13.1.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.5.tgz", + "integrity": "sha512-ZoMCcPQNs/zO/Zdb5hq5H+rwRaKrdI3/sfXEwBVMx7f5jwa9jPQB3dZ2+7t59uD9VcFAWsH/pozr8nPPlv0tyw==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -3769,9 +3769,9 @@ } }, "electron-to-chromium": { - "version": "1.3.761", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.761.tgz", - "integrity": "sha512-7a/wV/plM/b95XjTdA2Q4zAxxExTDKkNQpTiaU/nVT8tGCQVtX9NsnTjhALBFICpOB58hU6xg5fFC3CT2Bybpg==", + "version": "1.3.765", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.765.tgz", + "integrity": "sha512-4NhcsfZYlr1x4FehYkK+R9CNNTOZ8vLcIu8Y1uWehxYp5r/jlCGAfBqChIubEfdtX+rBQpXx4yJuX/dzILH/nw==", "dev": true }, "electron-window-state": { @@ -4055,9 +4055,9 @@ "integrity": "sha512-o1JrraDGpMFaPtkuvtZ4cIBC/xuJn90KBGlxRrm3FxcfER1bPaBnBsTnypF65p+CMTXul2KrZodb3Vv3MScB4A==" }, "express-rate-limit": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.2.6.tgz", - "integrity": "sha512-nE96xaxGfxiS5jP3tD3kIW1Jg9yQgX0rXCs3rCkZtmbWHEGyotwaezkLj7bnB41Z0uaOLM8W4AX6qHao4IZ2YA==" + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.3.0.tgz", + "integrity": "sha512-qJhfEgCnmteSeZAeuOKQ2WEIFTX5ajrzE0xS6gCOBCoRQcU+xEzQmgYQQTpzCcqUAAzTEtu4YEih4pnLfvNtew==" }, "express-session": { "version": "1.17.2", @@ -5127,19 +5127,19 @@ } }, "jasmine": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.7.0.tgz", - "integrity": "sha512-wlzGQ+cIFzMEsI+wDqmOwvnjTvolLFwlcpYLCqSPPH0prOQaW3P+IzMhHYn934l1imNvw07oCyX+vGUv3wmtSQ==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.8.0.tgz", + "integrity": "sha512-kdQ3SfcNpMbbMdgJPLyFe9IksixdnrgYaCJapP9sS0aLgdWdIZADNXEr+11Zafxm1VDfRSC5ZL4fzXT0bexzXw==", "dev": true, "requires": { "glob": "^7.1.6", - "jasmine-core": "~3.7.0" + "jasmine-core": "~3.8.0" } }, "jasmine-core": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.7.1.tgz", - "integrity": "sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.8.0.tgz", + "integrity": "sha512-zl0nZWDrmbCiKns0NcjkFGYkVTGCPUgoHypTaj+G2AzaWus7QGoXARSlYsSle2VRpSdfJmM+hzmFKzQNhF2kHg==", "dev": true }, "jest-worker": { @@ -8226,9 +8226,9 @@ "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==" }, "webpack": { - "version": "5.41.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.41.1.tgz", - "integrity": "sha512-AJZIIsqJ/MVTmegEq9Tlw5mk5EHdGiJbDdz9qP15vmUH+oxI1FdWcL0E9EO8K/zKaRPWqEs7G/OPxq1P61u5Ug==", + "version": "5.42.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz", + "integrity": "sha512-Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", @@ -8236,7 +8236,7 @@ "@webassemblyjs/ast": "1.11.0", "@webassemblyjs/wasm-edit": "1.11.0", "@webassemblyjs/wasm-parser": "1.11.0", - "acorn": "^8.2.1", + "acorn": "^8.4.1", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.8.0", diff --git a/package.json b/package.json index 71bdafaeb..cebfdaffb 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "electron-window-state": "5.0.3", "express": "4.17.1", "express-partial-content": "^1.0.2", - "express-rate-limit": "^5.2.6", + "express-rate-limit": "5.3.0", "express-session": "1.17.2", "fs-extra": "10.0.0", "helmet": "4.6.0", @@ -81,16 +81,16 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "13.1.4", + "electron": "13.1.5", "electron-builder": "22.11.7", "electron-packager": "15.2.0", "electron-rebuild": "2.3.5", "esm": "3.2.25", - "jasmine": "3.7.0", + "jasmine": "3.8.0", "jsdoc": "3.6.7", "lorem-ipsum": "2.0.3", "rcedit": "3.0.0", - "webpack": "5.41.1", + "webpack": "5.42.0", "webpack-cli": "4.7.2" }, "optionalDependencies": { diff --git a/src/public/app/services/froca.js b/src/public/app/services/froca.js index 48c84576f..87476432b 100644 --- a/src/public/app/services/froca.js +++ b/src/public/app/services/froca.js @@ -187,7 +187,7 @@ class Froca { } const branches = [...note.getBranches(), ...note.getChildBranches()]; -console.log("searchResultNoteIds", searchResultNoteIds); + searchResultNoteIds.forEach((resultNoteId, index) => branches.push({ // branchId should be repeatable since sometimes we reload some notes without rerendering the tree branchId: "virt-" + note.noteId + '-' + resultNoteId, @@ -197,8 +197,6 @@ console.log("searchResultNoteIds", searchResultNoteIds); fromSearchNote: true })); - console.log("branches", branches); - // update this note with standard (parent) branches + virtual (children) branches this.addResp({ notes: [note], diff --git a/src/public/app/widgets/quick_search.js b/src/public/app/widgets/quick_search.js index af7d1f9b3..30c852050 100644 --- a/src/public/app/widgets/quick_search.js +++ b/src/public/app/widgets/quick_search.js @@ -33,7 +33,7 @@ const TPL = ` -
+
@@ -50,7 +50,7 @@ export default class QuickSearchWidget extends BasicWidget { this.$dropdownToggle = this.$widget.find('.search-button'); this.$dropdownToggle.dropdown(); - this.$widget.find('.input-group-append').on('shown.bs.dropdown', () => this.search()); + this.$widget.find('.input-group-prepend').on('shown.bs.dropdown', () => this.search()); utils.bindElShortcut(this.$searchString, 'return', () => { if (this.$dropdownMenu.is(":visible")) { diff --git a/src/public/app/widgets/search_result.js b/src/public/app/widgets/search_result.js index f3f255306..159702f6e 100644 --- a/src/public/app/widgets/search_result.js +++ b/src/public/app/widgets/search_result.js @@ -41,6 +41,7 @@ export default class SearchResultWidget extends NoteContextAwareWidget { doRender() { this.$widget = $(TPL); + this.contentSized(); this.$content = this.$widget.find('.search-result-widget-content'); this.$noResults = this.$widget.find('.search-no-results'); this.$notExecutedYet = this.$widget.find('.search-not-executed-yet');