Remove diff tree filtering feature flag
This commit is contained in:
parent
a52d7dfaa9
commit
16e1b43928
3 changed files with 18 additions and 38 deletions
|
@ -30,8 +30,9 @@ export default {
|
||||||
filteredTreeList() {
|
filteredTreeList() {
|
||||||
const search = this.search.toLowerCase().trim();
|
const search = this.search.toLowerCase().trim();
|
||||||
|
|
||||||
if (search === '' || this.$options.fuzzyFileFinderEnabled)
|
if (search === '') {
|
||||||
return this.renderTreeList ? this.tree : this.allBlobs;
|
return this.renderTreeList ? this.tree : this.allBlobs;
|
||||||
|
}
|
||||||
|
|
||||||
return this.allBlobs.reduce((acc, folder) => {
|
return this.allBlobs.reduce((acc, folder) => {
|
||||||
const tree = folder.tree.filter(f => f.path.toLowerCase().indexOf(search) >= 0);
|
const tree = folder.tree.filter(f => f.path.toLowerCase().indexOf(search) >= 0);
|
||||||
|
@ -51,13 +52,11 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions('diffs', ['toggleTreeOpen', 'scrollToFile', 'toggleFileFinder']),
|
...mapActions('diffs', ['toggleTreeOpen', 'scrollToFile']),
|
||||||
clearSearch() {
|
clearSearch() {
|
||||||
this.search = '';
|
this.search = '';
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
shortcutKeyCharacter: `${/Mac/i.test(navigator.userAgent) ? '⌘' : 'Ctrl'}+P`,
|
|
||||||
diffTreeFiltering: gon.features && gon.features.diffTreeFiltering,
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -66,36 +65,21 @@ export default {
|
||||||
<div class="append-bottom-8 position-relative tree-list-search d-flex">
|
<div class="append-bottom-8 position-relative tree-list-search d-flex">
|
||||||
<div class="flex-fill d-flex">
|
<div class="flex-fill d-flex">
|
||||||
<icon name="search" class="position-absolute tree-list-icon" />
|
<icon name="search" class="position-absolute tree-list-icon" />
|
||||||
<template v-if="$options.diffTreeFiltering">
|
<input
|
||||||
<input
|
v-model="search"
|
||||||
v-model="search"
|
:placeholder="s__('MergeRequest|Filter files')"
|
||||||
:placeholder="s__('MergeRequest|Filter files')"
|
type="search"
|
||||||
type="search"
|
class="form-control"
|
||||||
class="form-control"
|
/>
|
||||||
/>
|
<button
|
||||||
<button
|
v-show="search"
|
||||||
v-show="search"
|
:aria-label="__('Clear search')"
|
||||||
:aria-label="__('Clear search')"
|
type="button"
|
||||||
type="button"
|
class="position-absolute bg-transparent tree-list-icon tree-list-clear-icon border-0 p-0"
|
||||||
class="position-absolute bg-transparent tree-list-icon tree-list-clear-icon border-0 p-0"
|
@click="clearSearch"
|
||||||
@click="clearSearch"
|
>
|
||||||
>
|
<icon name="close" />
|
||||||
<icon name="close" />
|
</button>
|
||||||
</button>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="form-control text-left text-secondary"
|
|
||||||
@click="toggleFileFinder(true)"
|
|
||||||
>
|
|
||||||
{{ s__('MergeRequest|Search files') }}
|
|
||||||
</button>
|
|
||||||
<span
|
|
||||||
class="position-absolute text-secondary diff-tree-search-shortcut"
|
|
||||||
v-html="$options.shortcutKeyCharacter"
|
|
||||||
></span>
|
|
||||||
</template>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div :class="{ 'pt-0 tree-list-blobs': !renderTreeList }" class="tree-list-scroll">
|
<div :class="{ 'pt-0 tree-list-blobs': !renderTreeList }" class="tree-list-scroll">
|
||||||
|
|
|
@ -17,7 +17,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
|
||||||
before_action :check_user_can_push_to_source_branch!, only: [:rebase]
|
before_action :check_user_can_push_to_source_branch!, only: [:rebase]
|
||||||
|
|
||||||
before_action only: [:show] do
|
before_action only: [:show] do
|
||||||
push_frontend_feature_flag(:diff_tree_filtering, default_enabled: true)
|
|
||||||
push_frontend_feature_flag(:expand_diff_full_file)
|
push_frontend_feature_flag(:expand_diff_full_file)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -4872,9 +4872,6 @@ msgstr ""
|
||||||
msgid "MergeRequest|No files found"
|
msgid "MergeRequest|No files found"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "MergeRequest|Search files"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Merged"
|
msgid "Merged"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue