diff options
Diffstat (limited to 'app/assets/javascripts/search/sidebar')
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/search/sidebar/components/app.vue b/app/assets/javascripts/search/sidebar/components/app.vue index 99cf16c8350..5c7cbeac5b2 100644 --- a/app/assets/javascripts/search/sidebar/components/app.vue +++ b/app/assets/javascripts/search/sidebar/components/app.vue @@ -13,9 +13,9 @@ export default { ConfidentialityFilter, }, computed: { - ...mapState(['query']), + ...mapState(['urlQuery', 'sidebarDirty']), showReset() { - return this.query.state || this.query.confidential; + return this.urlQuery.state || this.urlQuery.confidential; }, }, methods: { @@ -32,7 +32,7 @@ export default { <status-filter /> <confidentiality-filter /> <div class="gl-display-flex gl-align-items-center gl-mt-3"> - <gl-button category="primary" variant="confirm" size="small" type="submit"> + <gl-button category="primary" variant="confirm" type="submit" :disabled="!sidebarDirty"> {{ __('Apply') }} </gl-button> <gl-link v-if="showReset" class="gl-ml-auto" @click="resetQuery">{{ diff --git a/app/assets/javascripts/search/sidebar/components/radio_filter.vue b/app/assets/javascripts/search/sidebar/components/radio_filter.vue index 73911b9d319..aa7c26b8044 100644 --- a/app/assets/javascripts/search/sidebar/components/radio_filter.vue +++ b/app/assets/javascripts/search/sidebar/components/radio_filter.vue @@ -1,7 +1,7 @@ <script> import { GlFormRadioGroup, GlFormRadio } from '@gitlab/ui'; import { mapState, mapActions } from 'vuex'; -import { sprintf, s__ } from '~/locale'; +import { sprintf, __ } from '~/locale'; export default { name: 'RadioFilter', @@ -49,7 +49,7 @@ export default { ...mapActions(['setQuery']), radioLabel(filter) { return filter.value === this.ANY.value - ? sprintf(s__('Any %{header}'), { header: this.filterData.header.toLowerCase() }) + ? sprintf(__('Any %{header}'), { header: this.filterData.header.toLowerCase() }) : filter.label; }, }, diff --git a/app/assets/javascripts/search/sidebar/constants/state_filter_data.js b/app/assets/javascripts/search/sidebar/constants/state_filter_data.js index 7c9a029ffe4..2f9f8a7cb46 100644 --- a/app/assets/javascripts/search/sidebar/constants/state_filter_data.js +++ b/app/assets/javascripts/search/sidebar/constants/state_filter_data.js @@ -5,7 +5,7 @@ const header = __('Status'); const filters = { ANY: { label: __('Any'), - value: 'all', + value: null, }, OPEN: { label: __('Open'), |