Merge pull request #1202 from frankrousseau/master

[entities] Fix priority filtering on big lists
cgwire · Sep 26, 2023 · a242062 · a242062
2 parents d130b31 + fa09e55
commit a242062
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/components/modals/BuildFilterModal.vue b/src/components/modals/BuildFilterModal.vue
@@ -200,7 +200,7 @@
         <div class="flexrow">
           <combobox-task-type
             class="flexrow-item"
-            :task-type-list="readyForTaskTypeList"
+            :task-type-list="taskTypeList"
             open-top
             v-model="priority.taskTypeId"
           />

diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue
@@ -797,7 +797,7 @@ export default {
           this.resetTaskTypeDates()
           this.loading.entities = false
           let searchQuery = this.$route.query.search
-          if (searchQuery.length === 0) {
+          if (!searchQuery || searchQuery.length === 0) {
             searchQuery =
               !searchQuery && this.searchField
                 ? this.searchField.getValue()

diff --git a/src/lib/filtering.js b/src/lib/filtering.js
@@ -179,6 +179,7 @@ export const getKeyWords = queryText => {
   } else {
     return queryText
       .replace(UNION_REGEX, '')
+      .replace(EQUAL_PRIORITY_REGEX, '')
       .replace(EQUAL_REGEX, '')
       .replace(MULTIPLE_REGEX, '')
       .split(' ')