From e75f99404dd419b23a3681fdf74860d1a5d1c9e6 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 2 Aug 2024 13:34:20 -0400 Subject: [PATCH 1/3] FOUR-17516 It is not possible to filter all sections from the search within the screen --- src/components/vue-form-builder.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue index e26a44c4f..409f0e94c 100644 --- a/src/components/vue-form-builder.vue +++ b/src/components/vue-form-builder.vue @@ -648,9 +648,12 @@ export default { const excludedLabels = [""]; const filtered = this.controls.filter((control) => { - return control.label - .toLowerCase() - .includes(this.filterQuery.toLowerCase()); + let filter = this.filterQuery.toLowerCase(); + let result = control.label.toLowerCase(filter).includes(); + if (control.group.toLowerCase().includes(filter)) { + result = true; + } + return result; }); return filtered; From 3d726d4ebc9b1fdd3731e4bc9c3883347f17e5e6 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Mon, 5 Aug 2024 12:48:14 -0400 Subject: [PATCH 2/3] FOUR-17516 Fix issues --- src/components/vue-form-builder.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue index 409f0e94c..eb3db4e39 100644 --- a/src/components/vue-form-builder.vue +++ b/src/components/vue-form-builder.vue @@ -647,9 +647,9 @@ export default { const excludedLabels = [""]; + let filter = this.filterQuery.toLowerCase(); const filtered = this.controls.filter((control) => { - let filter = this.filterQuery.toLowerCase(); - let result = control.label.toLowerCase(filter).includes(); + let result = control.label.toLowerCase().includes(filter); if (control.group.toLowerCase().includes(filter)) { result = true; } From 4af6a0870d04cbe5994a3b62700abea9e4e78133 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Fri, 9 Aug 2024 08:31:54 -0700 Subject: [PATCH 3/3] Fix next branch checker --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 463498d72..39b1b9b69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: if [[ ${{ contains(github.event.pull_request.body, 'ci:next') }} ]]; then export VFE_BRANCH=next fi - if [[ ${{ steps.install-vfe.outputs.match != '' }} ]]; then + if [[ "${{ steps.install-vfe.outputs.match }}" != "" ]]; then export VFE_BRANCH=${{ steps.install-vfe.outputs.group1 }} fi echo "VFE_BRANCH=${VFE_BRANCH}" >> $GITHUB_ENV