diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-07 12:10:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-07 12:10:00 +0300 |
commit | f4a9d976cf03888fbfd81ab9813720f4e8ec8056 (patch) | |
tree | d67ce5ca8885d3f836b89be0a96d52ba602aa533 /app/assets/javascripts/runner | |
parent | 28b137b0948e74805040b0c069ea09ff91f06143 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/runner')
-rw-r--r-- | app/assets/javascripts/runner/components/runner_filtered_search_bar.vue | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/runner/components/runner_filtered_search_bar.vue b/app/assets/javascripts/runner/components/runner_filtered_search_bar.vue index f0f8bbdf5df..bff5ec9b238 100644 --- a/app/assets/javascripts/runner/components/runner_filtered_search_bar.vue +++ b/app/assets/javascripts/runner/components/runner_filtered_search_bar.vue @@ -45,7 +45,7 @@ export default { }, }, data() { - // filtered_search_bar_root.vue may mutate the inital + // filtered_search_bar_root.vue may mutate the initial // filters. Use `cloneDeep` to prevent those mutations // from affecting this component const { filters, sort } = cloneDeep(this.value); @@ -54,6 +54,14 @@ export default { initialSortBy: sort, }; }, + computed: { + validTokens() { + // Some filters are only available in EE + // EE-only tokens are represented by `null` or `undefined` + // values when in CE + return this.tokens.filter(Boolean); + }, + }, methods: { onFilter(filters) { // Apply new filters, from page 1 @@ -83,7 +91,7 @@ export default { recent-searches-storage-key="runners-search" :sort-options="$options.sortOptions" :initial-filter-value="initialFilterValue" - :tokens="tokens" + :tokens="validTokens" :initial-sort-by="initialSortBy" :search-input-placeholder="__('Search or filter results...')" data-testid="runners-filtered-search" |