From 8644be820fbef76412afb8ce5bd15b240f8fcb82 Mon Sep 17 00:00:00 2001 From: Billy Rennekamp Date: Tue, 29 May 2018 12:34:08 +0200 Subject: [PATCH 1/3] enough test coverage? --- CHANGELOG.md | 1 + .../components/common/NiModalSearch.vue | 2 +- .../components/govern/PageProposals.vue | 10 ++++--- .../components/monitor/PageBlocks.vue | 15 ++++++----- .../components/staking/PageStaking.vue | 10 ++++--- .../components/wallet/PageTransactions.vue | 10 ++++--- .../renderer/components/wallet/PageWallet.vue | 10 ++++--- app/src/renderer/vuex/modules/blockchain.js | 3 +++ .../components/monitor/PageBlocks.spec.js | 26 +++++++++++++++---- .../__snapshots__/PageStaking.spec.js.snap | 2 +- 10 files changed, 63 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af74f70946..7f5d6d9320 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. * The binary is now accepted if it has the same minor version instead of the path version. @faboweb * Hid staking button on wallet page @jolesbi * Increment version in package.json @jolesbi +* Made search consistent @okwme ### Fixes diff --git a/app/src/renderer/components/common/NiModalSearch.vue b/app/src/renderer/components/common/NiModalSearch.vue index 59485a7ab9..01692b6551 100644 --- a/app/src/renderer/components/common/NiModalSearch.vue +++ b/app/src/renderer/components/common/NiModalSearch.vue @@ -11,7 +11,7 @@ step="1" placeholder="View block height..." v-model="query") - btn(value="Go") + btn(value="Find") btn(type="button" icon="close" @click.native="close") form-msg(name="Query" type="numeric" v-if="!$v.filters.blocks.search.query.numeric") diff --git a/app/src/renderer/components/govern/PageProposals.vue b/app/src/renderer/components/govern/PageProposals.vue index 75784a4fb8..e16b1b42b9 100644 --- a/app/src/renderer/components/govern/PageProposals.vue +++ b/app/src/renderer/components/govern/PageProposals.vue @@ -3,9 +3,9 @@ page(title='Proposals') div(slot="menu"): tool-bar router-link(to="/proposals/new" exact v-tooltip.bottom="'New Proposal'") i.material-icons add - a(@click='setSearch(true)' v-tooltip.bottom="'Search'") + a(@click='setSearch()' v-tooltip.bottom="'Search'" :disabled="!somethingToSearch") i.material-icons search - modal-search(type="proposals") + modal-search(type="proposals" v-if="somethingToSearch") data-loading(v-if="proposals.loading") data-empty(v-else-if="proposals.length === 0") @@ -45,6 +45,9 @@ export default { }, computed: { ...mapGetters(["proposals", "filters"]), + somethingToSearch() { + return !this.proposals.loading && !!this.proposals.length + }, filteredProposals() { if (this.proposals.items && this.filters) { let query = this.filters.proposals.search.query @@ -113,7 +116,8 @@ export default { gotoNewProposal() { this.$router.push("/proposals/new") }, - setSearch(bool) { + setSearch(bool = !this.filters["proposals"].search.visible) { + if (!this.somethingToSearch) return false this.$store.commit("setSearchVisible", ["proposals", bool]) } }, diff --git a/app/src/renderer/components/monitor/PageBlocks.vue b/app/src/renderer/components/monitor/PageBlocks.vue index bbf8361737..300afc03da 100644 --- a/app/src/renderer/components/monitor/PageBlocks.vue +++ b/app/src/renderer/components/monitor/PageBlocks.vue @@ -1,10 +1,10 @@